Import of pkgsrc-2014Q1

lang/python26/patches/patch-Lib_distutils_unixccompiler.py

@@ -0,0 +1,16 @@
+$NetBSD: patch-Lib_distutils_unixccompiler.py,v 1.1 2013/09/10 14:22:30 joerg Exp $
+
+--- Lib/distutils/unixccompiler.py.orig	2012-04-10 15:32:04.000000000 +0000
++++ Lib/distutils/unixccompiler.py
+@@ -292,10 +292,8 @@ class UnixCCompiler(CCompiler):
+             return ["+s", "-L" + dir]
+         elif sys.platform[:7] == "irix646" or sys.platform[:6] == "osf1V5":
+             return ["-rpath", dir]
+-        elif self._is_gcc(compiler):
+-            return "-Wl,-R" + dir
+         else:
+-            return "-R" + dir
++            return "-Wl,-R" + dir
+ 
+     def library_option(self, lib):
+         return "-l" + lib

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`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");

lang/python26/patches/patch-al

@@ -1,12 +1,13 @@
-$NetBSD: patch-al,v 1.11 2012/12/21 20:28:36 dholland Exp $
+$NetBSD: patch-al,v 1.12 2013/11/06 07:25:49 adam Exp $
 
 - recognize OpenBSD, MirBSD, Interix, Solaris 11
 - remove special-case library version hack for FreeBSD
+- don't set Mac OS X target version: stick to the current one
 - honor pkgsrc LDFLAGS
 - other stuff not previously commented (XXX)
 
---- configure.orig	2010-05-25 02:27:03.000000000 +0000
-+++ configure	2011-09-06 18:58:15.336443123 +0200
+--- configure.orig	2013-10-29 15:04:39.000000000 +0000
++++ configure
 @@ -2833,7 +2833,7 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    # In addition, Stefan Krah confirms that issue #1244610 exists through
@@ -59,6 +60,15 @@ $NetBSD: patch-al,v 1.11 2012/12/21 20:28:36 dholland Exp $
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
      hp*|HP*)
+@@ -5314,7 +5309,7 @@ $as_echo "$CC" >&6; }
+ 	    # Calculate the right deployment target for this build.
+ 	    #
+ 	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
+-	    if test ${cur_target} '>' 10.2; then
++	    if false; then
+ 		    cur_target=10.3
+ 		    if test ${enable_universalsdk}; then
+ 			    if test "${UNIVERSAL_ARCHS}" = "all"; then
 @@ -7359,8 +7354,8 @@ then
  			LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else

lang/python26/patches/patch-am

@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.19 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: patch-am,v 1.22 2014/03/27 05:36:10 obache Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -378,7 +378,7 @@ support building the "nis" and "crypt" modules.
 -                     'Lib/smtpd.py']
 +          scripts = ['Tools/scripts/pydoc2.6',
 +                     'Tools/scripts/2to3-2.6',
-+                     'Lib/smtpd2.6.py']
++                     'Tools/scripts/smtpd2.6.py']
          )
  
  # --install-platlib

lang/python26/patches/patch-ap

@@ -1,6 +1,10 @@
-$NetBSD: patch-ap,v 1.3 2010/09/04 05:12:00 obache Exp $
+$NetBSD: patch-ap,v 1.4 2014/02/09 13:47:10 drochner Exp $
 
---- Modules/socketmodule.c.orig	2010-05-23 15:22:08.000000000 +0000
+Fix vulnerability reported in SA56624. Patch taken from here:
+
+http://hg.python.org/cpython/rev/87673659d8f7
+
+--- Modules/socketmodule.c.orig	2014-02-09 12:58:52.000000000 +0000
 +++ Modules/socketmodule.c
 @@ -379,7 +379,7 @@ const char *inet_ntop(int af, const void
  #define SOCKETCLOSE close
@@ -66,7 +70,18 @@ $NetBSD: patch-ap,v 1.3 2010/09/04 05:12:00 obache Exp $
              *len_ret = sizeof *addr;
              return 1;
          }
-@@ -4588,9 +4607,13 @@ init_socket(void)
+@@ -2625,6 +2644,10 @@ sock_recvfrom_into(PySocketSockObject *s
+     if (recvlen == 0) {
+         /* If nbytes was not specified, use the buffer's length */
+         recvlen = buflen;
++    } else if (recvlen > buflen) {
++        PyErr_SetString(PyExc_ValueError,
++                        "nbytes is greater than the length of the buffer");
++        return NULL;
+     }
+ 
+     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
+@@ -4588,9 +4611,13 @@ init_socket(void)
      PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
      PyModule_AddIntConstant(m, "BTPROTO_HCI", BTPROTO_HCI);
      PyModule_AddIntConstant(m, "SOL_HCI", SOL_HCI);

lang/python26/patches/patch-bc

@@ -1,11 +1,11 @@
-$NetBSD: patch-bc,v 1.1 2010/11/23 08:24:04 tron Exp $
+$NetBSD: patch-bc,v 1.2 2014/03/12 12:57:06 obache Exp $
 
 Fix for CVE-2010-3492 and CVE-2010-3493, taken from the Python SVN repository:
 
 http://svn.python.org/view?view=rev&revision=86084
 
---- Lib/smtpd2.6.py.orig	2010-11-22 18:18:59.000000000 +0000
-+++ Lib/smtpd2.6.py	2010-11-22 18:19:03.000000000 +0000
+--- Lib/smtpd.py.orig	2010-11-22 18:18:59.000000000 +0000
++++ Lib/smtpd.py	2010-11-22 18:19:03.000000000 +0000
 @@ -35,7 +35,6 @@
  and if remoteport is not given, then 25 is used.
  """