Changed 3.3.4:

PEP 380, syntax for delegating to a subgenerator (yield from)
PEP 393, flexible string representation (doing away with the distinction between "wide" and "narrow" Unicode builds)
A C implementation of the "decimal" module, with up to 120x speedup for decimal-heavy applications
The import system (__import__) is based on importlib by default
The new "lzma" module with LZMA/XZ support
PEP 397, a Python launcher for Windows
PEP 405, virtual environment support in core
PEP 420, namespace package support
PEP 3151, reworking the OS and IO exception hierarchy
PEP 3155, qualified name for classes and functions
PEP 409, suppressing exception context
PEP 414, explicit Unicode literals to help with porting
PEP 418, extended platform-independent clocks in the "time" module
PEP 412, a new key-sharing dictionary implementation that significantly saves memory for object-oriented code
PEP 362, the function-signature object
The new "faulthandler" module that helps diagnosing crashes
The new "unittest.mock" module
The new "ipaddress" module
The "sys.implementation" attribute
A policy framework for the email package, with a provisional (see PEP 411) policy that adds much improved unicode support for email header parsing
A "collections.ChainMap" class for linking mappings to a single unit
Wrappers for many more POSIX functions in the "os" and "signal" modules, as well as other useful functions such as "sendfile()"
Hash randomization, introduced in earlier bugfix releases, is now switched on by default

5 files changed, 61 insertions, 30 deletions

diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 47cd3bbdf7c..14817d258af 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2014/02/11 05:52:56 obache Exp $
+# $NetBSD: Makefile,v 1.15 2014/02/11 17:56:16 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python33-${PY_DISTVERSION}
-PKGREVISION=	1
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,7 +18,7 @@ CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	OPT=${CFLAGS:M*:Q}
 CONFIGURE_ARGS+=	--with-system-ffi
 CONFIGURE_ARGS+=	--without-pymalloc
-CONFIGURE_ENV+=		ac_cv_path_mkdir=${TOOLS_PATH.mkdir:Q}
+CONFIGURE_ENV+=		ac_cv_path_mkdir=${TOOLS_PATH.mkdir}
 
 PKGCONFIG_OVERRIDE+=	Misc/python.pc.in
 
diff --git a/lang/python33/PLIST b/lang/python33/PLIST
index b76a99e55e3..5b30173c896 100644
--- a/lang/python33/PLIST
+++ b/lang/python33/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2013/11/21 14:06:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/02/11 17:56:16 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -1685,6 +1685,49 @@ lib/python${PY_VER_SUFFIX}/idlelib/help.txt
 lib/python${PY_VER_SUFFIX}/idlelib/idle.bat
 lib/python${PY_VER_SUFFIX}/idlelib/idle.py
 lib/python${PY_VER_SUFFIX}/idlelib/idle.pyw
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/README.txt
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__init__.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/__init__.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/__init__.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/mock_idle.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/mock_idle.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/mock_tk.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/mock_tk.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_calltips.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_calltips.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_config_name.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_config_name.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_delegator.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_delegator.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_formatparagraph.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_formatparagraph.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_grep.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_grep.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_idlehistory.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_idlehistory.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_pathbrowser.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_pathbrowser.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_rstrip.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_rstrip.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_searchengine.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_searchengine.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_text.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_text.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_warning.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/__pycache__/test_warning.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_idle.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/mock_tk.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_calltips.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_config_name.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_delegator.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_formatparagraph.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_grep.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_idlehistory.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_pathbrowser.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_rstrip.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_searchengine.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_text.py
+lib/python${PY_VER_SUFFIX}/idlelib/idle_test/test_warning.py
 lib/python${PY_VER_SUFFIX}/idlelib/idlever.py
 lib/python${PY_VER_SUFFIX}/idlelib/keybindingDialog.py
 lib/python${PY_VER_SUFFIX}/idlelib/macosxSupport.py
@@ -2572,6 +2615,8 @@ lib/python${PY_VER_SUFFIX}/test/__pycache__/test_getargs2.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_getargs2.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_getopt.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_getopt.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/__pycache__/test_getpass.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/__pycache__/test_getpass.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_gettext.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_gettext.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_glob.cpython-33.pyc
@@ -3644,6 +3689,7 @@ lib/python${PY_VER_SUFFIX}/test/test_genericpath.py
 lib/python${PY_VER_SUFFIX}/test/test_genexps.py
 lib/python${PY_VER_SUFFIX}/test/test_getargs2.py
 lib/python${PY_VER_SUFFIX}/test/test_getopt.py
+lib/python${PY_VER_SUFFIX}/test/test_getpass.py
 lib/python${PY_VER_SUFFIX}/test/test_gettext.py
 lib/python${PY_VER_SUFFIX}/test/test_glob.py
 lib/python${PY_VER_SUFFIX}/test/test_global.py
@@ -4136,6 +4182,8 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/__pycache__/runtktests.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/__pycache__/runtktests.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/__pycache__/support.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/__pycache__/support.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/tkinter/test/__pycache__/widget_tests.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/tkinter/test/__pycache__/widget_tests.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/runtktests.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/support.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__init__.py
@@ -4151,11 +4199,14 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_text.cpyth
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_text.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_widgets.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_misc.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_text.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_variables.py
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_widgets.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/__init__.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/__pycache__/__init__.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/__pycache__/__init__.cpython-33.pyo
@@ -4171,6 +4222,7 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_extensions.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_functions.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_style.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/test_widgets.py
+lib/python${PY_VER_SUFFIX}/tkinter/test/widget_tests.py
 lib/python${PY_VER_SUFFIX}/tkinter/tix.py
 lib/python${PY_VER_SUFFIX}/tkinter/ttk.py
 lib/python${PY_VER_SUFFIX}/token.py
diff --git a/lang/python33/dist.mk b/lang/python33/dist.mk
index b2acc1437c3..b2c0fb18ad0 100644
--- a/lang/python33/dist.mk
+++ b/lang/python33/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.3 2013/11/21 14:06:43 adam Exp $
+# $NetBSD: dist.mk,v 1.4 2014/02/11 17:56:16 adam Exp $
 
-PY_DISTVERSION=	3.3.3
+PY_DISTVERSION=	3.3.4
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python33/distinfo
diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 7f73310e5d8..8c5fe2146f4 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.8 2014/02/11 05:52:56 obache Exp $
+$NetBSD: distinfo,v 1.9 2014/02/11 17:56:16 adam Exp $
 
-SHA1 (Python-3.3.3.tar.xz) = af4e75a34bd538c79b9871227c2e7f56569ac107
-RMD160 (Python-3.3.3.tar.xz) = 62e262879f871fc2e9c5b3e85debd51c2691ca32
-Size (Python-3.3.3.tar.xz) = 12057744 bytes
+SHA1 (Python-3.3.4.tar.xz) = 2c9586eeb4b6e45e9ebc28372c0856c709d9a522
+RMD160 (Python-3.3.4.tar.xz) = 0302c1bb1137bc3c711269f08d463aee50aa0c84
+Size (Python-3.3.4.tar.xz) = 12087568 bytes
 SHA1 (patch-Lib_distutils_unixccompiler.py) = 39cb8d1e1e3e76e2b6b5dbc1a6b5e0815300b2ce
-SHA1 (patch-Modules_socketmodule.c) = 789b05d27f5821ee9968dacd4dedc9133cc73775
 SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
 SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
 SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d
diff --git a/lang/python33/patches/patch-Modules_socketmodule.c b/lang/python33/patches/patch-Modules_socketmodule.c
deleted file mode 100644
index 4e00ccc91cc..00000000000
--- a/lang/python33/patches/patch-Modules_socketmodule.c
+++ /dev/null
@@ -1,19 +0,0 @@
-$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);