From 1411c3f1b515109a7b7f7bfddba657e16b711bb3 Mon Sep 17 00:00:00 2001 From: rpointel Date: Wed, 27 Jun 2012 18:58:25 +0000 Subject: [PATCH] Update Python 3.2.2 to 3.2.3. Changelog: http://www.python.org/getit/releases/3.2.3/ ok landry@. --- lang/python/3.2/Makefile | 5 +-- lang/python/3.2/distinfo | 10 ++--- lang/python/3.2/patches/patch-Lib_tempfile_py | 12 ----- .../3.2/patches/patch-Lib_test_test_fcntl_py | 14 ------ .../3.2/patches/patch-Lib_test_test_io_py | 44 ------------------- .../3.2/patches/patch-Lib_test_test_socket_py | 11 ----- .../patches/patch-Lib_test_test_subprocess_py | 11 ----- lang/python/3.2/pkg/PLIST-main | 10 +++-- lang/python/3.2/pkg/PLIST-tests | 11 ++--- 9 files changed, 19 insertions(+), 109 deletions(-) delete mode 100644 lang/python/3.2/patches/patch-Lib_tempfile_py delete mode 100644 lang/python/3.2/patches/patch-Lib_test_test_fcntl_py delete mode 100644 lang/python/3.2/patches/patch-Lib_test_test_io_py delete mode 100644 lang/python/3.2/patches/patch-Lib_test_test_socket_py delete mode 100644 lang/python/3.2/patches/patch-Lib_test_test_subprocess_py diff --git a/lang/python/3.2/Makefile b/lang/python/3.2/Makefile index 93c7f2faaab..7e37345dfd5 100644 --- a/lang/python/3.2/Makefile +++ b/lang/python/3.2/Makefile @@ -1,9 +1,8 @@ -# $OpenBSD: Makefile,v 1.7 2012/05/09 06:21:12 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.8 2012/06/27 18:58:25 rpointel Exp $ VERSION = 3.2 -PATCHLEVEL = .2 +PATCHLEVEL = .3 SHARED_LIBS = python3.2m 1.0 -REVISION = 3 VERSION_SPEC = >=3.2,<3.3 MAINTAINER = Remi Pointel diff --git a/lang/python/3.2/distinfo b/lang/python/3.2/distinfo index acbc7669f65..dc959d5be04 100644 --- a/lang/python/3.2/distinfo +++ b/lang/python/3.2/distinfo @@ -1,5 +1,5 @@ -MD5 (Python-3.2.2.tgz) = PGOm2XMz9No1l2tqB1XrZw== -RMD160 (Python-3.2.2.tgz) = qKKv7BYFDBX6jJoMVNyKmy5fw1I= -SHA1 (Python-3.2.2.tgz) = tFn/R2sH5uSRCb6U575FdigOdo0= -SHA256 (Python-3.2.2.tgz) = rMahPLT+0LfoZxYySoQ34yZkW4B2F37t5aDK2Z7AMTw= -SIZE (Python-3.2.2.tgz) = 12732276 +MD5 (Python-3.2.3.tgz) = 3POnOOcCjx3rQbGAvw4svA== +RMD160 (Python-3.2.3.tgz) = uy51gHOaP9R4z96WSXo1ahcddRM= +SHA1 (Python-3.2.3.tgz) = LGUCTLMsRG3u7+VYTtQGIwSAfWE= +SHA256 (Python-3.2.3.tgz) = dMM+Fl7e91Ms75X9mjJaBoeLW/yKXQOBYVc/KD6vmAk= +SIZE (Python-3.2.3.tgz) = 12787688 diff --git a/lang/python/3.2/patches/patch-Lib_tempfile_py b/lang/python/3.2/patches/patch-Lib_tempfile_py deleted file mode 100644 index 84a3fb0dc6d..00000000000 --- a/lang/python/3.2/patches/patch-Lib_tempfile_py +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Lib_tempfile_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $ ---- Lib/tempfile.py.orig Wed Jun 22 14:12:22 2011 -+++ Lib/tempfile.py Wed Jun 22 14:12:37 2011 -@@ -139,7 +139,7 @@ def _candidate_tempdir_list(): - if _os.name == 'nt': - dirlist.extend([ r'c:\temp', r'c:\tmp', r'\temp', r'\tmp' ]) - else: -- dirlist.extend([ '/tmp', '/var/tmp', '/usr/tmp' ]) -+ dirlist.extend([ '/tmp', '/var/tmp' ]) - - # As a last resort, the current directory. - try: diff --git a/lang/python/3.2/patches/patch-Lib_test_test_fcntl_py b/lang/python/3.2/patches/patch-Lib_test_test_fcntl_py deleted file mode 100644 index 898a222051c..00000000000 --- a/lang/python/3.2/patches/patch-Lib_test_test_fcntl_py +++ /dev/null @@ -1,14 +0,0 @@ -$OpenBSD: patch-Lib_test_test_fcntl_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $ -http://bugs.python.org/issue12821 ---- Lib/test/test_fcntl.py.orig Sat Aug 13 19:31:23 2011 -+++ Lib/test/test_fcntl.py Tue Aug 23 08:41:19 2011 -@@ -28,7 +28,8 @@ - 'freebsd2', 'freebsd3', 'freebsd4', 'freebsd5', - 'freebsd6', 'freebsd7', 'freebsd8', - 'bsdos2', 'bsdos3', 'bsdos4', -- 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4'): -+ 'openbsd', 'openbsd2', 'openbsd3', 'openbsd4', -+ 'openbsd5'): - if struct.calcsize('l') == 8: - off_t = 'l' - pid_t = 'i' diff --git a/lang/python/3.2/patches/patch-Lib_test_test_io_py b/lang/python/3.2/patches/patch-Lib_test_test_io_py deleted file mode 100644 index d623a4bbc75..00000000000 --- a/lang/python/3.2/patches/patch-Lib_test_test_io_py +++ /dev/null @@ -1,44 +0,0 @@ -$OpenBSD: patch-Lib_test_test_io_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $ ---- Lib/test/test_io.py.orig Sat Jul 9 08:58:50 2011 -+++ Lib/test/test_io.py Mon Jul 11 14:13:36 2011 -@@ -2694,12 +2694,15 @@ - if e.errno != errno.EBADF: - raise - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupted_write_unbuffered(self): - self.check_interrupted_write(b"xy", b"xy", mode="wb", buffering=0) - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupted_write_buffered(self): - self.check_interrupted_write(b"xy", b"xy", mode="wb") - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupted_write_text(self): - self.check_interrupted_write("xy", b"xy", mode="w", encoding="ascii") - -@@ -2758,10 +2761,12 @@ - os.close(w) - os.close(r) - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupterd_read_retry_buffered(self): - self.check_interrupted_read_retry(lambda x: x.decode('latin1'), - mode="rb") - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupterd_read_retry_text(self): - self.check_interrupted_read_retry(lambda x: x, - mode="r") -@@ -2821,9 +2826,11 @@ - if e.errno != errno.EBADF: - raise - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupterd_write_retry_buffered(self): - self.check_interrupted_write_retry(b"x", mode="wb") - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_interrupterd_write_retry_text(self): - self.check_interrupted_write_retry("x", mode="w", encoding="latin1") - diff --git a/lang/python/3.2/patches/patch-Lib_test_test_socket_py b/lang/python/3.2/patches/patch-Lib_test_test_socket_py deleted file mode 100644 index 7d70b76c16e..00000000000 --- a/lang/python/3.2/patches/patch-Lib_test_test_socket_py +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-Lib_test_test_socket_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $ ---- Lib/test/test_socket.py.orig Wed Jan 5 22:03:42 2011 -+++ Lib/test/test_socket.py Wed Jun 29 15:00:12 2011 -@@ -715,6 +715,7 @@ - c.close() - s.close() - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_sendall_interrupted(self): - self.check_sendall_interrupted(False) - diff --git a/lang/python/3.2/patches/patch-Lib_test_test_subprocess_py b/lang/python/3.2/patches/patch-Lib_test_test_subprocess_py deleted file mode 100644 index 1b57cfb857b..00000000000 --- a/lang/python/3.2/patches/patch-Lib_test_test_subprocess_py +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-Lib_test_test_subprocess_py,v 1.1.1.1 2011/09/20 10:51:26 fgsch Exp $ ---- Lib/test/test_subprocess.py.orig Mon Jan 3 23:24:52 2011 -+++ Lib/test/test_subprocess.py Wed Jun 29 15:36:22 2011 -@@ -1189,6 +1189,7 @@ - close_fds=False, pass_fds=(fd, ))) - self.assertIn('overriding close_fds', str(context.warning)) - -+ @unittest.skipIf(sys.platform.startswith("openbsd"), "blocking on OpenBSD") - def test_wait_when_sigchild_ignored(self): - # NOTE: sigchild_ignore.py may not be an effective test on all OSes. - sigchild_ignore = support.findfile("sigchild_ignore.py", diff --git a/lang/python/3.2/pkg/PLIST-main b/lang/python/3.2/pkg/PLIST-main index cd939448491..95dba75e4bb 100644 --- a/lang/python/3.2/pkg/PLIST-main +++ b/lang/python/3.2/pkg/PLIST-main @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-main,v 1.3 2011/09/26 19:06:58 nigel Exp $ +@comment $OpenBSD: PLIST-main,v 1.4 2012/06/27 18:58:25 rpointel Exp $ @option no-default-conflict @conflict python->=3.2,<3.3 @pkgpath lang/python3/3.2,-main @@ -16,6 +16,7 @@ include/python3.2m/ include/python3.2m/Python-ast.h include/python3.2m/Python.h include/python3.2m/abstract.h +include/python3.2m/accu.h include/python3.2m/asdl.h include/python3.2m/ast.h include/python3.2m/bitset.h @@ -853,6 +854,7 @@ lib/python3.2/distutils/command/install_scripts.py lib/python3.2/distutils/command/register.py lib/python3.2/distutils/command/sdist.py lib/python3.2/distutils/command/upload.py +@comment lib/python3.2/distutils/command/wininst-9.0-${MACHINE_ARCH}.exe @comment lib/python3.2/distutils/command/wininst-6.0.exe @comment lib/python3.2/distutils/command/wininst-7.1.exe @comment lib/python3.2/distutils/command/wininst-8.0.exe @@ -1728,7 +1730,7 @@ lib/python3.2/json/scanner.py lib/python3.2/json/tool.py lib/python3.2/keyword.py lib/python3.2/lib-dynload/ -lib/python3.2/lib-dynload/Python-3.2.2-py3.2.egg-info +lib/python3.2/lib-dynload/Python-3.2.3-py3.2.egg-info lib/python3.2/lib-dynload/_bisect.so lib/python3.2/lib-dynload/_codecs_cn.so lib/python3.2/lib-dynload/_codecs_hk.so @@ -1783,9 +1785,9 @@ lib/python3.2/lib-dynload/xxlimited.so lib/python3.2/lib-dynload/zlib.so lib/python3.2/lib2to3/ lib/python3.2/lib2to3/Grammar.txt -lib/python3.2/lib2to3/Grammar3.2.2.final.0.pickle +lib/python3.2/lib2to3/Grammar3.2.3.final.0.pickle lib/python3.2/lib2to3/PatternGrammar.txt -lib/python3.2/lib2to3/PatternGrammar3.2.2.final.0.pickle +lib/python3.2/lib2to3/PatternGrammar3.2.3.final.0.pickle lib/python3.2/lib2to3/__init__.py lib/python3.2/lib2to3/__pycache__/ lib/python3.2/lib2to3/__pycache__/__init__.cpython-32.pyc diff --git a/lang/python/3.2/pkg/PLIST-tests b/lang/python/3.2/pkg/PLIST-tests index e6c82a837fa..d2d4a1d7892 100644 --- a/lang/python/3.2/pkg/PLIST-tests +++ b/lang/python/3.2/pkg/PLIST-tests @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST-tests,v 1.3 2011/09/26 19:06:58 nigel Exp $ +@comment $OpenBSD: PLIST-tests,v 1.4 2012/06/27 18:58:25 rpointel Exp $ @option no-default-conflict @conflict python-tests->=3.2,<3.3 @pkgpath lang/python3/3.2,-tests @@ -60,8 +60,6 @@ lib/python3.2/test/__pycache__/pystone.cpython-32.pyc lib/python3.2/test/__pycache__/pystone.cpython-32.pyo lib/python3.2/test/__pycache__/re_tests.cpython-32.pyc lib/python3.2/test/__pycache__/re_tests.cpython-32.pyo -lib/python3.2/test/__pycache__/regex_tests.cpython-32.pyc -lib/python3.2/test/__pycache__/regex_tests.cpython-32.pyo lib/python3.2/test/__pycache__/regrtest.cpython-32.pyc lib/python3.2/test/__pycache__/regrtest.cpython-32.pyo lib/python3.2/test/__pycache__/relimport.cpython-32.pyc @@ -546,6 +544,8 @@ lib/python3.2/test/__pycache__/test_pty.cpython-32.pyc lib/python3.2/test/__pycache__/test_pty.cpython-32.pyo lib/python3.2/test/__pycache__/test_pwd.cpython-32.pyc lib/python3.2/test/__pycache__/test_pwd.cpython-32.pyo +lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyc +lib/python3.2/test/__pycache__/test_py_compile.cpython-32.pyo lib/python3.2/test/__pycache__/test_pyclbr.cpython-32.pyc lib/python3.2/test/__pycache__/test_pyclbr.cpython-32.pyo lib/python3.2/test/__pycache__/test_pydoc.cpython-32.pyc @@ -1090,7 +1090,9 @@ lib/python3.2/test/lock_tests.py lib/python3.2/test/make_ssl_certs.py lib/python3.2/test/mapping_tests.py lib/python3.2/test/math_testcases.txt +lib/python3.2/test/mime.types lib/python3.2/test/mock_socket.py +lib/python3.2/test/nokia.pem lib/python3.2/test/nullcert.pem lib/python3.2/test/outstanding_bugs.py lib/python3.2/test/pickletester.py @@ -1104,7 +1106,6 @@ lib/python3.2/test/randv2_32.pck lib/python3.2/test/randv2_64.pck lib/python3.2/test/randv3.pck lib/python3.2/test/re_tests.py -lib/python3.2/test/regex_tests.py lib/python3.2/test/regrtest.py lib/python3.2/test/relimport.py lib/python3.2/test/reperf.py @@ -1136,7 +1137,6 @@ lib/python3.2/test/subprocessdata/qcat.py lib/python3.2/test/subprocessdata/qgrep.py lib/python3.2/test/subprocessdata/sigchild_ignore.py lib/python3.2/test/support.py -lib/python3.2/test/svn_python_org_https_cert.pem lib/python3.2/test/test___all__.py lib/python3.2/test/test___future__.py lib/python3.2/test/test__locale.py @@ -1374,6 +1374,7 @@ lib/python3.2/test/test_property.py lib/python3.2/test/test_pstats.py lib/python3.2/test/test_pty.py lib/python3.2/test/test_pwd.py +lib/python3.2/test/test_py_compile.py lib/python3.2/test/test_pyclbr.py lib/python3.2/test/test_pydoc.py lib/python3.2/test/test_pyexpat.py