Tue Feb 11 05:52:56 2014 UTC ()
Fixes SA56624, taken from upstream.

Bump PKGREVISION.


(obache)
diff -r1.13 -r1.14 pkgsrc/lang/python33/Makefile
diff -r1.7 -r1.8 pkgsrc/lang/python33/distinfo
diff -r0 -r1.1 pkgsrc/lang/python33/patches/patch-Modules_socketmodule.c
cvs diff -r1.13 -r1.14 pkgsrc/lang/python33/Attic/Makefile (switch to unified diff)

--- pkgsrc/lang/python33/Attic/Makefile 2013/11/21 14:06:43 1.13
+++ pkgsrc/lang/python33/Attic/Makefile 2014/02/11 05:52:56 1.14
@@ -1,129 +1,130 @@ @@ -1,129 +1,130 @@
1# $NetBSD: Makefile,v 1.13 2013/11/21 14:06:43 adam Exp $ 1# $NetBSD: Makefile,v 1.14 2014/02/11 05:52:56 obache Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4 4
5PKGNAME= python33-${PY_DISTVERSION} 5PKGNAME= python33-${PY_DISTVERSION}
 6PKGREVISION= 1
6CATEGORIES= lang python 7CATEGORIES= lang python
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python.org/ 10HOMEPAGE= http://www.python.org/
10COMMENT= Interpreted, interactive, object-oriented programming language 11COMMENT= Interpreted, interactive, object-oriented programming language
11LICENSE= python-software-foundation 12LICENSE= python-software-foundation
12 13
13CONFLICTS+= python-[0-9]* 14CONFLICTS+= python-[0-9]*
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16CONFIGURE_ARGS+= --with-threads 17CONFIGURE_ARGS+= --with-threads
17CONFIGURE_ARGS+= --enable-shared 18CONFIGURE_ARGS+= --enable-shared
18CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q} 19CONFIGURE_ARGS+= OPT=${CFLAGS:M*:Q}
19CONFIGURE_ARGS+= --with-system-ffi 20CONFIGURE_ARGS+= --with-system-ffi
20CONFIGURE_ARGS+= --without-pymalloc 21CONFIGURE_ARGS+= --without-pymalloc
21CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir:Q} 22CONFIGURE_ENV+= ac_cv_path_mkdir=${TOOLS_PATH.mkdir:Q}
22 23
23PKGCONFIG_OVERRIDE+= Misc/python.pc.in 24PKGCONFIG_OVERRIDE+= Misc/python.pc.in
24 25
25USE_LANGUAGES= c c++ 26USE_LANGUAGES= c c++
26 27
27PTHREAD_OPTS+= require 28PTHREAD_OPTS+= require
28.include "../../mk/pthread.buildlink3.mk" 29.include "../../mk/pthread.buildlink3.mk"
29 30
30.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
31 32
32# fdatasync() 33# fdatasync()
33LIBS.SunOS+= -lrt 34LIBS.SunOS+= -lrt
34 35
35PY_VER_SUFFIX= 3.3 36PY_VER_SUFFIX= 3.3
36 37
37.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix" 38.if ${OPSYS} == "Darwin" || ${OPSYS} == "Interix"
38PY_PLATNAME= ${LOWER_OPSYS} 39PY_PLATNAME= ${LOWER_OPSYS}
39USE_TOOLS+= gmake 40USE_TOOLS+= gmake
40.elif ${OPSYS} == "IRIX" 41.elif ${OPSYS} == "IRIX"
41PY_PLATNAME= ${LOWER_OPSYS:C/\..*//} 42PY_PLATNAME= ${LOWER_OPSYS:C/\..*//}
42.elif ${OPSYS} == "SunOS" 43.elif ${OPSYS} == "SunOS"
43PY_PLATNAME= sunos${OS_VERSION:C/\..*//} 44PY_PLATNAME= sunos${OS_VERSION:C/\..*//}
44.elif ${OPSYS} == "HPUX" 45.elif ${OPSYS} == "HPUX"
45PY_PLATNAME= hp-ux11 46PY_PLATNAME= hp-ux11
46.elif ${OPSYS} == "Linux" 47.elif ${OPSYS} == "Linux"
47PY_PLATNAME= linux 48PY_PLATNAME= linux
48.else 49.else
49PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//} 50PY_PLATNAME= ${LOWER_OPSYS}${OS_VERSION:C/\..*//}
50.endif 51.endif
51PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q} 52PLIST_SUBST+= PY_PLATNAME=${PY_PLATNAME:Q}
52 53
53# ossaudiodev is only available on x86 for the following platforms 54# ossaudiodev is only available on x86 for the following platforms
54PLIST_VARS+= oss 55PLIST_VARS+= oss
55.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \ 56.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && \
56 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD") 57 (${PY_PLATNAME} == "linux" || ${OPSYS} == "FreeBSD")
57PLIST.oss= yes 58PLIST.oss= yes
58.endif 59.endif
59 60
60# Make sure python modules can link correctly 61# Make sure python modules can link correctly
61.if ${OPSYS} == "Darwin" 62.if ${OPSYS} == "Darwin"
62INSTALL_UNSTRIPPED= yes 63INSTALL_UNSTRIPPED= yes
63.endif 64.endif
64 65
65PLIST_VARS+= bsddb dll nis no-nis 66PLIST_VARS+= bsddb dll nis no-nis
66.if ${OPSYS} == "IRIX" 67.if ${OPSYS} == "IRIX"
67. if ${ABI} == "64" 68. if ${ABI} == "64"
68PLIST.no-nis= yes 69PLIST.no-nis= yes
69. else 70. else
70PLIST.nis= yes 71PLIST.nis= yes
71. endif 72. endif
72.else 73.else
73. include "../../mk/bdb.buildlink3.mk" 74. include "../../mk/bdb.buildlink3.mk"
74MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} 75MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE}
75MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} 76MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q}
76MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib 77MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib
77PLIST.bsddb= yes 78PLIST.bsddb= yes
78PLIST.dll= yes 79PLIST.dll= yes
79. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) 80. if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat)
80PLIST.nis= yes 81PLIST.nis= yes
81. else 82. else
82PLIST.no-nis= yes 83PLIST.no-nis= yes
83. endif 84. endif
84.endif 85.endif
85 86
86.if defined(BUILDLINK_TRANSFORM) 87.if defined(BUILDLINK_TRANSFORM)
87MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q} 88MAKE_ENV+= PY_BDB_TRANSFORM=${BUILDLINK_TRANSFORM:Q}
88.endif 89.endif
89 90
90PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q} 91PLIST_SUBST+= PY_VER_SUFFIX=${PY_VER_SUFFIX:Q}
91 92
92PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") } 93PRINT_PLIST_AWK+= { gsub(/${PY_PLATNAME}/, "$${PY_PLATNAME}") }
93PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \ 94PRINT_PLIST_AWK+= { gsub(/python${PY_VER_SUFFIX}/, \
94 "python$${PY_VER_SUFFIX}") } 95 "python$${PY_VER_SUFFIX}") }
95 96
96TEST_TARGET= test 97TEST_TARGET= test
97INSTALL_TARGET= altinstall 98INSTALL_TARGET= altinstall
98 99
99REPLACE_INTERPRETER+= py33 100REPLACE_INTERPRETER+= py33
100REPLACE.py33.old= .*python[^ ]* 101REPLACE.py33.old= .*python[^ ]*
101REPLACE.py33.new= ${PREFIX}/bin/python${PY_VER_SUFFIX} 102REPLACE.py33.new= ${PREFIX}/bin/python${PY_VER_SUFFIX}
102REPLACE_FILES.py33= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py 103REPLACE_FILES.py33= Lib/*.py Lib/*/*.py Lib/*/*/*.py Lib/*/*/*/*.py
103 104
104SUBST_CLASSES+= findlib 105SUBST_CLASSES+= findlib
105SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin. 106SUBST_MESSAGE.findlib= Fixing find_library_file on Darwin.
106SUBST_STAGE.findlib= pre-configure 107SUBST_STAGE.findlib= pre-configure
107SUBST_FILES.findlib= Lib/distutils/unixccompiler.py 108SUBST_FILES.findlib= Lib/distutils/unixccompiler.py
108SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},' 109SUBST_SED.findlib= -e 's,/usr/local,${PREFIX},'
109 110
110CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc 111CHECK_INTERPRETER_SKIP= lib/python${PY_VER_SUFFIX}/venv/scripts/posix/pydoc
111 112
112.if ${OPSYS} == "HPUX" 113.if ${OPSYS} == "HPUX"
113post-install: 114post-install:
114 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython3.3.sl \ 115 ${LN} -fs ${DESTDIR}${PREFIX}/lib/libpython3.3.sl \
115 ${DESTDIR}${PREFIX}/lib/libpython3.3.sl.1.0 116 ${DESTDIR}${PREFIX}/lib/libpython3.3.sl.1.0
116.endif 117.endif
117 118
118BUILDLINK_DEPMETHOD.readline= build 119BUILDLINK_DEPMETHOD.readline= build
119 120
120.include "../../archivers/bzip2/buildlink3.mk" 121.include "../../archivers/bzip2/buildlink3.mk"
121.include "../../archivers/xz/buildlink3.mk" 122.include "../../archivers/xz/buildlink3.mk"
122.include "../../devel/gettext-lib/buildlink3.mk" 123.include "../../devel/gettext-lib/buildlink3.mk"
123.include "../../devel/libffi/buildlink3.mk" 124.include "../../devel/libffi/buildlink3.mk"
124.include "../../devel/readline/buildlink3.mk" 125.include "../../devel/readline/buildlink3.mk"
125.include "../../devel/zlib/buildlink3.mk" 126.include "../../devel/zlib/buildlink3.mk"
126.include "../../security/openssl/buildlink3.mk" 127.include "../../security/openssl/buildlink3.mk"
127.include "../../mk/dlopen.buildlink3.mk" 128.include "../../mk/dlopen.buildlink3.mk"
128.include "../../mk/oss.buildlink3.mk" 129.include "../../mk/oss.buildlink3.mk"
129.include "../../mk/bsd.pkg.mk" 130.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/lang/python33/Attic/distinfo (switch to unified diff)

--- pkgsrc/lang/python33/Attic/distinfo 2013/11/21 14:06:43 1.7
+++ pkgsrc/lang/python33/Attic/distinfo 2014/02/11 05:52:56 1.8
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1$NetBSD: distinfo,v 1.7 2013/11/21 14:06:43 adam Exp $ 1$NetBSD: distinfo,v 1.8 2014/02/11 05:52:56 obache Exp $
2 2
3SHA1 (Python-3.3.3.tar.xz) = af4e75a34bd538c79b9871227c2e7f56569ac107 3SHA1 (Python-3.3.3.tar.xz) = af4e75a34bd538c79b9871227c2e7f56569ac107
4RMD160 (Python-3.3.3.tar.xz) = 62e262879f871fc2e9c5b3e85debd51c2691ca32 4RMD160 (Python-3.3.3.tar.xz) = 62e262879f871fc2e9c5b3e85debd51c2691ca32
5Size (Python-3.3.3.tar.xz) = 12057744 bytes 5Size (Python-3.3.3.tar.xz) = 12057744 bytes
6SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce 6SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce
 7SHA1 (patch-Modules_socketmodule.c) = 789b05d27f5821ee9968dacd4dedc9133cc73775
7SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0 8SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
8SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1 9SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
9SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d 10SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d
10SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1 11SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1
11SHA1 (patch-am) = 9712e33cf8e3c04a9bc0e89be4fb571790e26e4e 12SHA1 (patch-am) = 9712e33cf8e3c04a9bc0e89be4fb571790e26e4e
12SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba 13SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
13SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3 14SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3
14SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182 15SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182
15SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780 16SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
16SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc 17SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc
17SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c 18SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c
18SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be 19SHA1 (patch-xa) = fb81eaa604b4ed7c1b64c3f4731d58a8aee257be
File Added: pkgsrc/lang/python33/patches/Attic/patch-Modules_socketmodule.c
$NetBSD: patch-Modules_socketmodule.c,v 1.1 2014/02/11 05:52:56 obache Exp $

* Fix vulnerability reported in SA56624, taken from upstream:
  http://hg.python.org/cpython/rev/7f176a45211f/

--- Modules/socketmodule.c.orig	2013-11-17 07:23:02.000000000 +0000
+++ Modules/socketmodule.c
@@ -2935,6 +2935,11 @@ sock_recvfrom_into(PySocketSockObject *s
     if (recvlen == 0) {
         /* If nbytes was not specified, use the buffer's length */
         recvlen = buflen;
+    } else if (recvlen > buflen) {
+        PyBuffer_Release(&pbuf);
+        PyErr_SetString(PyExc_ValueError,
+                        "nbytes is greater than the length of the buffer");
+        return NULL;
     }
 
     readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);