Hi,
this is the diff to update python from 2.7.5 to 2.7.6.
I only tested on amd64.
Are you ok?
Changelog: http://hg.python.org/cpython/raw-file/99d03261c1ba/Misc/NEWS
Cheers,
Remi.
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/2.7/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile 27 Oct 2013 18:32:55 -0000 1.27
+++ Makefile 11 Nov 2013 15:48:05 -0000
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.27 2013/10/27 18:32:55 fgsch Exp $
VERSION = 2.7
-PATCHLEVEL = .5
-REVISION = 0
+PATCHLEVEL = .6
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.5
diff -u -p -r1.5 distinfo
--- distinfo 22 May 2013 12:39:30 -0000 1.5
+++ distinfo 11 Nov 2013 15:48:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-2.7.5.tgz) = jhtfqHuRg1r7N2qcDTGdQf7KB//rwCiNl6sI1k9Ir78=
-SIZE (Python-2.7.5.tgz) = 14492759
+SHA256 (Python-2.7.6.tgz) = mcaGC3CXe++hWQAp+uCS3bGNsdaa5n6Lk4W2btEEulg=
+SIZE (Python-2.7.6.tgz) = 14725931
Index: patches/patch-Lib_test_test_tempfile_py
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-Lib_test_test_tempfile_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Lib_test_test_tempfile_py
--- patches/patch-Lib_test_test_tempfile_py 13 Apr 2013 22:31:42 -0000
1.3
+++ patches/patch-Lib_test_test_tempfile_py 11 Nov 2013 15:48:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Lib_test_test_tempfile_py,v 1.3 2013/04/13 22:31:42 fgsch Exp $
---- Lib/test/test_tempfile.py.orig Sat Apr 6 15:02:32 2013
-+++ Lib/test/test_tempfile.py Sun Apr 7 11:06:25 2013
-@@ -27,7 +27,7 @@ has_spawnl = hasattr(os, 'spawnl')
+--- Lib/test/test_tempfile.py.orig Sun Nov 10 08:36:40 2013
++++ Lib/test/test_tempfile.py Mon Nov 11 15:27:59 2013
+@@ -28,7 +28,7 @@ has_spawnl = hasattr(os, 'spawnl')
# TEST_FILES may need to be tweaked for systems depending on the maximum
# number of files that can be opened at one time (see ulimit -n)
Index: patches/patch-Makefile_pre_in
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-Makefile_pre_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-Makefile_pre_in
--- patches/patch-Makefile_pre_in 22 May 2013 12:39:30 -0000 1.6
+++ patches/patch-Makefile_pre_in 11 Nov 2013 15:48:05 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_pre_in,v 1.6 2013/05/22 12:39:30 fgsch Exp $
---- Makefile.pre.in.orig Sun May 12 04:32:49 2013
-+++ Makefile.pre.in Sat May 18 21:26:38 2013
-@@ -494,7 +494,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
+--- Makefile.pre.in.orig Sun Nov 10 08:36:41 2013
++++ Makefile.pre.in Mon Nov 11 15:27:59 2013
+@@ -499,7 +499,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
$(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-configure_ac,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure_ac
--- patches/patch-configure_ac 28 Apr 2013 00:51:34 -0000 1.2
+++ patches/patch-configure_ac 11 Nov 2013 15:48:05 -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 Apr 6 15:02:41 2013
-+++ configure.ac Sun Apr 7 11:52:14 2013
-@@ -890,6 +890,9 @@ if test $enable_shared = "yes"; then
+--- configure.ac.orig Sun Nov 10 08:36:41 2013
++++ configure.ac Mon Nov 11 15:28:00 2013
+@@ -891,6 +891,9 @@ if test $enable_shared = "yes"; then
FreeBSD*)
SOVERSION=`echo $SOVERSION|cut -d "." -f 1`
;;
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/2.7/patches/patch-setup_py,v
retrieving revision 1.7
diff -u -p -r1.7 patch-setup_py
--- patches/patch-setup_py 22 May 2013 12:39:30 -0000 1.7
+++ patches/patch-setup_py 11 Nov 2013 15:48:05 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-setup_py,v 1.7 2013/05/22 12:39:30 fgsch Exp $
---- setup.py.orig Sun May 12 04:32:54 2013
-+++ setup.py Sat May 18 21:26:38 2013
+--- setup.py.orig Sun Nov 10 08:36:41 2013
++++ setup.py Mon Nov 11 15:28:54 2013
@@ -35,6 +35,11 @@ COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig
# This global variable is used to hold the list of modules to be disabled.
disabled_module_list = []
@@ -13,18 +13,18 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
def add_dir_to_list(dirlist, dir):
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
1) 'dir' is not already in 'dirlist'
-@@ -437,8 +442,8 @@ class PyBuildExt(build_ext):
-
+@@ -438,8 +443,8 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
-- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
-- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
-+ add_dir_to_list(self.compiler.library_dirs, usrlocal('lib'))
-+ add_dir_to_list(self.compiler.include_dirs, usrlocal('include'))
- self.add_gcc_paths()
+ if not cross_compiling:
+- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
+- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
++ add_dir_to_list(self.compiler.library_dirs, usrlocal('lib'))
++ add_dir_to_list(self.compiler.include_dirs, usrlocal('include'))
+ if cross_compiling:
+ self.add_gcc_paths()
self.add_multiarch_paths()
-
-@@ -760,6 +765,8 @@ class PyBuildExt(build_ext):
+@@ -762,6 +767,8 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
exts.append( Extension('readline', ['readline.c'],
@@ -33,7 +33,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
-@@ -896,7 +903,7 @@ class PyBuildExt(build_ext):
+@@ -898,7 +905,7 @@ class PyBuildExt(build_ext):
# BerkeleyDB 4.6.x is not stable on many architectures.
arch = platform_machine()
if arch not in ('i386', 'i486', 'i586', 'i686',
@@ -42,7 +42,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
return False
return True
-@@ -966,6 +973,7 @@ class PyBuildExt(build_ext):
+@@ -968,6 +975,7 @@ class PyBuildExt(build_ext):
std_variants.append(os.path.join(dn, "db3.%d"%x))
db_inc_paths = std_variants + db_inc_paths
@@ -50,7 +50,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
db_inc_paths = [p for p in db_inc_paths if os.path.exists(p)]
db_ver_inc_map = {}
-@@ -1029,6 +1037,7 @@ class PyBuildExt(build_ext):
+@@ -1031,6 +1039,7 @@ class PyBuildExt(build_ext):
db_incdir.replace("include", 'lib64'),
db_incdir.replace("include", 'lib'),
]
@@ -58,7 +58,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
if host_platform != 'darwin':
db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
-@@ -1051,6 +1060,7 @@ class PyBuildExt(build_ext):
+@@ -1053,6 +1062,7 @@ class PyBuildExt(build_ext):
# symlink to more general names?
for dblib in (('db-%d.%d' % db_ver),
('db%d%d' % db_ver),
@@ -66,7 +66,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
('db%d' % db_ver[0])):
dblib_file = self.compiler.find_library_file(
db_dirs_to_check + lib_dirs, dblib )
-@@ -1209,7 +1219,7 @@ class PyBuildExt(build_ext):
+@@ -1211,7 +1221,7 @@ class PyBuildExt(build_ext):
sysroot = macosx_sdk_root()
f = os.path.join(sysroot, f[1:])
@@ -75,7 +75,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
data = open(f).read()
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
if m is not None:
-@@ -1596,6 +1606,9 @@ class PyBuildExt(build_ext):
+@@ -1600,6 +1610,9 @@ class PyBuildExt(build_ext):
'freebsd7', 'freebsd8')
or host_platform.startswith("gnukfreebsd")):
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
@@ -85,7 +85,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
else:
missing.append('ossaudiodev')
-@@ -1769,7 +1782,7 @@ class PyBuildExt(build_ext):
+@@ -1812,7 +1825,7 @@ class PyBuildExt(build_ext):
# For 8.4a2, the X11 headers are not included. Rather than include a
# complicated search, this is a hard-coded path. It could bail out
# if X11 libs are not found...
@@ -94,7 +94,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
# All existing framework builds of Tcl/Tk don't support 64-bit
-@@ -1818,8 +1831,7 @@ class PyBuildExt(build_ext):
+@@ -1867,8 +1880,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
@@ -104,7 +104,7 @@ $OpenBSD: patch-setup_py,v 1.7 2013/05/2
tklib = self.compiler.find_library_file(lib_dirs,
'tk' + version)
tcllib = self.compiler.find_library_file(lib_dirs,
-@@ -1862,17 +1874,9 @@ class PyBuildExt(build_ext):
+@@ -1911,17 +1923,9 @@ class PyBuildExt(build_ext):
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
added_lib_dirs.append('/usr/openwin/lib')
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 27 Oct 2013 18:32:55 -0000 1.8
+++ pkg/PLIST-main 11 Nov 2013 15:48:05 -0000
@@ -1542,7 +1542,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.5-py2.7.egg-info
+lib/python2.7/lib-dynload/Python-2.7.6-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
@@ -1606,9 +1606,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.5.final.0.pickle
+lib/python2.7/lib2to3/Grammar2.7.6.final.0.pickle
lib/python2.7/lib2to3/PatternGrammar.txt
-lib/python2.7/lib2to3/PatternGrammar2.7.5.final.0.pickle
+lib/python2.7/lib2to3/PatternGrammar2.7.6.final.0.pickle
lib/python2.7/lib2to3/__init__.py
lib/python2.7/lib2to3/__init__.pyc
lib/python2.7/lib2to3/__init__.pyo
@@ -1836,6 +1836,7 @@ lib/python2.7/lib2to3/tests/data/README
lib/python2.7/lib2to3/tests/data/bom.py
lib/python2.7/lib2to3/tests/data/crlf.py
lib/python2.7/lib2to3/tests/data/different_encoding.py
+lib/python2.7/lib2to3/tests/data/false_encoding.py
lib/python2.7/lib2to3/tests/data/fixers/
lib/python2.7/lib2to3/tests/data/fixers/bad_order.py
lib/python2.7/lib2to3/tests/data/fixers/myfixes/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/2.7/pkg/PLIST-tests,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-tests
--- pkg/PLIST-tests 22 May 2013 12:39:30 -0000 1.5
+++ pkg/PLIST-tests 11 Nov 2013 15:48:06 -0000
@@ -7,7 +7,24 @@ lib/python2.7/test/Sine-1000Hz-300ms.aif
lib/python2.7/test/__init__.py
lib/python2.7/test/__init__.pyc
lib/python2.7/test/__init__.pyo
+lib/python2.7/test/audiodata/
+lib/python2.7/test/audiodata/pluck-pcm16.aiff
+lib/python2.7/test/audiodata/pluck-pcm16.au
+lib/python2.7/test/audiodata/pluck-pcm16.wav
+lib/python2.7/test/audiodata/pluck-pcm24.aiff
+lib/python2.7/test/audiodata/pluck-pcm24.wav
+lib/python2.7/test/audiodata/pluck-pcm32.aiff
+lib/python2.7/test/audiodata/pluck-pcm32.au
+lib/python2.7/test/audiodata/pluck-pcm32.wav
+lib/python2.7/test/audiodata/pluck-pcm8.aiff
+lib/python2.7/test/audiodata/pluck-pcm8.au
+lib/python2.7/test/audiodata/pluck-pcm8.wav
+lib/python2.7/test/audiodata/pluck-ulaw.aifc
+lib/python2.7/test/audiodata/pluck-ulaw.au
lib/python2.7/test/audiotest.au
+lib/python2.7/test/audiotests.py
+lib/python2.7/test/audiotests.pyc
+lib/python2.7/test/audiotests.pyo
lib/python2.7/test/autotest.py
lib/python2.7/test/autotest.pyc
lib/python2.7/test/autotest.pyo
@@ -252,6 +269,7 @@ lib/python2.7/test/mp_fork_bomb.py
lib/python2.7/test/mp_fork_bomb.pyc
lib/python2.7/test/mp_fork_bomb.pyo
lib/python2.7/test/nokia.pem
+lib/python2.7/test/nullbytecert.pem
lib/python2.7/test/nullcert.pem
lib/python2.7/test/outstanding_bugs.py
lib/python2.7/test/outstanding_bugs.pyc
@@ -840,6 +858,9 @@ lib/python2.7/test/test_httplib.pyo
lib/python2.7/test/test_httpservers.py
lib/python2.7/test/test_httpservers.pyc
lib/python2.7/test/test_httpservers.pyo
+lib/python2.7/test/test_idle.py
+lib/python2.7/test/test_idle.pyc
+lib/python2.7/test/test_idle.pyo
lib/python2.7/test/test_imageop.py
lib/python2.7/test/test_imageop.pyc
lib/python2.7/test/test_imageop.pyo
@@ -936,6 +957,9 @@ lib/python2.7/test/test_macostools.pyo
lib/python2.7/test/test_macpath.py
lib/python2.7/test/test_macpath.pyc
lib/python2.7/test/test_macpath.pyo
+lib/python2.7/test/test_macurl2path.py
+lib/python2.7/test/test_macurl2path.pyc
+lib/python2.7/test/test_macurl2path.pyo
lib/python2.7/test/test_mailbox.py
lib/python2.7/test/test_mailbox.pyc
lib/python2.7/test/test_mailbox.pyo
@@ -1005,6 +1029,9 @@ lib/python2.7/test/test_new.pyo
lib/python2.7/test/test_nis.py
lib/python2.7/test/test_nis.pyc
lib/python2.7/test/test_nis.pyo
+lib/python2.7/test/test_nntplib.py
+lib/python2.7/test/test_nntplib.pyc
+lib/python2.7/test/test_nntplib.pyo
lib/python2.7/test/test_normalization.py
lib/python2.7/test/test_normalization.pyc
lib/python2.7/test/test_normalization.pyo
@@ -1245,6 +1272,9 @@ lib/python2.7/test/test_ssl.pyo
lib/python2.7/test/test_startfile.py
lib/python2.7/test/test_startfile.pyc
lib/python2.7/test/test_startfile.pyo
+lib/python2.7/test/test_stat.py
+lib/python2.7/test/test_stat.pyc
+lib/python2.7/test/test_stat.pyo
lib/python2.7/test/test_str.py
lib/python2.7/test/test_str.pyc
lib/python2.7/test/test_str.pyo
@@ -1278,6 +1308,9 @@ lib/python2.7/test/test_structseq.pyo
lib/python2.7/test/test_subprocess.py
lib/python2.7/test/test_subprocess.pyc
lib/python2.7/test/test_subprocess.pyo
+lib/python2.7/test/test_sunau.py
+lib/python2.7/test/test_sunau.pyc
+lib/python2.7/test/test_sunau.pyo
lib/python2.7/test/test_sunaudiodev.py
lib/python2.7/test/test_sunaudiodev.pyc
lib/python2.7/test/test_sunaudiodev.pyo
