fixes for readline-6.3.

backported from Python 2.7.

2 files changed, 47 insertions, 1 deletions

diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index d7d8af9e903..e8cb34efc51 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.56 2014/03/27 05:36:10 obache Exp $
+$NetBSD: distinfo,v 1.57 2014/03/27 06:14:57 obache Exp $
 
 SHA1 (Python-2.6.9.tar.xz) = 2fc159946dfcceffbe4a8638de32d0cd8059c2f8
 RMD160 (Python-2.6.9.tar.xz) = 42edf7c9f2f64b77ab173de30ea453257c2c06b3
@@ -8,6 +8,7 @@ SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965
 SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
 SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
 SHA1 (patch-Modules_pyexpat.c) = 093f5abb50667e776c66564f4ec87addfdc05ff3
+SHA1 (patch-Modules_readline.c) = e72d8b3e6e96d34b45b1f5c440967ebad6d714c4
 SHA1 (patch-SA43463) = a0285ce9eb1d994bb05cd54812f3fc9cb678fe7f
 SHA1 (patch-aa) = 0528fc5da76d5f1d19586ea3dda1acd09a4b0113
 SHA1 (patch-ab) = b47aa9d18a7c1a99ac8cc8b29c64867443f303e5
diff --git a/lang/python26/patches/patch-Modules_readline.c b/lang/python26/patches/patch-Modules_readline.c
new file mode 100644
index 00000000000..663f2ff8e63
--- /dev/null
+++ b/lang/python26/patches/patch-Modules_readline.c
@@ -0,0 +1,45 @@
+$NetBSD: patch-Modules_readline.c,v 1.1 2014/03/27 06:14:57 obache Exp $
+
+* fixes for readline-6.3
+  http://bugs.python.org/issue20374
+  backport from Python 2.7
+
+--- Modules/readline.c.orig	2013-10-29 15:04:39.000000000 +0000
++++ Modules/readline.c
+@@ -699,7 +699,11 @@ on_hook(PyObject *func)
+ }
+ 
+ static int
++#if defined(_RL_FUNCTION_TYPEDEF)
+ on_startup_hook(void)
++#else
++on_startup_hook()
++#endif
+ {
+     return on_hook(startup_hook);
+ }
+@@ -801,7 +805,7 @@ on_completion(const char *text, int stat
+  * before calling the normal completer */
+ 
+ static char **
+-flex_complete(char *text, int start, int end)
++flex_complete(const char *text, int start, int end)
+ {
+ #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
+     rl_completion_append_character ='\0';
+@@ -841,12 +845,12 @@ setup_readline(void)
+     rl_bind_key_in_map ('\t', rl_complete, emacs_meta_keymap);
+     rl_bind_key_in_map ('\033', rl_complete, emacs_meta_keymap);
+     /* Set our hook functions */
+-    rl_startup_hook = (Function *)on_startup_hook;
++    rl_startup_hook = on_startup_hook;
+ #ifdef HAVE_RL_PRE_INPUT_HOOK
+-    rl_pre_input_hook = (Function *)on_pre_input_hook;
++    rl_pre_input_hook = on_pre_input_hook;
+ #endif
+     /* Set our completion function */
+-    rl_attempted_completion_function = (CPPFunction *)flex_complete;
++    rl_attempted_completion_function = flex_complete;
+     /* Set Python word break characters */
+     rl_completer_word_break_characters =
+         strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");