From 91b628d395ef06be798b9a4578f9b1fe319b96b06f0d967fa566c43d451e8e38 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 30 Jun 2016 10:50:57 +0000 Subject: [PATCH] - update to 2.7.12 * dozens of bugfixes, see NEWS for details * fixes multiple security issues: CVE-2016-0772 TLS stripping attack on smtplib (bsc#984751) CVE-2016-5636 zipimporter heap overflow (bsc#985177) - removed upstreamed python-2.7.7-mhlib-linkcount.patch - refreshed multilib patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=192 --- Python-2.7.10.tar.xz | 3 - Python-2.7.10.tar.xz.asc | 17 --- Python-2.7.12.tar.xz | 3 + Python-2.7.12.tar.xz.asc | 17 +++ python-2.7.10-docs-pdf-a4.tar.bz2 | 3 - python-2.7.10-docs-pdf-letter.tar.bz2 | 3 - python-2.7.12-docs-pdf-a4.tar.bz2 | 3 + python-2.7.12-docs-pdf-letter.tar.bz2 | 3 + python-2.7.5-multilib.patch | 149 +++++++++++++------------- python-2.7.7-mhlib-linkcount.patch | 52 --------- python-base.changes | 11 ++ python-base.spec | 9 +- python-doc.changes | 9 ++ python-doc.spec | 10 +- python.changes | 9 ++ python.spec | 10 +- 16 files changed, 138 insertions(+), 173 deletions(-) delete mode 100644 Python-2.7.10.tar.xz delete mode 100644 Python-2.7.10.tar.xz.asc create mode 100644 Python-2.7.12.tar.xz create mode 100644 Python-2.7.12.tar.xz.asc delete mode 100644 python-2.7.10-docs-pdf-a4.tar.bz2 delete mode 100644 python-2.7.10-docs-pdf-letter.tar.bz2 create mode 100644 python-2.7.12-docs-pdf-a4.tar.bz2 create mode 100644 python-2.7.12-docs-pdf-letter.tar.bz2 delete mode 100644 python-2.7.7-mhlib-linkcount.patch diff --git a/Python-2.7.10.tar.xz b/Python-2.7.10.tar.xz deleted file mode 100644 index a8c1a6d..0000000 --- a/Python-2.7.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0 -size 12250696 diff --git a/Python-2.7.10.tar.xz.asc b/Python-2.7.10.tar.xz.asc deleted file mode 100644 index da28122..0000000 --- a/Python-2.7.10.tar.xz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABAgAGBQJVYKg7AAoJEATDZ8IYrdT/p4UP/RYnnxgYX0a/73mFvjvmBOHC -KGdU4TQS3Cp/bKDCgIDTFlMMZIJO7pBdznCfsHN3Rv2ajjuiYjU6kqpDwXRt/SLF -ExSAzndRDNvw7IJJlleWVv+vlBKGKfXXq7b83Kn6I0jzYS+Pt03RsmJ093mfMjh8 -YJZPedGWfaRPhQckoWvYD1vJDlNNe7+jyE1io884oZfvRX13SogP8wDLu+Iw/kDw -vVy7PWk97iwqNOZYbgdk02n1qDzl1HENtFbJ4KI9uJpjCJf7Qqegjv9vT0F89yGv -3OrtrcsxK0FuERiyfKzXqA+ie2UVTKohWEnyBTzjjM/jBupQCz2VuSxxnzswxDAI -hvx6dXXrudIJfEnhTBmgFVZxZzzE8FnrxuaagyX58AmCo3fuft/o3BZs96IHUiir -CA72BVBHw/QrTSqitSjidq/wMCj46OlsoqsVT/sGVnF3ohzU1Q+BpXq0B4fs6cOT -HMHDCpm7xot6mH/CDszFUCCDsWMLFt8x2vl1jumN/h0Bs9s29qWfqS1L5NTqtzLS -JhftvWqyJRddZCdOdXfzEk2kU9ddqutuKeiSJPgoAwfEIZt2FI9exQ5hyNZFYtGO -Uwi+NMneIUkkX+hUaof4bGhwHrAi2ls6Ys+sm4wDM69asdXXxz8BuR4WngFCGI5H -ArOsKSWsknIU7Iwr6Nk8 -=PlRW ------END PGP SIGNATURE----- diff --git a/Python-2.7.12.tar.xz b/Python-2.7.12.tar.xz new file mode 100644 index 0000000..bf9079c --- /dev/null +++ b/Python-2.7.12.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978 +size 12390820 diff --git a/Python-2.7.12.tar.xz.asc b/Python-2.7.12.tar.xz.asc new file mode 100644 index 0000000..d652183 --- /dev/null +++ b/Python-2.7.12.tar.xz.asc @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJXbv4BAAoJEATDZ8IYrdT/tvgQAKxibPTOHYEqOr4y9AIFow0d +U+FXjVacCOO3GqM6GZlHfM7kjAkqZzSjqFwdiS7fIeKP0fzob+D9ujADmyRvNBV/ +gpfaGQyLMhV9wcPxdn/4NdHItR3USoLXA4vDEGLggIW8b9Rr0pNTa9AM4X/TN1bD +I3X6WrfjeSyiNiKieDpBRlGI4SVLG+Qtz5GL2K2U+d7leWXUAOJdKp4BUQdupFTz +tTzyvYOufvwNkOiS/H+lV2KVt9FgtOl6KYsZpoAQJzI6PjKoYN/FTr2oiK9KnR/F +wuRa8fRJ6aY22Qk0ne50NfRmzo0/5rGI0HQmPNkiderrj0uA6chhZB5vqP0BBd+8 +M3zS5O2jme5fTuxCEtrasXZ7K3UaMturTXPJWrC0Cy0yxm2GtYG6oeUsw9HlR9/c +tO2JnZ217HqiGLzfK3YzNnpbG0Dpim4PleswlZXaEMs6xpBYk3yrbN8OFCxTIHQ1 +kcGsML6t+g3mXmiTIgIwb7EM9wcSaDsTUsNmBbGsZRcMqdSwDEK8upihevgnyemg +v+RMuDyvBHfTF9SODMnWBvPNj7MoB6MHT0+fTPaWpISscAcTImYZVcmMttahZS1g +ID0bMNnqL4Mchnksl4JHt98ggofGReuZF74T5HTYdoYVpSGXIYNkxGTS4YM9BBbA +GWKG06BiwDYBxTr6fQNO +=YuS4 +-----END PGP SIGNATURE----- diff --git a/python-2.7.10-docs-pdf-a4.tar.bz2 b/python-2.7.10-docs-pdf-a4.tar.bz2 deleted file mode 100644 index d4cf28d..0000000 --- a/python-2.7.10-docs-pdf-a4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f2c006cd3002a44d64cb49b316cdc3e3fdf4ee78c611c5663d1f57bcc31c26d -size 10658678 diff --git a/python-2.7.10-docs-pdf-letter.tar.bz2 b/python-2.7.10-docs-pdf-letter.tar.bz2 deleted file mode 100644 index 58227ad..0000000 --- a/python-2.7.10-docs-pdf-letter.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f9de884af47e13e46447bd4a0bbfe3a9f9b3fd367adaa8c61e263a3c70774fc -size 10713855 diff --git a/python-2.7.12-docs-pdf-a4.tar.bz2 b/python-2.7.12-docs-pdf-a4.tar.bz2 new file mode 100644 index 0000000..7e9106f --- /dev/null +++ b/python-2.7.12-docs-pdf-a4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7598a5e9f1bff3ca8b27834fa4cb9e88ad44a1a64e01c261bf84fa7b76ea8307 +size 10676602 diff --git a/python-2.7.12-docs-pdf-letter.tar.bz2 b/python-2.7.12-docs-pdf-letter.tar.bz2 new file mode 100644 index 0000000..3947607 --- /dev/null +++ b/python-2.7.12-docs-pdf-letter.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:02eb305c62e04e5b9f583a281909546eeb5a0a93c567ecc0fe86680a249121f7 +size 10731532 diff --git a/python-2.7.5-multilib.patch b/python-2.7.5-multilib.patch index 111ec5a..e55c68d 100644 --- a/python-2.7.5-multilib.patch +++ b/python-2.7.5-multilib.patch @@ -1,8 +1,8 @@ -Index: Python-2.7.6/configure.ac +Index: Python-2.7.12/configure.ac =================================================================== ---- Python-2.7.6.orig/configure.ac 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/configure.ac 2014-02-11 20:08:16.265571499 +0100 -@@ -733,6 +733,41 @@ +--- Python-2.7.12.orig/configure.ac ++++ Python-2.7.12/configure.ac +@@ -756,6 +756,41 @@ SunOS*) ;; esac @@ -44,11 +44,11 @@ Index: Python-2.7.6/configure.ac AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -Index: Python-2.7.6/Include/pythonrun.h +Index: Python-2.7.12/Include/pythonrun.h =================================================================== ---- Python-2.7.6.orig/Include/pythonrun.h 2013-11-10 08:36:39.000000000 +0100 -+++ Python-2.7.6/Include/pythonrun.h 2014-02-11 20:08:16.265571499 +0100 -@@ -108,6 +108,8 @@ +--- Python-2.7.12.orig/Include/pythonrun.h ++++ Python-2.7.12/Include/pythonrun.h +@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void); /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); PyAPI_FUNC(const char *) Py_GetPlatform(void); @@ -57,11 +57,11 @@ Index: Python-2.7.6/Include/pythonrun.h PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-2.7.6/Lib/distutils/command/install.py +Index: Python-2.7.12/Lib/distutils/command/install.py =================================================================== ---- Python-2.7.6.orig/Lib/distutils/command/install.py 2014-02-11 20:08:15.760568524 +0100 -+++ Python-2.7.6/Lib/distutils/command/install.py 2014-02-11 20:08:16.265571499 +0100 -@@ -22,6 +22,8 @@ +--- Python-2.7.12.orig/Lib/distutils/command/install.py ++++ Python-2.7.12/Lib/distutils/command/install.py +@@ -22,6 +22,8 @@ from site import USER_BASE from site import USER_SITE @@ -70,7 +70,7 @@ Index: Python-2.7.6/Lib/distutils/command/install.py if sys.version < "2.2": WINDOWS_SCHEME = { 'purelib': '$base', -@@ -42,7 +44,7 @@ +@@ -42,7 +44,7 @@ else: INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', @@ -79,11 +79,11 @@ Index: Python-2.7.6/Lib/distutils/command/install.py 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-2.7.6/Lib/distutils/sysconfig.py +Index: Python-2.7.12/Lib/distutils/sysconfig.py =================================================================== ---- Python-2.7.6.orig/Lib/distutils/sysconfig.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/distutils/sysconfig.py 2014-02-11 20:08:16.265571499 +0100 -@@ -119,8 +119,11 @@ +--- Python-2.7.12.orig/Lib/distutils/sysconfig.py ++++ Python-2.7.12/Lib/distutils/sysconfig.py +@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -97,11 +97,11 @@ Index: Python-2.7.6/Lib/distutils/sysconfig.py if standard_lib: return libpython else: -Index: Python-2.7.6/Lib/pydoc.py +Index: Python-2.7.12/Lib/pydoc.py =================================================================== ---- Python-2.7.6.orig/Lib/pydoc.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/pydoc.py 2014-02-11 20:08:16.266571506 +0100 -@@ -352,7 +352,7 @@ +--- Python-2.7.12.orig/Lib/pydoc.py ++++ Python-2.7.12/Lib/pydoc.py +@@ -384,7 +384,7 @@ class Doc: docloc = os.environ.get("PYTHONDOCS", "http://docs.python.org/library") @@ -110,11 +110,11 @@ Index: Python-2.7.6/Lib/pydoc.py "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-2.7.6/Lib/site.py +Index: Python-2.7.12/Lib/site.py =================================================================== ---- Python-2.7.6.orig/Lib/site.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/site.py 2014-02-11 20:12:51.208189992 +0100 -@@ -231,29 +231,38 @@ +--- Python-2.7.12.orig/Lib/site.py ++++ Python-2.7.12/Lib/site.py +@@ -231,29 +231,38 @@ def getuserbase(): USER_BASE = get_config_var('userbase') return USER_BASE @@ -159,7 +159,7 @@ Index: Python-2.7.6/Lib/site.py def addusersitepackages(known_paths): """Add a per user site-package to sys.path -@@ -263,10 +272,12 @@ +@@ -263,10 +272,12 @@ def addusersitepackages(known_paths): """ # get the per user site-package path # this call will also make sure USER_BASE and USER_SITE are set @@ -175,7 +175,7 @@ Index: Python-2.7.6/Lib/site.py return known_paths def getsitepackages(): -@@ -288,13 +299,18 @@ +@@ -288,13 +299,18 @@ def getsitepackages(): if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -197,11 +197,11 @@ Index: Python-2.7.6/Lib/site.py if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-2.7.6/Lib/sysconfig.py +Index: Python-2.7.12/Lib/sysconfig.py =================================================================== ---- Python-2.7.6.orig/Lib/sysconfig.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/sysconfig.py 2014-02-11 20:08:16.266571506 +0100 -@@ -7,10 +7,10 @@ +--- Python-2.7.12.orig/Lib/sysconfig.py ++++ Python-2.7.12/Lib/sysconfig.py +@@ -7,10 +7,10 @@ from os.path import pardir, realpath _INSTALL_SCHEMES = { 'posix_prefix': { @@ -215,7 +215,7 @@ Index: Python-2.7.6/Lib/sysconfig.py 'include': '{base}/include/python{py_version_short}', 'platinclude': '{platbase}/include/python{py_version_short}', 'scripts': '{base}/bin', -@@ -65,10 +65,10 @@ +@@ -65,10 +65,10 @@ _INSTALL_SCHEMES = { 'data' : '{userbase}', }, 'posix_user': { @@ -229,11 +229,11 @@ Index: Python-2.7.6/Lib/sysconfig.py 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', -Index: Python-2.7.6/Lib/test/test_dl.py +Index: Python-2.7.12/Lib/test/test_dl.py =================================================================== ---- Python-2.7.6.orig/Lib/test/test_dl.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/test/test_dl.py 2014-02-11 20:08:16.266571506 +0100 -@@ -5,10 +5,11 @@ +--- Python-2.7.12.orig/Lib/test/test_dl.py ++++ Python-2.7.12/Lib/test/test_dl.py +@@ -4,10 +4,11 @@ import unittest from test.test_support import verbose, import_module dl = import_module('dl', deprecated=True) @@ -247,11 +247,11 @@ Index: Python-2.7.6/Lib/test/test_dl.py ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Python-2.7.6/Lib/test/test_site.py +Index: Python-2.7.12/Lib/test/test_site.py =================================================================== ---- Python-2.7.6.orig/Lib/test/test_site.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/test/test_site.py 2014-02-11 20:08:16.266571506 +0100 -@@ -241,12 +241,16 @@ +--- Python-2.7.12.orig/Lib/test/test_site.py ++++ Python-2.7.12/Lib/test/test_site.py +@@ -246,12 +246,16 @@ class HelperFunctionsTests(unittest.Test self.assertEqual(dirs[2], wanted) elif os.sep == '/': # OS X non-framwework builds, Linux, FreeBSD, etc @@ -271,11 +271,11 @@ Index: Python-2.7.6/Lib/test/test_site.py else: # other platforms self.assertEqual(len(dirs), 2) -Index: Python-2.7.6/Lib/trace.py +Index: Python-2.7.12/Lib/trace.py =================================================================== ---- Python-2.7.6.orig/Lib/trace.py 2013-11-10 08:36:40.000000000 +0100 -+++ Python-2.7.6/Lib/trace.py 2014-02-11 20:08:16.266571506 +0100 -@@ -754,10 +754,10 @@ +--- Python-2.7.12.orig/Lib/trace.py ++++ Python-2.7.12/Lib/trace.py +@@ -754,10 +754,10 @@ def main(argv=None): # should I also call expanduser? (after all, could use $HOME) s = s.replace("$prefix", @@ -288,11 +288,11 @@ Index: Python-2.7.6/Lib/trace.py "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-2.7.6/Makefile.pre.in +Index: Python-2.7.12/Makefile.pre.in =================================================================== ---- Python-2.7.6.orig/Makefile.pre.in 2014-02-11 20:08:15.175565077 +0100 -+++ Python-2.7.6/Makefile.pre.in 2014-02-11 20:08:16.267571511 +0100 -@@ -87,6 +87,8 @@ +--- Python-2.7.12.orig/Makefile.pre.in ++++ Python-2.7.12/Makefile.pre.in +@@ -92,6 +92,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -301,7 +301,7 @@ Index: Python-2.7.6/Makefile.pre.in # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -584,6 +586,7 @@ +@@ -669,6 +671,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -309,7 +309,7 @@ Index: Python-2.7.6/Makefile.pre.in -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -626,7 +629,7 @@ +@@ -720,7 +723,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES) Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -318,25 +318,20 @@ Index: Python-2.7.6/Makefile.pre.in Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-2.7.6/Modules/getpath.c +Index: Python-2.7.12/Modules/getpath.c =================================================================== ---- Python-2.7.6.orig/Modules/getpath.c 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/Modules/getpath.c 2014-02-11 20:08:16.267571511 +0100 -@@ -116,9 +116,11 @@ - #define EXEC_PREFIX PREFIX +--- Python-2.7.12.orig/Modules/getpath.c ++++ Python-2.7.12/Modules/getpath.c +@@ -100,6 +100,8 @@ + #error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" #endif +#define LIB_PYTHON LIB "/python" VERSION + - #ifndef PYTHONPATH --#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ -- EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" -+#define PYTHONPATH PREFIX "/" LIB_PYTHON ":" \ -+ EXEC_PREFIX "/" LIB_PYTHON "/lib-dynload" - #endif - #ifndef LANDMARK -@@ -129,7 +131,7 @@ + #define LANDMARK "os.py" + #endif +@@ -108,7 +110,7 @@ static char prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1]; static char progpath[MAXPATHLEN+1]; static char *module_search_path = NULL; @@ -345,11 +340,11 @@ Index: Python-2.7.6/Modules/getpath.c static void reduce(char *dir) -Index: Python-2.7.6/Python/getplatform.c +Index: Python-2.7.12/Python/getplatform.c =================================================================== ---- Python-2.7.6.orig/Python/getplatform.c 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/Python/getplatform.c 2014-02-11 20:08:16.267571511 +0100 -@@ -10,3 +10,23 @@ +--- Python-2.7.12.orig/Python/getplatform.c ++++ Python-2.7.12/Python/getplatform.c +@@ -10,3 +10,23 @@ Py_GetPlatform(void) { return PLATFORM; } @@ -373,11 +368,11 @@ Index: Python-2.7.6/Python/getplatform.c +{ + return LIB; +} -Index: Python-2.7.6/Python/sysmodule.c +Index: Python-2.7.12/Python/sysmodule.c =================================================================== ---- Python-2.7.6.orig/Python/sysmodule.c 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/Python/sysmodule.c 2014-02-11 20:08:16.267571511 +0100 -@@ -1419,6 +1419,10 @@ +--- Python-2.7.12.orig/Python/sysmodule.c ++++ Python-2.7.12/Python/sysmodule.c +@@ -1437,6 +1437,10 @@ _PySys_Init(void) PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyString_FromString(Py_GetPlatform())); @@ -388,11 +383,11 @@ Index: Python-2.7.6/Python/sysmodule.c SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: Python-2.7.6/setup.py +Index: Python-2.7.12/setup.py =================================================================== ---- Python-2.7.6.orig/setup.py 2013-11-10 08:36:41.000000000 +0100 -+++ Python-2.7.6/setup.py 2014-02-11 20:08:16.268571517 +0100 -@@ -438,7 +438,7 @@ +--- Python-2.7.12.orig/setup.py ++++ Python-2.7.12/setup.py +@@ -456,7 +456,7 @@ class PyBuildExt(build_ext): def detect_modules(self): # Ensure that /usr/local is always used if not cross_compiling: @@ -401,7 +396,7 @@ Index: Python-2.7.6/setup.py add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') if cross_compiling: self.add_gcc_paths() -@@ -758,11 +758,11 @@ +@@ -782,11 +782,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -415,7 +410,7 @@ Index: Python-2.7.6/setup.py extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1910,18 +1910,17 @@ +@@ -1938,18 +1938,17 @@ class PyBuildExt(build_ext): # Check for various platform-specific directories if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') diff --git a/python-2.7.7-mhlib-linkcount.patch b/python-2.7.7-mhlib-linkcount.patch deleted file mode 100644 index 5185d73..0000000 --- a/python-2.7.7-mhlib-linkcount.patch +++ /dev/null @@ -1,52 +0,0 @@ -Index: Python-2.7.7/Lib/mhlib.py -=================================================================== ---- Python-2.7.7.orig/Lib/mhlib.py 2014-05-31 20:58:39.000000000 +0200 -+++ Python-2.7.7/Lib/mhlib.py 2014-07-24 16:08:26.049343760 +0200 -@@ -156,11 +156,6 @@ - """Return the names of the subfolders in a given folder - (prefixed with the given folder name).""" - fullname = os.path.join(self.path, name) -- # Get the link count so we can avoid listing folders -- # that have no subfolders. -- nlinks = os.stat(fullname).st_nlink -- if nlinks <= 2: -- return [] - subfolders = [] - subnames = os.listdir(fullname) - for subname in subnames: -@@ -168,11 +163,6 @@ - if os.path.isdir(fullsubname): - name_subname = os.path.join(name, subname) - subfolders.append(name_subname) -- # Stop looking for subfolders when -- # we've seen them all -- nlinks = nlinks - 1 -- if nlinks <= 2: -- break - subfolders.sort() - return subfolders - -@@ -183,11 +173,6 @@ - def listallsubfolders(self, name): - """Return the names of subfolders in a given folder, recursively.""" - fullname = os.path.join(self.path, name) -- # Get the link count so we can avoid listing folders -- # that have no subfolders. -- nlinks = os.stat(fullname).st_nlink -- if nlinks <= 2: -- return [] - subfolders = [] - subnames = os.listdir(fullname) - for subname in subnames: -@@ -200,11 +185,6 @@ - subsubfolders = self.listallsubfolders( - name_subname) - subfolders = subfolders + subsubfolders -- # Stop looking for subfolders when -- # we've seen them all -- nlinks = nlinks - 1 -- if nlinks <= 2: -- break - subfolders.sort() - return subfolders - diff --git a/python-base.changes b/python-base.changes index b191abb..f2155a2 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Jun 30 09:23:05 UTC 2016 - jmatejek@suse.com + +- update to 2.7.12 + * dozens of bugfixes, see NEWS for details + * fixes multiple security issues: + CVE-2016-0772 TLS stripping attack on smtplib (bsc#984751) + CVE-2016-5636 zipimporter heap overflow (bsc#985177) +- removed upstreamed python-2.7.7-mhlib-linkcount.patch +- refreshed multilib patch + ------------------------------------------------------------------- Fri Jan 29 13:03:40 UTC 2016 - rguenther@suse.com diff --git a/python-base.spec b/python-base.spec index 6f68b19..e2c03ef 100644 --- a/python-base.spec +++ b/python-base.spec @@ -1,7 +1,7 @@ # # spec file for package python-base # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: python-base -Version: 2.7.10 +Version: 2.7.12 Release: 0 Summary: Python Interpreter base package License: Python-2.0 @@ -48,15 +48,13 @@ Patch20: python-bundle-lang.patch # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff -# PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) -Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 Patch35: python-ncurses-6.0-accessors.patch -Patch36: python-2.7.10-overflow_check.patch +Patch36: python-2.7.10-overflow_check.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -144,7 +142,6 @@ other applications. %patch20 -p1 %patch22 -p1 %patch24 -p1 -%patch31 -p1 %patch33 -p1 %if %{suse_version} == 1315 && !0%{?is_opensuse} %patch34 -p1 diff --git a/python-doc.changes b/python-doc.changes index 8c7cd9e..c2b4643 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 30 09:23:05 UTC 2016 - jmatejek@suse.com + +- update to 2.7.12 + * dozens of bugfixes, see NEWS for details + * fixes multiple security issues: + CVE-2016-0772 TLS stripping attack on smtplib (bsc#984751) + CVE-2016-5636 zipimporter heap overflow (bsc#985177) + ------------------------------------------------------------------- Sun May 24 14:36:56 UTC 2015 - michael@stroeder.com diff --git a/python-doc.spec b/python-doc.spec index 5da1d4d..45adff7 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -1,7 +1,7 @@ # # spec file for package python-doc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-doc -Version: 2.7.10 +Version: 2.7.12 Release: 0 Summary: Additional Package Documentation for Python License: Python-2.0 @@ -48,15 +49,13 @@ Patch20: python-bundle-lang.patch # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff -# PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) -Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 Patch35: python-ncurses-6.0-accessors.patch -Patch36: python-2.7.10-overflow_check.patch +Patch36: python-2.7.10-overflow_check.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -98,7 +97,6 @@ Python, and Macintosh Module Reference in PDF format. %patch20 -p1 %patch22 -p1 %patch24 -p1 -%patch31 -p1 %patch33 -p1 %if %{suse_version} == 1315 && !0%{?is_opensuse} %patch34 -p1 diff --git a/python.changes b/python.changes index bbcbaa1..c8dea42 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jun 30 09:23:05 UTC 2016 - jmatejek@suse.com + +- update to 2.7.12 + * dozens of bugfixes, see NEWS for details + * fixes multiple security issues: + CVE-2016-0772 TLS stripping attack on smtplib (bsc#984751) + CVE-2016-5636 zipimporter heap overflow (bsc#985177) + ------------------------------------------------------------------- Mon Sep 14 15:03:30 UTC 2015 - jmatejek@suse.com diff --git a/python.spec b/python.spec index 1ddbe65..d69f90c 100644 --- a/python.spec +++ b/python.spec @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python -Version: 2.7.10 +Version: 2.7.12 Release: 0 Summary: Python Interpreter License: Python-2.0 @@ -53,15 +54,13 @@ Patch20: python-bundle-lang.patch # PATCH-FIX-UPSTREAM Fix argument passing in libffi for aarch64 Patch22: python-2.7-libffi-aarch64.patch Patch24: python-bsddb6.diff -# PATCH-FIX-OPENSUSE remove link count optimization that breaks mhlib on btrfs (and possibly elsewhere) -Patch31: python-2.7.7-mhlib-linkcount.patch # PATCH-FIX-UPSTREAM accept directory-based CA paths as well Patch33: python-2.7.9-ssl_ca_path.patch # PATCH-FEATURE-SLE disable SSL verification-by-default in http clients Patch34: python-2.7.9-sles-disable-verification-by-default.patch # PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dimstar@opensuse.org -- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1 Patch35: python-ncurses-6.0-accessors.patch -Patch36: python-2.7.10-overflow_check.patch +Patch36: python-2.7.10-overflow_check.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -199,7 +198,6 @@ that rely on earlier non-verification behavior. %patch20 -p1 %patch22 -p1 %patch24 -p1 -%patch31 -p1 %patch33 -p1 %if %{suse_version} == 1315 && !0%{?is_opensuse} %patch34 -p1