# HG changeset patch # User John Beck # Date 1403211261 25200 # Node ID 32663e59626dbc417daa42df76d7ea890c34a214 # Parent 5c1face45dc844b1dfce55af8de1a1e9806215cb 19004605 update Python 2.7 line to version 2.7.7 diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/Makefile --- a/components/python/python27/Makefile Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/Makefile Thu Jun 19 13:54:21 2014 -0700 @@ -26,16 +26,16 @@ PATH=/usr/bin:/usr/gnu/bin:/usr/sbin COMPONENT_NAME= Python -COMPONENT_VERSION= 2.7.6 +COMPONENT_VERSION= 2.7.7 COMPONENT_PROJECT_URL= http://python.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 + sha256:2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78 COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/python -TPNO= 17755 +TPNO= 18024 include $(WS_TOP)/make-rules/prep.mk include $(WS_TOP)/make-rules/configure.mk diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/00-bits.patch --- a/components/python/python27/patches/00-bits.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/00-bits.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,8 +1,9 @@ # # This patch makes the pyconfig.h header file 32/64 bit friendly. +# As it is Solaris-specific, it is not suitable for upstream. # ---- Python-2.7.6/configure.ac.~1~ 2013-11-09 23:36:41.000000000 -0800 -+++ Python-2.7.6/configure.ac 2014-05-14 11:47:47.888887846 -0700 +--- Python-2.7.7/configure.ac.~1~ 2014-05-31 11:58:40.000000000 -0700 ++++ Python-2.7.7/configure.ac 2014-06-02 10:43:06.642237312 -0700 @@ -5,7 +5,7 @@ # Set VERSION so we only need to edit in one place (i.e., here) m4_define(PYTHON_VERSION, 2.7) @@ -12,7 +13,7 @@ AC_REVISION($Revision$) AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) -@@ -2086,12 +2086,6 @@ +@@ -2079,12 +2079,6 @@ if test -z "$CCSHARED" then case $ac_sys_system/$ac_sys_release in diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/01-ext-stdio.patch --- a/components/python/python27/patches/01-ext-stdio.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/01-ext-stdio.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,3 +1,6 @@ +This patch provides extended file stdio support. +As it is Solaris-specific, it is not suitable for upstream. + --- Python-2.7.1/Modules/python.c.orig Tue Jun 21 21:35:45 2011 +++ Python-2.7.1/Modules/python.c Tue Jun 21 21:39:29 2011 @@ -6,6 +6,13 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/02-setup.patch --- a/components/python/python27/patches/02-setup.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/02-setup.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,5 +1,8 @@ ---- Python-2.7.6/setup.py.~1~ 2013-11-09 23:36:41.000000000 -0800 -+++ Python-2.7.6/setup.py 2014-05-14 12:46:04.859407465 -0700 +This patch modifies the setup script to support Solaris. +As it is Solaris-specific, it is not suitable for upstream. + +--- Python-2.7.7/setup.py.~1~ 2014-05-31 11:58:40.000000000 -0700 ++++ Python-2.7.7/setup.py 2014-06-02 10:51:15.317252625 -0700 @@ -437,9 +437,9 @@ def detect_modules(self): @@ -27,7 +30,7 @@ exts.append( Extension('readline', ['readline.c'], library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, -@@ -2075,7 +2082,8 @@ +@@ -2079,7 +2086,8 @@ # this option. If you want to compile ctypes with the Sun # compiler, please research a proper solution, instead of # finding some -z option for the Sun compiler. diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/03-vendor-packages.patch --- a/components/python/python27/patches/03-vendor-packages.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/03-vendor-packages.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,4 +1,6 @@ -diff --git Python-2.7.1/Lib/site-packages/vendor-packages.pth Python2.7.1/Lib/site-packages/vendor-packages.pth +This patch makes Python support the vendor-packages directory. +As it is Solaris-specific, it is not suitable for upstream. + --- /dev/null Sat Feb 12 00:21:26 2011 +++ Python-2.7.1/Lib/site-packages/vendor-packages.pth Sat Feb 12 00:47:05 2011 @@ -0,0 +1,1 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/04-solaris-64-bit.patch --- a/components/python/python27/patches/04-solaris-64-bit.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/04-solaris-64-bit.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,3 +1,8 @@ +This patch ensures that 64-bit shared objects are in a subdirectory named +"64". Note that changes to the Lib/distutils/tests/test_build.py and +Lib/distutils/tests/test_install.py avoid running tests that fail due to +this patch. As this is Solaris-specific, it is not suitable for upstream. + --- Python-2.7.6/Lib/distutils/command/build_ext.py.~1~ 2013-11-09 23:36:40.000000000 -0800 +++ Python-2.7.6/Lib/distutils/command/build_ext.py 2014-05-14 12:47:04.342901439 -0700 @@ -634,6 +634,10 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/05-dtrace.patch --- a/components/python/python27/patches/05-dtrace.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/05-dtrace.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,6 +1,11 @@ This patch adds Python dtrace support. Note it is necessary to modify test_sys.py to add an integer to the frameobject structure size since this patch adds "int f_calllineno" to the structure, so this test does not fail. +The patch comes from upstream: +http://www.jcea.es/artic/python_dtrace-2_7_7_af8ecf2352e1.txt +http://www.jcea.es/artic/python_dtrace.htm +Follow http://bugs.python.org/issue13405 for plans to get it +integrated into the main tree. --- Python-2.7.6/Makefile.pre.in.~1~ 2013-11-09 23:36:41.000000000 -0800 +++ Python-2.7.6/Makefile.pre.in 2014-05-14 12:54:43.824219677 -0700 @@ -414,9 +419,9 @@ +#pragma D attributes Private/Private/Common provider python function +#pragma D attributes Evolving/Evolving/Common provider python name +#pragma D attributes Evolving/Evolving/Common provider python args ---- Python-2.7.6/Lib/test/test_sys.py.~1~ 2013-11-09 23:36:40.000000000 -0800 -+++ Python-2.7.6/Lib/test/test_sys.py 2014-05-14 13:07:05.332748121 -0700 -@@ -612,7 +612,7 @@ +--- Python-2.7.7/Lib/test/test_sys.py.~1~ 2014-05-31 11:58:39.000000000 -0700 ++++ Python-2.7.7/Lib/test/test_sys.py 2014-06-02 10:44:39.318709539 -0700 +@@ -594,7 +594,7 @@ nfrees = len(x.f_code.co_freevars) extras = x.f_code.co_stacksize + x.f_code.co_nlocals +\ ncells + nfrees - 1 diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/06-ucred.patch --- a/components/python/python27/patches/06-ucred.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/06-ucred.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,7 +1,6 @@ -This patch provides Python ucred support. +This patch provides Python ucred support. It may be contributed upstream at +some point, but the suitability (or lack thereof) has not yet been determined. -diff --git Python-2.6.4/Modules/ucred.c Python-2.6.4/Modules/ucred.c -new file mode 100644 --- /dev/null +++ Python-2.6.4/Modules/ucred.c @@ -0,0 +1,390 @@ @@ -395,9 +394,9 @@ + + PyModule_AddObject(m, "ucred", (PyObject *)&pyucred_type); +} ---- Python-2.7.6/setup.py.~2~ 2014-05-14 13:07:52.803164982 -0700 -+++ Python-2.7.6/setup.py 2014-05-14 13:07:52.917214713 -0700 -@@ -1536,6 +1536,13 @@ +--- Python-2.7.7/setup.py.~2~ 2014-06-02 10:45:51.780497065 -0700 ++++ Python-2.7.7/setup.py 2014-06-02 10:45:51.850419067 -0700 +@@ -1540,6 +1540,13 @@ else: missing.append('dl') diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/07-dlpi.patch --- a/components/python/python27/patches/07-dlpi.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/07-dlpi.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,7 +1,6 @@ -This patch provides Python dlpi support. +This patch provides Python dlpi support. It may be contributed upstream at +some point, but the suitability (or lack thereof) has not yet been determined. -diff --git Python-2.6.4/Modules/dlpimodule.c Python-2.6.4/Modules/dlpimodule.c -new file mode 100644 --- /dev/null +++ Python-2.6.4/Modules/dlpimodule.c @@ -0,0 +1,1205 @@ @@ -1210,9 +1209,9 @@ + PyModule_AddIntConstant(mod, "IDLE", DL_IDLE); + PyModule_AddIntConstant(mod, "SYSERR", DL_SYSERR); +} ---- Python-2.7.6/setup.py.~3~ 2014-05-14 13:10:30.979598710 -0700 -+++ Python-2.7.6/setup.py 2014-05-14 13:10:31.006864446 -0700 -@@ -1543,6 +1543,12 @@ +--- Python-2.7.7/setup.py.~3~ 2014-06-02 10:47:19.947081420 -0700 ++++ Python-2.7.7/setup.py 2014-06-02 10:47:19.959427104 -0700 +@@ -1547,6 +1547,12 @@ exts.append( Extension('ucred', ['ucred.c'], libraries = ['tsol']) ) diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/08-encoding-alias.patch --- a/components/python/python27/patches/08-encoding-alias.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/08-encoding-alias.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,3 +1,6 @@ +Add missing encoding aliases. It may be contributed upstream at some point, +but the suitability (or lack thereof) has not yet been determined. + --- Python-2.7.6/Lib/encodings/aliases.py.~1~ 2013-11-09 23:36:40.000000000 -0800 +++ Python-2.7.6/Lib/encodings/aliases.py 2014-05-14 13:12:20.046910463 -0700 @@ -73,6 +73,7 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/09-rbac.patch --- a/components/python/python27/patches/09-rbac.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/09-rbac.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,7 +1,6 @@ -This patch provides Python RBAC support. +This patch provides Python RBAC support. It may be contributed upstream at +some point, but the suitability (or lack thereof) has not yet been determined. -diff --git Python-2.6.4/Modules/authattr.c Python-2.6.4/Modules/authattr.c -new file mode 100644 --- /dev/null +++ Python-2.6.4/Modules/authattr.c @@ -0,0 +1,261 @@ @@ -1254,9 +1253,9 @@ + 0, /* tp_alloc */ + Userattr_new, /* tp_new */ +}; ---- Python-2.7.6/setup.py.~4~ 2014-05-14 13:16:33.749494047 -0700 -+++ Python-2.7.6/setup.py 2014-05-14 13:16:33.803607449 -0700 -@@ -1549,6 +1549,22 @@ +--- Python-2.7.7/setup.py.~4~ 2014-06-02 10:48:19.437598836 -0700 ++++ Python-2.7.7/setup.py 2014-06-02 10:48:19.459434658 -0700 +@@ -1553,6 +1553,22 @@ exts.append( Extension('dlpi', ['dlpimodule.c'], libraries = ['dlpi']) ) diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/10-cflags.patch --- a/components/python/python27/patches/10-cflags.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/10-cflags.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,3 +1,5 @@ +This patch is Solaris-specific and thus not suitable for upstream. + --- Python-2.7.6/configure.ac.~2~ 2014-05-14 13:20:24.767295632 -0700 +++ Python-2.7.6/configure.ac 2014-05-14 13:20:25.052695991 -0700 @@ -1083,7 +1083,7 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/11-closerange.patch --- a/components/python/python27/patches/11-closerange.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/11-closerange.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,6 +1,9 @@ ---- Python-2.7.6/Modules/posixmodule.c.~1~ 2013-11-09 23:36:41.000000000 -0800 -+++ Python-2.7.6/Modules/posixmodule.c 2014-05-14 13:22:52.461187524 -0700 -@@ -6603,16 +6603,34 @@ +This patch uses fdwalk(3c) to close file descriptors; as that function is not +widely implemented, this is unsuitable for upstream. + +--- Python-2.7.7/Modules/posixmodule.c.~1~ 2014-05-31 11:58:40.000000000 -0700 ++++ Python-2.7.7/Modules/posixmodule.c 2014-06-02 10:49:30.052826955 -0700 +@@ -6607,16 +6607,34 @@ "closerange(fd_low, fd_high)\n\n\ Closes all file descriptors in [fd_low, fd_high), ignoring errors."); diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/12-studio-profile.patch --- a/components/python/python27/patches/12-studio-profile.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/12-studio-profile.patch Thu Jun 19 13:54:21 2014 -0700 @@ -2,9 +2,10 @@ Studio instead of gcc. The unfortunate repetition of options seen below is a workaround for build peculiarities and to meet Studio's requirement that the profiling options be used at all steps of the build -- not just -compilation. ---- Python-2.7.6/Makefile.pre.in.~2~ 2014-05-14 13:29:26.322546831 -0700 -+++ Python-2.7.6/Makefile.pre.in 2014-05-14 13:32:23.601766216 -0700 +compilation. As it is Solaris-specific, it is not suitable for upstream. + +--- Python-2.7.7/Makefile.pre.in.~2~ 2014-06-02 10:52:35.405443508 -0700 ++++ Python-2.7.7/Makefile.pre.in 2014-06-02 10:52:35.532782735 -0700 @@ -413,28 +413,37 @@ profile-opt: @echo "Building with support for profile generation:" @@ -48,7 +49,7 @@ # Build the interpreter -@@ -1293,7 +1302,7 @@ +@@ -1297,7 +1306,7 @@ -rm -f Lib/lib2to3/*Grammar*.pickle profile-removal: diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/13-pic-compile.patch --- a/components/python/python27/patches/13-pic-compile.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/13-pic-compile.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,3 +1,5 @@ +This patch is a Solaris-specific hack; it will not be submitted upstream. + --- Python-2.7.6/Lib/distutils/sysconfig.py.~1~ 2013-11-09 23:36:40.000000000 -0800 +++ Python-2.7.6/Lib/distutils/sysconfig.py 2014-05-14 13:33:21.453593946 -0700 @@ -208,6 +208,15 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/14-py_db.patch --- a/components/python/python27/patches/14-py_db.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/14-py_db.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,5 +1,8 @@ ---- Python-2.7.6/Makefile.pre.in.~3~ 2014-05-14 13:34:20.432313485 -0700 -+++ Python-2.7.6/Makefile.pre.in 2014-05-14 13:34:20.480920940 -0700 +This patch adds Python debugger support. It may be contributed upstream at +some point, but the suitability (or lack thereof) has not yet been determined. + +--- Python-2.7.7/Makefile.pre.in.~3~ 2014-06-02 10:54:32.421086337 -0700 ++++ Python-2.7.7/Makefile.pre.in 2014-06-02 10:54:32.438134113 -0700 @@ -407,7 +407,7 @@ # Default target @@ -9,7 +12,7 @@ # Compile a binary with gcc profile guided optimization. profile-opt: -@@ -777,6 +777,19 @@ +@@ -778,6 +778,19 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) @@ -29,7 +32,7 @@ ###################################################################### -@@ -841,7 +854,7 @@ +@@ -842,7 +855,7 @@ $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS) # Install everything diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/15-get_wch.patch --- a/components/python/python27/patches/15-get_wch.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/15-get_wch.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,3 +1,7 @@ +This patch adds wget_wch support to the curses module. It may be contributed +upstream at some point, but the suitability (or lack thereof) has not yet +been determined. + --- Python-2.7.6/Modules/_cursesmodule.c.~1~ 2013-11-09 23:36:41.000000000 -0800 +++ Python-2.7.6/Modules/_cursesmodule.c 2014-05-14 13:36:59.388642793 -0700 @@ -861,6 +861,37 @@ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/16-ossaudiodev.patch --- a/components/python/python27/patches/16-ossaudiodev.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/16-ossaudiodev.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,9 +1,10 @@ This patch is needed to make Python understand it can build the OSS plugin. -Some OSS ioctls are not supported on Solaris, so they are commented out. +Some OSS ioctls are not supported on Solaris, so they are ifdef'f out. As +the patch is Solaris-specific, it is not suitable for upstream. ---- Python-2.7.3/Modules/ossaudiodev.c-orig 2012-12-20 12:26:23.028233427 -0600 -+++ Python-2.7.3/Modules/ossaudiodev.c 2012-12-20 12:26:33.130986175 -0600 -@@ -1044,6 +1044,7 @@ initossaudiodev(void) +--- Python-2.7.7/Modules/ossaudiodev.c.~1~ 2014-05-31 11:58:40.000000000 -0700 ++++ Python-2.7.7/Modules/ossaudiodev.c 2014-06-02 10:58:12.132478970 -0700 +@@ -1037,6 +1037,7 @@ _EXPORT_INT(m, SOUND_MIXER_MONITOR); #endif @@ -11,7 +12,7 @@ /* Expose all the ioctl numbers for masochists who like to do this stuff directly. */ _EXPORT_INT(m, SNDCTL_COPR_HALT); -@@ -1056,6 +1057,7 @@ initossaudiodev(void) +@@ -1049,6 +1050,7 @@ _EXPORT_INT(m, SNDCTL_COPR_SENDMSG); _EXPORT_INT(m, SNDCTL_COPR_WCODE); _EXPORT_INT(m, SNDCTL_COPR_WDATA); @@ -19,7 +20,7 @@ #ifdef SNDCTL_DSP_BIND_CHANNEL _EXPORT_INT(m, SNDCTL_DSP_BIND_CHANNEL); #endif -@@ -1077,8 +1079,12 @@ initossaudiodev(void) +@@ -1070,8 +1072,12 @@ _EXPORT_INT(m, SNDCTL_DSP_GETSPDIF); #endif _EXPORT_INT(m, SNDCTL_DSP_GETTRIGGER); @@ -32,7 +33,7 @@ _EXPORT_INT(m, SNDCTL_DSP_NONBLOCK); _EXPORT_INT(m, SNDCTL_DSP_POST); #ifdef SNDCTL_DSP_PROFILE -@@ -1098,6 +1104,7 @@ initossaudiodev(void) +@@ -1091,6 +1097,7 @@ _EXPORT_INT(m, SNDCTL_DSP_STEREO); _EXPORT_INT(m, SNDCTL_DSP_SUBDIVIDE); _EXPORT_INT(m, SNDCTL_DSP_SYNC); @@ -40,15 +41,15 @@ _EXPORT_INT(m, SNDCTL_FM_4OP_ENABLE); _EXPORT_INT(m, SNDCTL_FM_LOAD_INSTR); _EXPORT_INT(m, SNDCTL_MIDI_INFO); -@@ -1139,4 +1146,5 @@ initossaudiodev(void) +@@ -1132,4 +1139,5 @@ _EXPORT_INT(m, SNDCTL_TMR_STOP); _EXPORT_INT(m, SNDCTL_TMR_TEMPO); _EXPORT_INT(m, SNDCTL_TMR_TIMEBASE); +#endif } ---- Python-2.7.6/setup.py.~5~ 2014-05-14 13:37:59.287142508 -0700 -+++ Python-2.7.6/setup.py 2014-05-14 13:40:01.472280298 -0700 -@@ -1632,8 +1632,8 @@ +--- Python-2.7.7/setup.py.~5~ 2014-06-02 10:59:28.977687415 -0700 ++++ Python-2.7.7/setup.py 2014-06-02 10:59:29.059824583 -0700 +@@ -1636,8 +1636,8 @@ else: missing.append('linuxaudiodev') diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/18-osconf-long.patch --- a/components/python/python27/patches/18-osconf-long.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/18-osconf-long.patch Thu Jun 19 13:54:21 2014 -0700 @@ -1,9 +1,9 @@ # http://bugs.python.org/issue17964 was fixed in 3.4 but not back-ported so we # need this patch for 2.7 . ---- Python-2.7.6/Modules/posixmodule.c.~2~ 2014-05-14 13:45:28.562707441 -0700 -+++ Python-2.7.6/Modules/posixmodule.c 2014-05-14 13:45:28.718886370 -0700 -@@ -8469,7 +8469,7 @@ +--- Python-2.7.7/Modules/posixmodule.c.~2~ 2014-06-02 11:01:10.919544709 -0700 ++++ Python-2.7.7/Modules/posixmodule.c 2014-06-02 11:01:11.009553336 -0700 +@@ -8499,7 +8499,7 @@ int name; if (PyArg_ParseTuple(args, "O&:sysconf", conv_sysconf_confname, &name)) { diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/19-recvfrom_into.patch --- a/components/python/python27/patches/19-recvfrom_into.patch Thu Jun 19 13:53:07 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,18 +0,0 @@ -# Fix from upstream: http://bugs.python.org/issue20246 - ---- Python-2.7.6/Modules/socketmodule.c.~1~ 2013-11-09 23:36:41.000000000 -0800 -+++ Python-2.7.6/Modules/socketmodule.c 2014-05-14 13:48:12.538122707 -0700 -@@ -2744,6 +2744,13 @@ - recvlen = buflen; - } - -+ /* Check if the buffer is large enough */ -+ if (buflen < recvlen) { -+ PyErr_SetString(PyExc_ValueError, -+ "buffer too small for requested bytes"); -+ goto error; -+ } -+ - readlen = sock_recvfrom_guts(s, buf.buf, recvlen, flags, &addr); - if (readlen < 0) { - /* Return an error */ diff -r 5c1face45dc8 -r 32663e59626d components/python/python27/patches/20-bsddb-harmful.patch --- a/components/python/python27/patches/20-bsddb-harmful.patch Thu Jun 19 13:53:07 2014 -0700 +++ b/components/python/python27/patches/20-bsddb-harmful.patch Thu Jun 19 13:54:21 2014 -0700 @@ -3,9 +3,9 @@ dump core. So skip it. The module is removed in Python 3, so this patch is not being submitted upstream. ---- Python-2.7.6/Makefile.pre.in.~4~ 2014-05-14 16:20:56.889089787 -0700 -+++ Python-2.7.6/Makefile.pre.in 2014-05-14 16:21:12.651500578 -0700 -@@ -972,7 +972,7 @@ +--- Python-2.7.7/Makefile.pre.in.~4~ 2014-06-02 11:08:40.909703116 -0700 ++++ Python-2.7.7/Makefile.pre.in 2014-06-02 11:08:40.977964319 -0700 +@@ -975,7 +975,7 @@ email email/mime email/test email/test/data \ json json/tests \ sqlite3 sqlite3/test \ @@ -13,7 +13,7 @@ + logging csv importlib wsgiref \ lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ - ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \ + ctypes ctypes/test ctypes/macholib \ --- Python-2.7.6/setup.py.~6~ 2014-05-14 17:15:45.315760008 -0700 +++ Python-2.7.6/setup.py 2014-05-14 17:16:27.440642039 -0700 @@ -1065,7 +1065,8 @@