From 89a17d80b140a0d09691c5a00dbe6a2c2790332edf222713e1383928a898d2df Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Thu, 21 Nov 2013 15:55:48 +0000 Subject: [PATCH] - update to 2.7.6 * bugfix-only release * SSL-related fixes * upstream fix for CVE-2013-4238 * upstream fixes for CVE-2013-1752 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=153 --- Python-2.7.5.tar.xz | 3 - Python-2.7.6.tar.xz | 3 + python-2.7.5-multilib.patch | 114 +++++++++++++++++---------- python-2.7.6-docs-html.tar.bz2 | 3 + python-2.7.6-docs-pdf-a4.tar.bz2 | 3 + python-2.7.6-docs-pdf-letter.tar.bz2 | 3 + python-base.changes | 9 +++ python-base.spec | 8 +- python-doc.changes | 6 ++ python-doc.spec | 15 ++-- python.changes | 5 ++ python.spec | 4 +- remove-static-libpython.diff | 14 ++-- 13 files changed, 122 insertions(+), 68 deletions(-) delete mode 100644 Python-2.7.5.tar.xz create mode 100644 Python-2.7.6.tar.xz create mode 100644 python-2.7.6-docs-html.tar.bz2 create mode 100644 python-2.7.6-docs-pdf-a4.tar.bz2 create mode 100644 python-2.7.6-docs-pdf-letter.tar.bz2 diff --git a/Python-2.7.5.tar.xz b/Python-2.7.5.tar.xz deleted file mode 100644 index 86ac5f6..0000000 --- a/Python-2.7.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f33c4cab167dc69e10962e1cebf1c0768e2d0e8575648130c20e6bda84551db1 -size 10252148 diff --git a/Python-2.7.6.tar.xz b/Python-2.7.6.tar.xz new file mode 100644 index 0000000..4914970 --- /dev/null +++ b/Python-2.7.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fd68e81f8bf7386ff239b7faee9ba387129d2cf34eab13350bd8503a0bff6a1 +size 10431288 diff --git a/python-2.7.5-multilib.patch b/python-2.7.5-multilib.patch index abd505c..2fb128e 100644 --- a/python-2.7.5-multilib.patch +++ b/python-2.7.5-multilib.patch @@ -1,6 +1,8 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -732,6 +732,41 @@ +Index: Python-2.7.6/configure.ac +=================================================================== +--- Python-2.7.6.orig/configure.ac 2013-11-19 17:34:49.063388540 +0100 ++++ Python-2.7.6/configure.ac 2013-11-19 17:35:02.848465919 +0100 +@@ -733,6 +733,41 @@ ;; esac @@ -42,8 +44,10 @@ AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) ---- a/Include/pythonrun.h -+++ b/Include/pythonrun.h +Index: Python-2.7.6/Include/pythonrun.h +=================================================================== +--- Python-2.7.6.orig/Include/pythonrun.h 2013-11-19 17:34:49.063388540 +0100 ++++ Python-2.7.6/Include/pythonrun.h 2013-11-19 17:35:02.848465919 +0100 @@ -108,6 +108,8 @@ /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -53,8 +57,10 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); ---- a/Lib/distutils/command/install.py -+++ b/Lib/distutils/command/install.py +Index: Python-2.7.6/Lib/distutils/command/install.py +=================================================================== +--- Python-2.7.6.orig/Lib/distutils/command/install.py 2013-11-19 17:34:49.064388546 +0100 ++++ Python-2.7.6/Lib/distutils/command/install.py 2013-11-19 17:35:02.849465924 +0100 @@ -22,6 +22,8 @@ from site import USER_SITE @@ -73,8 +79,10 @@ 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py +Index: Python-2.7.6/Lib/distutils/sysconfig.py +=================================================================== +--- Python-2.7.6.orig/Lib/distutils/sysconfig.py 2013-11-19 17:34:49.064388546 +0100 ++++ Python-2.7.6/Lib/distutils/sysconfig.py 2013-11-19 17:35:02.849465924 +0100 @@ -119,8 +119,11 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -89,8 +97,10 @@ if standard_lib: return libpython else: ---- a/Lib/pydoc.py -+++ b/Lib/pydoc.py +Index: Python-2.7.6/Lib/pydoc.py +=================================================================== +--- Python-2.7.6.orig/Lib/pydoc.py 2013-11-19 17:34:49.064388546 +0100 ++++ Python-2.7.6/Lib/pydoc.py 2013-11-19 17:35:02.849465924 +0100 @@ -352,7 +352,7 @@ docloc = os.environ.get("PYTHONDOCS", @@ -100,8 +110,10 @@ "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', ---- a/Lib/site.py -+++ b/Lib/site.py +Index: Python-2.7.6/Lib/site.py +=================================================================== +--- Python-2.7.6.orig/Lib/site.py 2013-11-19 17:34:49.065388551 +0100 ++++ Python-2.7.6/Lib/site.py 2013-11-19 17:35:02.849465924 +0100 @@ -288,13 +288,18 @@ if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) @@ -124,8 +136,10 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. ---- a/Lib/sysconfig.py -+++ b/Lib/sysconfig.py +Index: Python-2.7.6/Lib/sysconfig.py +=================================================================== +--- Python-2.7.6.orig/Lib/sysconfig.py 2013-11-19 17:34:49.065388551 +0100 ++++ Python-2.7.6/Lib/sysconfig.py 2013-11-19 17:35:02.849465924 +0100 @@ -7,10 +7,10 @@ _INSTALL_SCHEMES = { @@ -154,8 +168,10 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', ---- a/Lib/test/test_dl.py -+++ b/Lib/test/test_dl.py +Index: Python-2.7.6/Lib/test/test_dl.py +=================================================================== +--- Python-2.7.6.orig/Lib/test/test_dl.py 2013-11-19 17:34:49.065388551 +0100 ++++ Python-2.7.6/Lib/test/test_dl.py 2013-11-19 17:35:02.849465924 +0100 @@ -5,10 +5,11 @@ import unittest from test.test_support import verbose, import_module @@ -170,8 +186,10 @@ ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] ---- a/Lib/test/test_site.py -+++ b/Lib/test/test_site.py +Index: Python-2.7.6/Lib/test/test_site.py +=================================================================== +--- Python-2.7.6.orig/Lib/test/test_site.py 2013-11-19 17:34:49.065388551 +0100 ++++ Python-2.7.6/Lib/test/test_site.py 2013-11-19 17:35:02.850465930 +0100 @@ -241,12 +241,16 @@ self.assertEqual(dirs[2], wanted) elif os.sep == '/': @@ -192,8 +210,10 @@ else: # other platforms self.assertEqual(len(dirs), 2) ---- a/Lib/trace.py -+++ b/Lib/trace.py +Index: Python-2.7.6/Lib/trace.py +=================================================================== +--- Python-2.7.6.orig/Lib/trace.py 2013-11-19 17:34:49.065388551 +0100 ++++ Python-2.7.6/Lib/trace.py 2013-11-19 17:35:02.850465930 +0100 @@ -754,10 +754,10 @@ # should I also call expanduser? (after all, could use $HOME) @@ -207,8 +227,10 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in +Index: Python-2.7.6/Makefile.pre.in +=================================================================== +--- Python-2.7.6.orig/Makefile.pre.in 2013-11-19 17:34:49.066388557 +0100 ++++ Python-2.7.6/Makefile.pre.in 2013-11-19 17:35:02.850465930 +0100 @@ -87,6 +87,8 @@ # Machine-dependent subdirectories @@ -218,7 +240,7 @@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -579,6 +581,7 @@ +@@ -584,6 +586,7 @@ -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -226,7 +248,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -621,7 +624,7 @@ +@@ -626,7 +629,7 @@ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -235,8 +257,10 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c ---- a/Modules/getpath.c -+++ b/Modules/getpath.c +Index: Python-2.7.6/Modules/getpath.c +=================================================================== +--- Python-2.7.6.orig/Modules/getpath.c 2013-11-19 17:34:49.066388557 +0100 ++++ Python-2.7.6/Modules/getpath.c 2013-11-19 17:35:02.850465930 +0100 @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -260,8 +284,10 @@ static void reduce(char *dir) ---- a/Python/getplatform.c -+++ b/Python/getplatform.c +Index: Python-2.7.6/Python/getplatform.c +=================================================================== +--- Python-2.7.6.orig/Python/getplatform.c 2013-11-19 17:34:49.066388557 +0100 ++++ Python-2.7.6/Python/getplatform.c 2013-11-19 17:35:02.850465930 +0100 @@ -10,3 +10,23 @@ { return PLATFORM; @@ -286,8 +312,10 @@ +{ + return LIB; +} ---- a/Python/sysmodule.c -+++ b/Python/sysmodule.c +Index: Python-2.7.6/Python/sysmodule.c +=================================================================== +--- Python-2.7.6.orig/Python/sysmodule.c 2013-11-19 17:34:49.066388557 +0100 ++++ Python-2.7.6/Python/sysmodule.c 2013-11-19 17:35:02.850465930 +0100 @@ -1419,6 +1419,10 @@ PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", @@ -299,18 +327,20 @@ SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", ---- a/setup.py -+++ b/setup.py -@@ -437,7 +437,7 @@ - +Index: Python-2.7.6/setup.py +=================================================================== +--- Python-2.7.6.orig/setup.py 2013-11-19 17:34:49.067388562 +0100 ++++ Python-2.7.6/setup.py 2013-11-19 17:35:35.826650956 +0100 +@@ -438,7 +438,7 @@ 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.library_dirs, '/usr/local/' + sys.lib) - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') - self.add_gcc_paths() - self.add_multiarch_paths() -@@ -756,11 +756,11 @@ + if not cross_compiling: +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ add_dir_to_list(self.compiler.library_dirs, '/usr/local/' + sys.lib) + add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + if cross_compiling: + self.add_gcc_paths() +@@ -758,11 +758,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -324,7 +354,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1861,18 +1861,17 @@ +@@ -1910,18 +1910,17 @@ # Check for various platform-specific directories if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') diff --git a/python-2.7.6-docs-html.tar.bz2 b/python-2.7.6-docs-html.tar.bz2 new file mode 100644 index 0000000..d9c47e4 --- /dev/null +++ b/python-2.7.6-docs-html.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b04dc7c5fa328ad9009cc0f43e2136ef14824246fc596fae0830bb5ece529ab3 +size 4482212 diff --git a/python-2.7.6-docs-pdf-a4.tar.bz2 b/python-2.7.6-docs-pdf-a4.tar.bz2 new file mode 100644 index 0000000..58244b9 --- /dev/null +++ b/python-2.7.6-docs-pdf-a4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ca5209a8cbf8d966eff6611cfe8accf38040a63534d5c050730fba47a24e703 +size 10321047 diff --git a/python-2.7.6-docs-pdf-letter.tar.bz2 b/python-2.7.6-docs-pdf-letter.tar.bz2 new file mode 100644 index 0000000..7c7bb15 --- /dev/null +++ b/python-2.7.6-docs-pdf-letter.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff9b65247b5ad74a86793630eda5063af25b925bcc8dd2910765640a1463401d +size 10380021 diff --git a/python-base.changes b/python-base.changes index 51ce1f9..834e9f9 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Nov 21 15:39:28 UTC 2013 - jmatejek@suse.com + +- update to 2.7.6 + * bugfix-only release + * SSL-related fixes + * upstream fix for CVE-2013-4238 + * upstream fixes for CVE-2013-1752 + ------------------------------------------------------------------- Thu Oct 10 18:13:08 UTC 2013 - dmueller@suse.com diff --git a/python-base.spec b/python-base.spec index 9894faf..4de182a 100644 --- a/python-base.spec +++ b/python-base.spec @@ -17,7 +17,7 @@ Name: python-base -Version: 2.7.5 +Version: 2.7.6 Release: 0 Summary: Python Interpreter base package License: Python-2.0 @@ -50,7 +50,6 @@ Patch20: python-bundle-lang.patch Patch22: python-2.7.4-aarch64.patch Patch23: python-2.7.4-no-REUSEPORT.patch Patch24: python-bsddb6.diff -Patch25: CVE-2013-4238_py27.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake @@ -142,7 +141,6 @@ other applications. %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac @@ -227,9 +225,8 @@ done CLEANUP_DIR="%{buildroot}%{_libdir}/python%{python_version}" # don't distribute precompiled windows installers (duh) rm -f $CLEANUP_DIR/distutils/command/*.exe -# kill imageop.so and audioop.so, they are rarely used and insecure +# kill imageop.so - it used to be insecure and it is deprecated anyway rm -f $CLEANUP_DIR/lib-dynload/imageop.so -rm -f $CLEANUP_DIR/lib-dynload/audioop.so # link shared library instead of static library that tools expect ln -s ../../libpython%{python_version}.so %{buildroot}%{_libdir}/python%{python_version}/config/libpython%{python_version}.so # remove various things that don't need to be in python-base @@ -348,6 +345,7 @@ cp Makefile Makefile.pre.in Makefile.pre %{buildroot}%{_libdir}/python%{python_v %{_libdir}/python%{python_version}/lib-dynload/_struct.so %{_libdir}/python%{python_version}/lib-dynload/_testcapi.so %{_libdir}/python%{python_version}/lib-dynload/array.so +%{_libdir}/python%{python_version}/lib-dynload/audioop.so %{_libdir}/python%{python_version}/lib-dynload/binascii.so %{_libdir}/python%{python_version}/lib-dynload/bz2.so %{_libdir}/python%{python_version}/lib-dynload/cPickle.so diff --git a/python-doc.changes b/python-doc.changes index 31a3f2d..e77edd6 100644 --- a/python-doc.changes +++ b/python-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 21 15:55:04 UTC 2013 - jmatejek@suse.com + +- update to 2.7.6 +- docs are now versioned with patchlevel too + ------------------------------------------------------------------- Tue Jun 4 13:23:28 UTC 2013 - jmatejek@suse.com diff --git a/python-doc.spec b/python-doc.spec index ae23821..4b2c96c 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -16,23 +16,22 @@ # Name: python-doc -Version: 2.7 +Version: 2.7.6 Release: 0 Summary: Additional Package Documentation for Python License: Python-2.0 Group: Development/Languages/Python Url: http://www.python.org/ -%define pyver 2.7.5 -%define tarname Python-%{pyver} +%define tarname Python-%{version} Source0: %{tarname}.tar.xz # docs for current version are regenerated every day # this messes with autobuild "file changed" checks #Source1: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-html.tar.bz2 #Source2: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-a4.tar.bz2 #Source3: http://docs.python.org/%{version}/archives/python-%{pyver}-docs-pdf-letter.tar.bz2 -Source1: python-%{pyver}-docs-html.tar.bz2 -Source2: python-%{pyver}-docs-pdf-a4.tar.bz2 -Source3: python-%{pyver}-docs-pdf-letter.tar.bz2 +Source1: python-%{version}-docs-html.tar.bz2 +Source2: python-%{version}-docs-pdf-a4.tar.bz2 +Source3: python-%{version}-docs-pdf-letter.tar.bz2 %if 0%{suse_version} <= 1210 BuildRequires: xz %endif @@ -56,7 +55,6 @@ Patch20: python-bundle-lang.patch Patch22: python-2.7.4-aarch64.patch Patch23: python-2.7.4-no-REUSEPORT.patch Patch24: python-bsddb6.diff -Patch25: CVE-2013-4238_py27.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -64,7 +62,7 @@ Obsoletes: pyth_doc Obsoletes: pyth_ps BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -Enhances: python = %{pyver} +Enhances: python = %{version} %description Tutorial, Global Module Index, Language Reference, Library Reference, @@ -104,7 +102,6 @@ Python, and Macintosh Module Reference in PDF format. %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/python.changes b/python.changes index 14fc260..d827564 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Nov 21 15:54:55 UTC 2013 - jmatejek@suse.com + +- update to 2.7.6 + ------------------------------------------------------------------- Thu Sep 19 17:40:05 UTC 2013 - crrodriguez@opensuse.org diff --git a/python.spec b/python.spec index 5be41ff..0102bd6 100644 --- a/python.spec +++ b/python.spec @@ -16,7 +16,7 @@ # Name: python -Version: 2.7.5 +Version: 2.7.6 Release: 0 Summary: Python Interpreter License: Python-2.0 @@ -56,7 +56,6 @@ Patch20: python-bundle-lang.patch Patch22: python-2.7.4-aarch64.patch Patch23: python-2.7.4-no-REUSEPORT.patch Patch24: python-bsddb6.diff -Patch25: CVE-2013-4238_py27.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -180,7 +179,6 @@ implementation of the standard Unix DBM databases. %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 # drop Autoconf version requirement sed -i 's/^version_required/dnl version_required/' configure.ac diff --git a/remove-static-libpython.diff b/remove-static-libpython.diff index 8224a69..24b1e94 100644 --- a/remove-static-libpython.diff +++ b/remove-static-libpython.diff @@ -1,6 +1,8 @@ ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -434,7 +434,7 @@ +Index: Python-2.7.6/Makefile.pre.in +=================================================================== +--- Python-2.7.6.orig/Makefile.pre.in 2013-11-19 17:36:56.968106247 +0100 ++++ Python-2.7.6/Makefile.pre.in 2013-11-19 17:36:56.972106270 +0100 +@@ -438,7 +438,7 @@ # Build the interpreter @@ -9,8 +11,8 @@ $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ Modules/python.o \ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -@@ -460,18 +460,6 @@ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ +@@ -465,18 +465,6 @@ + _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build -# Build static library @@ -28,7 +30,7 @@ libpython$(VERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -1089,18 +1077,6 @@ +@@ -1094,18 +1082,6 @@ else true; \ fi; \ done