Hi,
this is the diff to update Python to 2.7.13. I just tested on amd64.
Ok?
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.48
diff -u -p -u -p -r1.48 Makefile
--- Makefile 23 Sep 2016 09:16:55 -0000 1.48
+++ Makefile 18 Dec 2016 08:48:32 -0000
@@ -6,8 +6,7 @@
# Python itself.
VERSION = 2.7
-PATCHLEVEL = .12
-REVISION = 1
+PATCHLEVEL = .13
SHARED_LIBS = python2.7 0.0
VERSION_SPEC = >=2.7,<2.8
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/2.7/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo 3 Jul 2016 18:16:00 -0000 1.12
+++ distinfo 18 Dec 2016 08:48:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-2.7.12.tgz) = PLUi0XRj36aaFVqxjP+jmbNYyWbANj1si1s78ThNpLY=
-SIZE (Python-2.7.12.tgz) = 16935960
+SHA256 (Python-2.7.13.tgz) = pPBaByDOD9kmJvAni2tDPu6aYXPd8rzteVfftZml7OE=
+SIZE (Python-2.7.13.tgz) = 17076672
Index: patches/patch-Lib_test_regrtest_py
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-Lib_test_regrtest_py,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Lib_test_regrtest_py
--- patches/patch-Lib_test_regrtest_py 3 Jul 2016 20:10:33 -0000 1.9
+++ patches/patch-Lib_test_regrtest_py 18 Dec 2016 08:48:32 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-Lib_test_regrtest_py,v 1
- test_bsddb and test_bsddb3 are in the list below as they are only available
on i386 and amd64.
---- Lib/test/regrtest.py.orig Sat Jun 25 23:49:31 2016
-+++ Lib/test/regrtest.py Fri Jul 1 10:35:01 2016
-@@ -1465,22 +1465,16 @@ _expectations = {
+--- Lib/test/regrtest.py.orig Sat Dec 17 21:05:06 2016
++++ Lib/test/regrtest.py Sun Dec 18 08:21:50 2016
+@@ -1533,22 +1533,16 @@ _expectations = {
""",
'openbsd3':
"""
@@ -30,7 +30,7 @@ $OpenBSD: patch-Lib_test_regrtest_py,v 1
""",
'netbsd3':
"""
-@@ -1507,6 +1501,9 @@ _expectations['freebsd5'] = _expectations['freebsd4']
+@@ -1575,6 +1569,9 @@ _expectations['freebsd5'] = _expectations['freebsd4']
_expectations['freebsd6'] = _expectations['freebsd4']
_expectations['freebsd7'] = _expectations['freebsd4']
_expectations['freebsd8'] = _expectations['freebsd4']
Index: patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-Makefile_pre_in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in 3 Jul 2016 20:10:33 -0000 1.9
+++ patches/patch-Makefile_pre_in 18 Dec 2016 08:48:32 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.9 2016/07/03 20:10:33 rpointel Exp $
---- Makefile.pre.in.orig Sat Jun 25 23:49:31 2016
-+++ Makefile.pre.in Fri Jul 1 10:35:01 2016
-@@ -584,7 +584,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
+--- Makefile.pre.in.orig Sat Dec 17 21:05:06 2016
++++ Makefile.pre.in Sun Dec 18 08:21:50 2016
+@@ -583,7 +583,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
Index: patches/patch-Python_random_c
===================================================================
RCS file: patches/patch-Python_random_c
diff -N patches/patch-Python_random_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Python_random_c 18 Dec 2016 08:48:32 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Issue #28932: http://bugs.python.org/issue28932
+
+--- Python/random.c.orig Sat Dec 17 21:05:07 2016
++++ Python/random.c Sun Dec 18 09:43:27 2016
+@@ -3,7 +3,7 @@
+ #include <windows.h>
+ #else
+ #include <fcntl.h>
+-#if defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY)
++#if defined(HAVE_GETRANDOM) || defined(HAVE_GETENTROPY) && !defined(__OpenBSD__)
+ #include <sys/random.h>
+ #endif
+ #endif
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-configure_ac,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-configure_ac
--- patches/patch-configure_ac 3 Jul 2016 20:10:33 -0000 1.6
+++ patches/patch-configure_ac 18 Dec 2016 08:48:32 -0000
@@ -4,9 +4,9 @@ SOVERSION defaults to 1.0. SHARED_LIBS,
at any point. Ensure they are on sync in case INSTSONAME is used
by a third party.
---- configure.ac.orig Sat Jun 25 23:49:32 2016
-+++ configure.ac Fri Jul 1 10:43:57 2016
-@@ -914,6 +914,9 @@ if test $enable_shared = "yes"; then
+--- configure.ac.orig Sat Dec 17 21:05:07 2016
++++ configure.ac Sun Dec 18 08:21:52 2016
+@@ -917,6 +917,9 @@ if test $enable_shared = "yes"; then
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
;;
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST-main
--- pkg/PLIST-main 3 Jul 2016 18:16:00 -0000 1.18
+++ pkg/PLIST-main 18 Dec 2016 08:48:32 -0000
@@ -1375,8 +1375,8 @@ lib/python2.7/ensurepip/__main__.py
lib/python2.7/ensurepip/__main__.pyc
lib/python2.7/ensurepip/__main__.pyo
lib/python2.7/ensurepip/_bundled/
-lib/python2.7/ensurepip/_bundled/pip-8.1.1-py2.py3-none-any.whl
-lib/python2.7/ensurepip/_bundled/setuptools-20.10.1-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/pip-9.0.1-py2.py3-none-any.whl
+lib/python2.7/ensurepip/_bundled/setuptools-28.8.0-py2.py3-none-any.whl
lib/python2.7/ensurepip/_uninstall.py
lib/python2.7/ensurepip/_uninstall.pyc
lib/python2.7/ensurepip/_uninstall.pyo
@@ -1550,7 +1550,7 @@ lib/python2.7/keyword.py
lib/python2.7/keyword.pyc
lib/python2.7/keyword.pyo
lib/python2.7/lib-dynload/
-lib/python2.7/lib-dynload/Python-2.7.12-py2.7.egg-info
+lib/python2.7/lib-dynload/Python-2.7.13-py2.7.egg-info
lib/python2.7/lib-dynload/_bisect.so
lib/python2.7/lib-dynload/_codecs_cn.so
lib/python2.7/lib-dynload/_codecs_hk.so
@@ -1613,9 +1613,9 @@ lib/python2.7/lib-dynload/unicodedata.so
lib/python2.7/lib-dynload/zlib.so
lib/python2.7/lib2to3/
lib/python2.7/lib2to3/Grammar.txt
-lib/python2.7/lib2to3/Grammar2.7.12.final.0.pickle
+lib/python2.7/lib2to3/Grammar2.7.13.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar.txt
-lib/python2.7/lib2to3/PatternGrammar2.7.12.final.0.pickle
+lib/python2.7/lib2to3/PatternGrammar2.7.13.final.0.pickle
lib/python2.7/lib2to3/__init__.py
lib/python2.7/lib2to3/__init__.pyc
lib/python2.7/lib2to3/__init__.pyo
@@ -1650,9 +1650,6 @@ lib/python2.7/lib2to3/fixes/fix_basestri
lib/python2.7/lib2to3/fixes/fix_buffer.py
lib/python2.7/lib2to3/fixes/fix_buffer.pyc
lib/python2.7/lib2to3/fixes/fix_buffer.pyo
-lib/python2.7/lib2to3/fixes/fix_callable.py
-lib/python2.7/lib2to3/fixes/fix_callable.pyc
-lib/python2.7/lib2to3/fixes/fix_callable.pyo
lib/python2.7/lib2to3/fixes/fix_dict.py
lib/python2.7/lib2to3/fixes/fix_dict.pyc
lib/python2.7/lib2to3/fixes/fix_dict.pyo
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-tests,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST-tests
--- pkg/PLIST-tests 3 Jul 2016 18:16:00 -0000 1.12
+++ pkg/PLIST-tests 18 Dec 2016 08:48:32 -0000
@@ -11,6 +11,7 @@ lib/python2.7/test/__init__.pyo
lib/python2.7/test/_mock_backport.py
lib/python2.7/test/_mock_backport.pyc
lib/python2.7/test/_mock_backport.pyo
+lib/python2.7/test/allsans.pem
lib/python2.7/test/audiodata/
lib/python2.7/test/audiodata/pluck-pcm16.aiff
lib/python2.7/test/audiodata/pluck-pcm16.au
@@ -53,7 +54,6 @@ lib/python2.7/test/capath/6e88d7b8.0
lib/python2.7/test/capath/99d0fa06.0
lib/python2.7/test/capath/ce7b8643.0
lib/python2.7/test/cfgparser.1
-lib/python2.7/test/check_soundcard.vbs
lib/python2.7/test/cjkencodings/
lib/python2.7/test/cjkencodings/big5-utf8.txt
lib/python2.7/test/cjkencodings/big5.txt
@@ -364,6 +364,9 @@ lib/python2.7/test/ssl_key.pem
lib/python2.7/test/ssl_servers.py
lib/python2.7/test/ssl_servers.pyc
lib/python2.7/test/ssl_servers.pyo
+lib/python2.7/test/ssltests.py
+lib/python2.7/test/ssltests.pyc
+lib/python2.7/test/ssltests.pyo
lib/python2.7/test/string_tests.py
lib/python2.7/test/string_tests.pyc
lib/python2.7/test/string_tests.pyo
Index: pkg/PLIST-tools
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-tools,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST-tools
--- pkg/PLIST-tools 29 Jun 2016 16:14:42 -0000 1.8
+++ pkg/PLIST-tools 18 Dec 2016 08:48:32 -0000
@@ -92,6 +92,7 @@ lib/python2.7/Tools/iobench/
lib/python2.7/Tools/iobench/iobench.py
lib/python2.7/Tools/msi/
lib/python2.7/Tools/msi/README.txt
+lib/python2.7/Tools/msi/WixCA.blob
lib/python2.7/Tools/msi/crtlicense.txt
lib/python2.7/Tools/msi/msi.py
lib/python2.7/Tools/msi/msilib.py
@@ -101,6 +102,12 @@ lib/python2.7/Tools/msi/schema.py
lib/python2.7/Tools/msi/sequence.py
lib/python2.7/Tools/msi/uisample.py
lib/python2.7/Tools/msi/uuids.py
+lib/python2.7/Tools/nuget/
+lib/python2.7/Tools/nuget/build.bat
+lib/python2.7/Tools/nuget/make_pkg.proj
+lib/python2.7/Tools/nuget/make_zip.py
+lib/python2.7/Tools/nuget/python2.nuspec
+lib/python2.7/Tools/nuget/python2x86.nuspec
lib/python2.7/Tools/pybench/
lib/python2.7/Tools/pybench/Arithmetic.py
lib/python2.7/Tools/pybench/Calls.py
