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 (expand / 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,18 +1,19 @@ @@ -1,18 +1,19 @@
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}
cvs diff -r1.7 -r1.8 pkgsrc/lang/python33/Attic/distinfo (expand / 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);