libedit claims compatibility with readline 4.2, so provide a stub for

rl_set_keyboard_input_timeout() that was added in this version.
Also crank the minor version.

OK krw@ yasuoka@ deraadt@

diff --git a/lib/libedit/readline.c b/lib/libedit/readline.c
index 878239f..814c865 100644 (file)
--- a/lib/libedit/readline.c
+++ b/lib/libedit/readline.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: readline.c,v 1.12 2014/10/15 10:55:11 deraadt Exp $   */
+/*     $OpenBSD: readline.c,v 1.13 2015/01/13 08:33:12 reyk Exp $      */
 /*     $NetBSD: readline.c,v 1.91 2010/08/28 15:44:59 christos Exp $   */
 
 /*-
@@ -2244,3 +2244,10 @@ rl_on_new_line(void)
 {
        return 0;
 }
+
+int
+/*ARGSUSED*/
+rl_set_keyboard_input_timeout(int u)
+{
+       return 0;
+}

diff --git a/lib/libedit/readline/readline.h b/lib/libedit/readline/readline.h
index 22fa8e0..138e189 100644 (file)
--- a/lib/libedit/readline/readline.h
+++ b/lib/libedit/readline/readline.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: readline.h,v 1.5 2011/07/07 05:40:42 okan Exp $       */
+/*     $OpenBSD: readline.h,v 1.6 2015/01/13 08:33:12 reyk Exp $       */
 /*     $NetBSD: readline.h,v 1.31 2010/08/04 20:29:18 christos Exp $   */
 
 /*-
@@ -215,6 +215,7 @@ int          rl_generic_bind(int, const char *, const char *, Keymap);
 int             rl_bind_key_in_map(int, rl_command_func_t *, Keymap);
 void            rl_cleanup_after_signal(void);
 void            rl_free_line_state(void);
+int             rl_set_keyboard_input_timeout(int);
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/libedit/shlib_version b/lib/libedit/shlib_version
index 900b404..715ca91 100644 (file)
--- a/lib/libedit/shlib_version
+++ b/lib/libedit/shlib_version
@@ -1,2 +1,2 @@
 major=5
-minor=1
+minor=2