# HG changeset patch # User John Beck # Date 1406648461 25200 # Node ID 6fa8f5812e20c2352e51b6ed9031e614026f2db9 # Parent cd5205b6221ac3ab9003037fd87cdd4595f4c5a2 19308541 update Python 2.7 line to version 2.7.8 19284990 python 2.7.7 segfaults while under memory stress diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/Makefile --- a/components/python/python27/Makefile Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/Makefile Tue Jul 29 08:41:01 2014 -0700 @@ -26,16 +26,16 @@ PATH=/usr/bin:/usr/gnu/bin:/usr/sbin COMPONENT_NAME= Python -COMPONENT_VERSION= 2.7.7 +COMPONENT_VERSION= 2.7.8 COMPONENT_PROJECT_URL= http://python.org/ COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.xz COMPONENT_ARCHIVE_HASH= \ - sha256:2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78 + sha256:edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)ftp/python/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE) COMPONENT_BUGDB= utility/python -TPNO= 18024 +TPNO= 18461 include $(WS_TOP)/make-rules/prep.mk include $(WS_TOP)/make-rules/configure.mk diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/00-bits.patch --- a/components/python/python27/patches/00-bits.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/00-bits.patch Tue Jul 29 08:41:01 2014 -0700 @@ -2,8 +2,8 @@ # 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.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 +--- Python-2.7.8/configure.ac.~1~ 2014-06-29 19:05:48.000000000 -0700 ++++ Python-2.7.8/configure.ac 2014-07-17 20:31:45.866247571 -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) @@ -13,7 +13,7 @@ AC_REVISION($Revision$) AC_INIT(python, PYTHON_VERSION, http://bugs.python.org/) -@@ -2079,12 +2079,6 @@ +@@ -2092,12 +2092,6 @@ if test -z "$CCSHARED" then case $ac_sys_system/$ac_sys_release in diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/02-setup.patch --- a/components/python/python27/patches/02-setup.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/02-setup.patch Tue Jul 29 08:41:01 2014 -0700 @@ -1,8 +1,8 @@ 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 +--- Python-2.7.8/setup.py.~1~ 2014-06-29 19:05:48.000000000 -0700 ++++ Python-2.7.8/setup.py 2014-07-17 20:37:57.419011542 -0700 @@ -437,9 +437,9 @@ def detect_modules(self): @@ -16,7 +16,7 @@ if cross_compiling: self.add_gcc_paths() self.add_multiarch_paths() -@@ -761,6 +761,13 @@ +@@ -763,6 +763,13 @@ ['/usr/lib/termcap'], 'termcap'): readline_libs.append('termcap') @@ -30,7 +30,7 @@ exts.append( Extension('readline', ['readline.c'], library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, -@@ -2079,7 +2086,8 @@ +@@ -2081,7 +2088,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 cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/05-dtrace.patch --- a/components/python/python27/patches/05-dtrace.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/05-dtrace.patch Tue Jul 29 08:41:01 2014 -0700 @@ -64,8 +64,8 @@ f->f_lineno = code->co_firstlineno; f->f_iblock = 0; ---- Python-2.7.6/Python/ceval.c.~1~ 2013-11-09 23:36:41.000000000 -0800 -+++ Python-2.7.6/Python/ceval.c 2014-05-14 13:04:01.334853206 -0700 +--- Python-2.7.8/Python/ceval.c.~1~ 2014-06-29 19:05:46.000000000 -0700 ++++ Python-2.7.8/Python/ceval.c 2014-07-17 20:39:49.843868592 -0700 @@ -19,6 +19,11 @@ #include @@ -78,7 +78,7 @@ #ifndef WITH_TSC #define READ_TIMESTAMP(var) -@@ -672,6 +677,55 @@ +@@ -678,6 +683,55 @@ NULL); } @@ -134,7 +134,7 @@ /* Interpreter main loop */ -@@ -683,9 +737,84 @@ +@@ -689,9 +743,84 @@ return PyEval_EvalFrameEx(f, 0); } @@ -219,7 +219,7 @@ #ifdef DXPAIRS int lastopcode = 0; #endif -@@ -910,6 +1039,11 @@ +@@ -916,6 +1045,11 @@ } } @@ -231,7 +231,7 @@ co = f->f_code; names = co->co_names; consts = co->co_consts; -@@ -2660,6 +2794,9 @@ +@@ -2673,6 +2807,9 @@ PyObject **sp; PCALL(PCALL_ALL); sp = stack_pointer; @@ -241,7 +241,7 @@ #ifdef WITH_TSC x = call_function(&sp, oparg, &intr0, &intr1); #else -@@ -2701,6 +2838,9 @@ +@@ -2714,6 +2851,9 @@ } else Py_INCREF(func); sp = stack_pointer; @@ -251,7 +251,7 @@ READ_TIMESTAMP(intr0); x = ext_do_call(func, &sp, flags, na, nk); READ_TIMESTAMP(intr1); -@@ -3001,6 +3141,10 @@ +@@ -3014,6 +3154,10 @@ /* pop frame */ exit_eval_frame: diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/06-ucred.patch --- a/components/python/python27/patches/06-ucred.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/06-ucred.patch Tue Jul 29 08:41:01 2014 -0700 @@ -394,9 +394,9 @@ + + PyModule_AddObject(m, "ucred", (PyObject *)&pyucred_type); +} ---- 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 @@ +--- Python-2.7.8/setup.py.~2~ 2014-07-17 20:41:55.688200021 -0700 ++++ Python-2.7.8/setup.py 2014-07-17 20:41:55.733063564 -0700 +@@ -1542,6 +1542,13 @@ else: missing.append('dl') diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/07-dlpi.patch --- a/components/python/python27/patches/07-dlpi.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/07-dlpi.patch Tue Jul 29 08:41:01 2014 -0700 @@ -1209,9 +1209,9 @@ + PyModule_AddIntConstant(mod, "IDLE", DL_IDLE); + PyModule_AddIntConstant(mod, "SYSERR", DL_SYSERR); +} ---- 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 @@ +--- Python-2.7.8/setup.py.~3~ 2014-07-17 20:43:48.715101356 -0700 ++++ Python-2.7.8/setup.py 2014-07-17 20:43:48.731874294 -0700 +@@ -1549,6 +1549,12 @@ exts.append( Extension('ucred', ['ucred.c'], libraries = ['tsol']) ) diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/09-rbac.patch --- a/components/python/python27/patches/09-rbac.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/09-rbac.patch Tue Jul 29 08:41:01 2014 -0700 @@ -1253,9 +1253,9 @@ + 0, /* tp_alloc */ + Userattr_new, /* tp_new */ +}; ---- 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 @@ +--- Python-2.7.8/setup.py.~4~ 2014-07-17 20:44:54.016102084 -0700 ++++ Python-2.7.8/setup.py 2014-07-17 20:44:54.040843123 -0700 +@@ -1555,6 +1555,22 @@ exts.append( Extension('dlpi', ['dlpimodule.c'], libraries = ['dlpi']) ) diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/12-studio-profile.patch --- a/components/python/python27/patches/12-studio-profile.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/12-studio-profile.patch Tue Jul 29 08:41:01 2014 -0700 @@ -4,8 +4,8 @@ that the profiling options be used at all steps of the build -- not just 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 +--- Python-2.7.8/Makefile.pre.in.~2~ 2014-07-17 20:46:10.626664937 -0700 ++++ Python-2.7.8/Makefile.pre.in 2014-07-17 20:46:10.736821411 -0700 @@ -413,28 +413,37 @@ profile-opt: @echo "Building with support for profile generation:" @@ -49,7 +49,7 @@ # Build the interpreter -@@ -1297,7 +1306,7 @@ +@@ -1298,7 +1307,7 @@ -rm -f Lib/lib2to3/*Grammar*.pickle profile-removal: diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/16-ossaudiodev.patch --- a/components/python/python27/patches/16-ossaudiodev.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/16-ossaudiodev.patch Tue Jul 29 08:41:01 2014 -0700 @@ -47,9 +47,9 @@ _EXPORT_INT(m, SNDCTL_TMR_TIMEBASE); +#endif } ---- 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 @@ +--- Python-2.7.8/setup.py.~5~ 2014-07-17 20:47:50.251398063 -0700 ++++ Python-2.7.8/setup.py 2014-07-17 20:47:50.359537973 -0700 +@@ -1638,8 +1638,8 @@ else: missing.append('linuxaudiodev') diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/patches/20-bsddb-harmful.patch --- a/components/python/python27/patches/20-bsddb-harmful.patch Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/patches/20-bsddb-harmful.patch Tue Jul 29 08:41:01 2014 -0700 @@ -14,9 +14,9 @@ lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ 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 @@ +--- Python-2.7.8/setup.py.~6~ 2014-07-17 20:49:23.834928506 -0700 ++++ Python-2.7.8/setup.py 2014-07-17 20:49:23.872603149 -0700 +@@ -1067,7 +1067,8 @@ db_dirs_to_check + lib_dirs, dblib ) if dblib_file: dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ] diff -r cd5205b6221a -r 6fa8f5812e20 components/python/python27/python-27-tests.p5m --- a/components/python/python27/python-27-tests.p5m Thu Jul 17 21:06:55 2014 -0700 +++ b/components/python/python27/python-27-tests.p5m Tue Jul 29 08:41:01 2014 -0700 @@ -59,7 +59,6 @@ file path=usr/lib/python2.7/ctypes/test/test_cfuncs.py file path=usr/lib/python2.7/ctypes/test/test_checkretval.py file path=usr/lib/python2.7/ctypes/test/test_delattr.py -file path=usr/lib/python2.7/ctypes/test/test_errcheck.py file path=usr/lib/python2.7/ctypes/test/test_errno.py file path=usr/lib/python2.7/ctypes/test/test_find.py file path=usr/lib/python2.7/ctypes/test/test_frombuffer.py @@ -67,7 +66,6 @@ file path=usr/lib/python2.7/ctypes/test/test_functions.py file path=usr/lib/python2.7/ctypes/test/test_incomplete.py file path=usr/lib/python2.7/ctypes/test/test_init.py -file path=usr/lib/python2.7/ctypes/test/test_integers.py file path=usr/lib/python2.7/ctypes/test/test_internals.py file path=usr/lib/python2.7/ctypes/test/test_keeprefs.py file path=usr/lib/python2.7/ctypes/test/test_libc.py @@ -204,16 +202,21 @@ file path=usr/lib/python2.7/idlelib/idle_test/htest.py file path=usr/lib/python2.7/idlelib/idle_test/mock_idle.py file path=usr/lib/python2.7/idlelib/idle_test/mock_tk.py +file path=usr/lib/python2.7/idlelib/idle_test/test_autocomplete.py +file path=usr/lib/python2.7/idlelib/idle_test/test_autoexpand.py file path=usr/lib/python2.7/idlelib/idle_test/test_calltips.py file path=usr/lib/python2.7/idlelib/idle_test/test_config_name.py file path=usr/lib/python2.7/idlelib/idle_test/test_delegator.py file path=usr/lib/python2.7/idlelib/idle_test/test_formatparagraph.py file path=usr/lib/python2.7/idlelib/idle_test/test_grep.py +file path=usr/lib/python2.7/idlelib/idle_test/test_hyperparser.py file path=usr/lib/python2.7/idlelib/idle_test/test_idlehistory.py +file path=usr/lib/python2.7/idlelib/idle_test/test_parenmatch.py file path=usr/lib/python2.7/idlelib/idle_test/test_pathbrowser.py file path=usr/lib/python2.7/idlelib/idle_test/test_rstrip.py file path=usr/lib/python2.7/idlelib/idle_test/test_searchengine.py file path=usr/lib/python2.7/idlelib/idle_test/test_text.py +file path=usr/lib/python2.7/idlelib/idle_test/test_textview.py file path=usr/lib/python2.7/idlelib/idle_test/test_warning.py file path=usr/lib/python2.7/idlelib/testcode.py file path=usr/lib/python2.7/json/tests/__init__.py @@ -241,6 +244,8 @@ file path=usr/lib/python2.7/lib-tk/test/README file path=usr/lib/python2.7/lib-tk/test/runtktests.py file path=usr/lib/python2.7/lib-tk/test/test_tkinter/__init__.py +file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_geometry_managers.py +file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_images.py file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_loadtk.py file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_text.py file path=usr/lib/python2.7/lib-tk/test/test_tkinter/test_variables.py @@ -879,6 +884,7 @@ file path=usr/lib/python2.7/test/test_socketserver.py file path=usr/lib/python2.7/test/test_softspace.py file path=usr/lib/python2.7/test/test_sort.py +file path=usr/lib/python2.7/test/test_spwd.py file path=usr/lib/python2.7/test/test_sqlite.py file path=usr/lib/python2.7/test/test_ssl.py file path=usr/lib/python2.7/test/test_startfile.py