Hello community, here is the log from the commit of package python for openSUSE:Factory checked in at 2013-06-25 06:57:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python (Old) and /work/SRC/openSUSE:Factory/.python.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python" Changes: -------- --- /work/SRC/openSUSE:Factory/python/python-base.changes 2013-03-01 08:03:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2013-06-25 06:57:39.000000000 +0200 @@ -1,0 +2,51 @@ +Thu May 30 16:40:16 UTC 2013 - [email protected] + +- python-2.7.4-aarch64.patch: add missing bits of aarch64 support +- python-2.7.4-no-REUSEPORT.patch: disable test of + missing kernel functionality +- drop unnecessary patch: python-2.7.1-distutils_test_path.patch +- switch to xz archive + +------------------------------------------------------------------- +Tue May 28 08:42:49 UTC 2013 - [email protected] + +- Update to version 2.7.5: + + bugfix-only release + + fixes several important regressions introduced in 2.7.4 + + Issue #15535: Fixed regression in the pickling of named tuples by + removing the __dict__ property introduced in 2.7.4. + + Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3, + such as was shipped with Centos 5 and Mac OS X 10.4. + + Issue #17703: Fix a regression where an illegal use of Py_DECREF() after + interpreter finalization can cause a crash. + + Issue #16447: Fixed potential segmentation fault when setting __name__ on a + class. + + Issue #17610: Don't rely on non-standard behavior of the C qsort() function. 12 + See http://hg.python.org/cpython/file/ab05e7dd2788/Misc/NEWS for more +- Drop upstreamed patches: + + python-2.7.3-fix-dbm-64bit-bigendian.patch + + python-test_structmembers.patch +- Rebased other patches + +------------------------------------------------------------------- +Mon May 13 09:24:29 UTC 2013 - [email protected] + +- add aarch64 to the list of 64-bit platforms + +------------------------------------------------------------------ +Thu May 9 16:11:23 UTC 2013 - [email protected] + +- update to 2.7.4 + * bugfix-only release +- drop upstreamed patches: + pypirc-secure.diff + python-2.7.3-multiprocessing-join.patch + ctypes-libffi-aarch64.patch +- drop python-2.7rc2-configure.patch as it doesn't seem necessary anymore + +------------------------------------------------------------------- +Fri Apr 5 13:33:27 UTC 2013 - [email protected] + +- Add Source URL, see https://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python-doc.changes 2012-05-21 10:02:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-doc.changes 2013-06-25 06:57:39.000000000 +0200 @@ -1,0 +2,25 @@ +Tue Jun 4 13:23:28 UTC 2013 - [email protected] + +- disable Source URLs for docs (the doc archives are regenerated + every day and autobuild detects this as "upstream file is different" + error) + +------------------------------------------------------------------- +Tue May 28 08:42:49 UTC 2013 - [email protected] + +- Update to version 2.7.5 + +------------------------------------------------------------------- +Thu May 9 16:14:17 UTC 2013 - [email protected] + +- update to 2.7.4 +- removed %docdir/python/README from package (conflict with python-base) +- removed ACKS (is now part of Misc docs) + +------------------------------------------------------------------- +Fri Apr 5 13:33:29 UTC 2013 - [email protected] + +- Add Source URL, see https://en.opensuse.org/SourceUrls +- Fix installation so we don't create double sub-directories + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python/python.changes 2013-03-01 08:03:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python.changes 2013-06-25 06:57:39.000000000 +0200 @@ -1,0 +2,33 @@ +Thu May 30 16:40:16 UTC 2013 - [email protected] + +- switch to xz archive + +------------------------------------------------------------------- +Tue May 28 08:42:49 UTC 2013 - [email protected] + +- Update to version 2.7.5: + + bugfix-only release + + fixes several important regressions introduced in 2.7.4 + + Issue #15535: Fixed regression in the pickling of named tuples by + removing the __dict__ property introduced in 2.7.4. + + Issue #17857: Prevent build failures with pre-3.5.0 versions of sqlite3, + such as was shipped with Centos 5 and Mac OS X 10.4. + + Issue #17703: Fix a regression where an illegal use of Py_DECREF() after + interpreter finalization can cause a crash. + + Issue #16447: Fixed potential segmentation fault when setting __name__ on a + class. + + Issue #17610: Don't rely on non-standard behavior of the C qsort() function. 12 + See http://hg.python.org/cpython/file/ab05e7dd2788/Misc/NEWS for more + +------------------------------------------------------------------- +Thu May 9 16:14:07 UTC 2013 - [email protected] + +- update to 2.7.4 + * bugfix-only release + +------------------------------------------------------------------- +Fri Apr 5 13:33:33 UTC 2013 - [email protected] + +- Add Source URL, see https://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- Old: ---- Python-2.7.3.tar.bz2 ctypes-libffi-aarch64.patch pypirc-secure.diff python-2.7-docs-html.tar.bz2 python-2.7-docs-pdf-a4.tar.bz2 python-2.7-docs-pdf-letter.tar.bz2 python-2.7.1-distutils_test_path.patch python-2.7.3-fix-dbm-64bit-bigendian.patch python-2.7.3-multiprocessing-join.patch python-2.7.3rc2-canonicalize2.patch python-2.7.3rc2-multilib.patch python-2.7rc2-configure.patch python-test_structmembers.patch New: ---- Python-2.7.5.tar.xz python-2.7.4-aarch64.patch python-2.7.4-canonicalize2.patch python-2.7.4-no-REUSEPORT.patch python-2.7.5-docs-html.tar.bz2 python-2.7.5-docs-pdf-a4.tar.bz2 python-2.7.5-docs-pdf-letter.tar.bz2 python-2.7.5-multilib.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-base.spec ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:42.000000000 +0200 @@ -18,7 +18,7 @@ Name: python-base -Version: 2.7.3 +Version: 2.7.5 Release: 0 License: Python-2.0 Summary: Python Interpreter base package @@ -26,7 +26,7 @@ Group: Development/Languages/Python %define tarversion %{version} %define tarname Python-%{tarversion} -Source0: %{tarname}.tar.bz2 +Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz Source1: macros.python Source2: baselibs.conf Source3: README.SUSE @@ -34,32 +34,28 @@ # COMMON-PATCH-BEGIN Patch1: python-2.7-dirs.patch Patch2: python-distutils-rpm-8.patch -Patch3: python-2.7.3rc2-multilib.patch +Patch3: python-2.7.5-multilib.patch Patch4: python-2.5.1-sqlite.patch -Patch5: python-2.7.3rc2-canonicalize2.patch -Patch6: python-2.7rc2-configure.patch +Patch5: python-2.7.4-canonicalize2.patch Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch -Patch9: python-2.7.1-distutils_test_path.patch Patch10: sparc_longdouble.patch -Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch Patch13: python-2.7.2-fix_date_time_compiler.patch Patch15: python-2.7.2-disable-tests-in-test_io.patch -Patch16: pypirc-secure.diff Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch -Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 [email protected] -- gettext: when looking in default_localedir also check in locale-bundle. Patch20: python-bundle-lang.patch -Patch21: python-2.7.3-multiprocessing-join.patch -# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module -Patch22: ctypes-libffi-aarch64.patch +# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module +Patch22: python-2.7.4-aarch64.patch +Patch23: python-2.7.4-no-REUSEPORT.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake BuildRequires: fdupes libbz2-devel BuildRequires: pkg-config +BuildRequires: xz BuildRequires: zlib-devel # for the test suite BuildRequires: netcfg @@ -117,7 +113,7 @@ of Python in the documentation and tutorials included in the python-doc (HTML) or python-doc-pdf (PDF) packages. -This package contains libpython2.6 shared library for embedding in +This package contains libpython2.7 shared library for embedding in other applications. %prep @@ -126,31 +122,26 @@ # COMMON-PREP-BEGIN %patch1 -p1 %patch2 -p1 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch7 -p1 +%patch8 -p1 %patch10 -p1 -%patch12 -%patch13 +%patch13 -p1 #skip test_io test for ppc,ppc64 as it broken. %ifarch ppc ppc64 %patch15 -p1 %endif -%patch16 -p1 -%patch17 -%patch18 -%patch19 -p1 +%patch17 -p1 +%patch18 -p1 %patch20 -p1 -%patch21 -p1 %patch22 -p1 -# COMMON-PREP-END +%patch23 -p1 # drop Autoconf version requirement -sed -i 's/^version_required/dnl version_required/' configure.in +sed -i 's/^version_required/dnl version_required/' configure.ac +# COMMON-PREP-END %build export OPT="%{optflags}" @@ -290,6 +281,7 @@ %doc %{_docdir}/%{name}/LICENSE %doc %{_docdir}/%{name}/README.SUSE %doc %{_mandir}/man1/python.1* +%doc %{_mandir}/man1/python2.1* %doc %{_mandir}/man1/python%{python_version}.1* %dir %{_includedir}/python%{python_version} %{_includedir}/python%{python_version}/pyconfig.h @@ -376,7 +368,7 @@ %{_libdir}/python%{python_version}/lib-dynload/_multibytecodec.so %{_libdir}/python%{python_version}/lib-dynload/Python-%{tarversion}-py%{python_version}.egg-info # these modules don't support 64-bit arches (disabled by setup.py) -%ifnarch alpha ia64 x86_64 s390x ppc64 sparc64 +%ifnarch alpha ia64 x86_64 s390x ppc64 sparc64 aarch64 # requires sizeof(int) == sizeof(long) == sizeof(char*) %{_libdir}/python%{python_version}/lib-dynload/dl.so %endif ++++++ python-doc.spec ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:42.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:42.000000000 +0200 @@ -22,36 +22,39 @@ Summary: Additional Package Documentation for Python Url: http://www.python.org/ Group: Development/Languages/Python -%define pyver 2.7.3 +%define pyver 2.7.5 %define tarname Python-%{pyver} -Source0: %{tarname}.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 +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 +%if 0%{suse_version} <= 1210 +BuildRequires: xz +%endif # COMMON-PATCH-BEGIN Patch1: python-2.7-dirs.patch Patch2: python-distutils-rpm-8.patch -Patch3: python-2.7.3rc2-multilib.patch +Patch3: python-2.7.5-multilib.patch Patch4: python-2.5.1-sqlite.patch -Patch5: python-2.7.3rc2-canonicalize2.patch -Patch6: python-2.7rc2-configure.patch +Patch5: python-2.7.4-canonicalize2.patch Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch -Patch9: python-2.7.1-distutils_test_path.patch Patch10: sparc_longdouble.patch -Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch Patch13: python-2.7.2-fix_date_time_compiler.patch Patch15: python-2.7.2-disable-tests-in-test_io.patch -Patch16: pypirc-secure.diff Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch -Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 [email protected] -- gettext: when looking in default_localedir also check in locale-bundle. Patch20: python-bundle-lang.patch -Patch21: python-2.7.3-multiprocessing-join.patch -# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module -Patch22: ctypes-libffi-aarch64.patch +# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module +Patch22: python-2.7.4-aarch64.patch +Patch23: python-2.7.4-no-REUSEPORT.patch # COMMON-PATCH-END Provides: pyth_doc Provides: pyth_ps @@ -82,27 +85,25 @@ # COMMON-PREP-BEGIN %patch1 -p1 %patch2 -p1 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch7 -p1 +%patch8 -p1 %patch10 -p1 -%patch12 -%patch13 +%patch13 -p1 #skip test_io test for ppc,ppc64 as it broken. %ifarch ppc ppc64 %patch15 -p1 %endif -%patch16 -p1 -%patch17 -%patch18 -%patch19 -p1 +%patch17 -p1 +%patch18 -p1 %patch20 -p1 -%patch21 -p1 %patch22 -p1 +%patch23 -p1 + +# drop Autoconf version requirement +sed -i 's/^version_required/dnl version_required/' configure.ac # COMMON-PREP-END %build @@ -111,15 +112,14 @@ %install export PDOCS=%{buildroot}%{_docdir}/python install -d -m 755 $PDOCS/Misc -install -d -m 755 $PDOCS/paper-a4 $PDOCS/paper-letter $PDOCS/html tar xfj %{SOURCE1} -C $PDOCS/ -mv $PDOCS/python-%{version}-docs-html $PDOCS/html +mv $PDOCS/python-%{pyver}-docs-html $PDOCS/html tar xfj %{SOURCE2} -C $PDOCS mv $PDOCS/docs-pdf $PDOCS/paper-a4 tar xfj %{SOURCE3} -C $PDOCS mv $PDOCS/docs-pdf $PDOCS/paper-letter -install -c -m 644 Doc/ACKS.txt $PDOCS/ACKS.txt -install -c -m 644 README $PDOCS/README +# this is part of main package +#install -c -m 644 README $PDOCS/README for i in Misc/* ; do [ -f $i ] && install -c -m 644 $i $PDOCS/Misc/ done @@ -129,8 +129,7 @@ %dir %{_docdir}/python %doc %{_docdir}/python/Misc %doc %{_docdir}/python/html -%doc %{_docdir}/python/ACKS.txt -%doc %{_docdir}/python/README +#%doc %{_docdir}/python/README %files pdf %defattr(644,root,root,755) ++++++ python.spec ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python -Version: 2.7.3 +Version: 2.7.5 Release: 0 License: Python-2.0 Summary: Python Interpreter @@ -24,7 +24,7 @@ Group: Development/Languages/Python %define tarversion %{version} %define tarname Python-%{tarversion} -Source0: %{tarname}.tar.bz2 +Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz Source1: README.SUSE Source2: pythonstart Source3: python.sh @@ -39,27 +39,22 @@ # COMMON-PATCH-BEGIN Patch1: python-2.7-dirs.patch Patch2: python-distutils-rpm-8.patch -Patch3: python-2.7.3rc2-multilib.patch +Patch3: python-2.7.5-multilib.patch Patch4: python-2.5.1-sqlite.patch -Patch5: python-2.7.3rc2-canonicalize2.patch -Patch6: python-2.7rc2-configure.patch +Patch5: python-2.7.4-canonicalize2.patch Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch -Patch9: python-2.7.1-distutils_test_path.patch Patch10: sparc_longdouble.patch -Patch12: http://psf.upfronthosting.co.za/roundup/tracker/file19029/python-test_structmembers.patch Patch13: python-2.7.2-fix_date_time_compiler.patch Patch15: python-2.7.2-disable-tests-in-test_io.patch -Patch16: pypirc-secure.diff Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch -Patch19: python-2.7.3-fix-dbm-64bit-bigendian.patch # PATCH-FEATURE-OPENSUSE python-bundle-lang.patch bnc#617751 [email protected] -- gettext: when looking in default_localedir also check in locale-bundle. Patch20: python-bundle-lang.patch -Patch21: python-2.7.3-multiprocessing-join.patch -# PATCH-FIX-OPENSUSE Import aarch64 support for libffi in _ctypes module -Patch22: ctypes-libffi-aarch64.patch +# PATCH-FIX-OPENSUSE Properly support aarch64 in _ctypes module +Patch22: python-2.7.4-aarch64.patch +Patch23: python-2.7.4-no-REUSEPORT.patch # COMMON-PATCH-END BuildRequires: automake BuildRequires: db-devel @@ -73,6 +68,7 @@ BuildRequires: sqlite-devel BuildRequires: tk-devel BuildRequires: xorg-x11-devel +BuildRequires: xz %define python_version %(echo %{tarversion} | head -c 3) %define idle_name idle Requires: python-base = %{version} @@ -165,31 +161,26 @@ # COMMON-PREP-BEGIN %patch1 -p1 %patch2 -p1 -%patch3 -%patch4 -%patch5 -%patch6 -%patch7 -%patch8 -%patch9 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch7 -p1 +%patch8 -p1 %patch10 -p1 -%patch12 -%patch13 +%patch13 -p1 #skip test_io test for ppc,ppc64 as it broken. %ifarch ppc ppc64 %patch15 -p1 %endif -%patch16 -p1 -%patch17 -%patch18 -%patch19 -p1 +%patch17 -p1 +%patch18 -p1 %patch20 -p1 -%patch21 -p1 %patch22 -p1 -# COMMON-PREP-END +%patch23 -p1 # drop Autoconf version requirement -sed -i 's/^version_required/dnl version_required/' configure.in +sed -i 's/^version_required/dnl version_required/' configure.ac +# COMMON-PREP-END # remove newslist.py because of bad license rm Demo/scripts/newslist.* ++++++ python-2.5.1-sqlite.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- Modules/_sqlite/cursor.c -+++ Modules/_sqlite/cursor.c -@@ -782,6 +782,9 @@ +--- a/Modules/_sqlite/cursor.c ++++ b/Modules/_sqlite/cursor.c +@@ -837,6 +837,9 @@ goto error; } ++++++ python-2.6-gettext-plurals.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,7 +1,7 @@ Index: Lib/gettext.py =================================================================== ---- Lib/gettext.py.orig -+++ Lib/gettext.py +--- a/Lib/gettext.py.orig ++++ b/Lib/gettext.py @@ -311,8 +311,9 @@ class GNUTranslations(NullTranslations): self._charset = v.split('charset=')[1] elif k == 'plural-forms': ++++++ python-2.6b3-curses-panel.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,5 +1,5 @@ ---- Modules/_curses_panel.c -+++ Modules/_curses_panel.c +--- a/Modules/_curses_panel.c ++++ b/Modules/_curses_panel.c @@ -14,7 +14,7 @@ #include "py_curses.h" ++++++ python-2.7-dirs.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,8 +1,6 @@ -Index: Python-2.7/Makefile.pre.in -=================================================================== ---- Python-2.7.orig/Makefile.pre.in -+++ Python-2.7/Makefile.pre.in -@@ -94,7 +94,7 @@ LIBDIR= @libdir@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -106,7 +106,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include ++++++ python-2.7.2-disable-tests-in-test_io.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- Python-2.7.2/Lib/test/test_io.py.disable-tests-in-test_io 2011-09-01 14:18:45.963304089 -0400 -+++ Python-2.7.2/Lib/test/test_io.py 2011-09-01 15:08:53.796098413 -0400 -@@ -2669,6 +2669,7 @@ class SignalsTest(unittest.TestCase): +--- a/Lib/test/test_io.py ++++ b/Lib/test/test_io.py +@@ -2970,6 +2970,7 @@ self.check_interrupted_read_retry(lambda x: x, mode="r") ++++++ python-2.7.2-fix_date_time_compiler.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.pre.in -+++ Makefile.pre.in -@@ -524,8 +524,15 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -573,8 +573,15 @@ -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \ -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \ -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ ++++++ python-2.7.3-ssl_ca_path.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:43.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:43.000000000 +0200 @@ -1,8 +1,6 @@ -Index: Modules/_ssl.c -=================================================================== ---- Modules/_ssl.c.orig -+++ Modules/_ssl.c -@@ -271,6 +271,7 @@ newPySSLObject(PySocketSockObject *Sock, +--- a/Modules/_ssl.c ++++ b/Modules/_ssl.c +@@ -271,6 +271,7 @@ char *errstr = NULL; int ret; int verification_mode; @@ -10,7 +8,7 @@ self = PyObject_New(PySSLObject, &PySSL_Type); /* Create new object */ if (self == NULL) -@@ -331,11 +332,23 @@ newPySSLObject(PySocketSockObject *Sock, +@@ -331,11 +332,23 @@ "verification of other-side certificates."); goto fail; } else { ++++++ python-2.7.4-aarch64.patch ++++++ # HG changeset patch # User Andreas Schwab <[email protected]> # Date 1367276434 -7200 # Node ID 05e8999a3901b4853e60d6701510e9b3dd54a7f3 # Parent 84cef4f1999ad9e362694cdac2f65f0981e3d5d0 Add missing fficonfig.py bits for aarch64 diff -r 84cef4f1999a -r 05e8999a3901 Modules/_ctypes/libffi/fficonfig.py.in --- a/Modules/_ctypes/libffi/fficonfig.py.in Mon Apr 29 16:09:39 2013 -0400 +++ b/Modules/_ctypes/libffi/fficonfig.py.in Tue Apr 30 01:00:34 2013 +0200 @@ -28,6 +28,7 @@ 'PA': ['src/pa/linux.S', 'src/pa/ffi.c'], 'PA_LINUX': ['src/pa/linux.S', 'src/pa/ffi.c'], 'PA_HPUX': ['src/pa/hpux32.S', 'src/pa/ffi.c'], + 'AARCH64' : ['src/aarch64/ffi.c', 'src/aarch64/sysv.S'], } ffi_sources += ffi_platforms['@TARGET@'] ++++++ python-2.7.3rc2-canonicalize2.patch -> python-2.7.4-canonicalize2.patch ++++++ --- /work/SRC/openSUSE:Factory/python/python-2.7.3rc2-canonicalize2.patch 2012-04-12 09:51:08.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python.new/python-2.7.4-canonicalize2.patch 2013-06-25 06:57:38.000000000 +0200 @@ -1,7 +1,5 @@ -Index: Python/sysmodule.c -=================================================================== ---- Python/sysmodule.c.orig 2012-03-28 20:13:00.000000000 +0200 -+++ Python/sysmodule.c 2012-03-28 20:13:00.000000000 +0200 +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c @@ -1620,7 +1620,20 @@ char *p = NULL; Py_ssize_t n = 0; @@ -56,23 +54,8 @@ if (PyList_Insert(path, 0, a) < 0) Py_FatalError("sys.path.insert(0) failed"); Py_DECREF(a); -Index: configure.in -=================================================================== ---- configure.in.orig 2012-03-28 20:13:00.000000000 +0200 -+++ configure.in 2012-03-28 20:13:00.000000000 +0200 -@@ -2761,7 +2761,7 @@ - getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ - initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \ - mremap nice pathconf pause plock poll pthread_init \ -- putenv readlink realpath \ -+ putenv readlink realpath canonicalize_file_name \ - select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \ - setgid \ - setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \ -Index: pyconfig.h.in -=================================================================== ---- pyconfig.h.in.orig 2012-03-16 02:26:39.000000000 +0100 -+++ pyconfig.h.in 2012-03-28 20:13:00.000000000 +0200 +--- a/pyconfig.h.in ++++ b/pyconfig.h.in @@ -106,6 +106,9 @@ /* Define to 1 if you have the 'chflags' function. */ #undef HAVE_CHFLAGS @@ -83,3 +66,14 @@ /* Define to 1 if you have the `chown' function. */ #undef HAVE_CHOWN +--- a/configure.ac ++++ b/configure.ac +@@ -2913,7 +2913,7 @@ + getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \ + initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime \ + mremap nice pathconf pause plock poll pthread_init \ +- putenv readlink realpath \ ++ putenv readlink realpath canonicalize_file_name \ + select sem_open sem_timedwait sem_getvalue sem_unlink setegid seteuid \ + setgid \ + setlocale setregid setreuid setsid setpgid setpgrp setuid setvbuf snprintf \ ++++++ python-2.7.4-no-REUSEPORT.patch ++++++ Index: Python-2.7.4/Lib/test/test_support.py =================================================================== --- Python-2.7.4.orig/Lib/test/test_support.py 2013-04-06 16:02:32.000000000 +0200 +++ Python-2.7.4/Lib/test/test_support.py 2013-05-09 17:46:46.789663295 +0200 @@ -371,10 +371,10 @@ if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1: raise TestFailed("tests should never set the SO_REUSEADDR " \ "socket option on TCP/IP sockets!") - if hasattr(socket, 'SO_REUSEPORT'): - if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: - raise TestFailed("tests should never set the SO_REUSEPORT " \ - "socket option on TCP/IP sockets!") +# if hasattr(socket, 'SO_REUSEPORT'): +# if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: +# raise TestFailed("tests should never set the SO_REUSEPORT " \ +# "socket option on TCP/IP sockets!") if hasattr(socket, 'SO_EXCLUSIVEADDRUSE'): sock.setsockopt(socket.SOL_SOCKET, socket.SO_EXCLUSIVEADDRUSE, 1) ++++++ python-2.7-docs-html.tar.bz2 -> python-2.7.5-docs-html.tar.bz2 ++++++ ++++ 391170 lines of diff (skipped) ++++++ python-2.7-docs-pdf-a4.tar.bz2 -> python-2.7.5-docs-pdf-a4.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python/python-2.7-docs-pdf-a4.tar.bz2 /work/SRC/openSUSE:Factory/.python.new/python-2.7.5-docs-pdf-a4.tar.bz2 differ: char 11, line 1 ++++++ python-2.7-docs-pdf-letter.tar.bz2 -> python-2.7.5-docs-pdf-letter.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/python/python-2.7-docs-pdf-letter.tar.bz2 /work/SRC/openSUSE:Factory/.python.new/python-2.7.5-docs-pdf-letter.tar.bz2 differ: char 11, line 1 ++++++ python-2.7.3rc2-multilib.patch -> python-2.7.5-multilib.patch ++++++ --- /work/SRC/openSUSE:Factory/python/python-2.7.3rc2-multilib.patch 2013-03-01 08:03:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python.new/python-2.7.5-multilib.patch 2013-06-25 06:57:39.000000000 +0200 @@ -1,8 +1,6 @@ -Index: configure.in -=================================================================== ---- configure.in.orig 2012-03-16 02:26:39.000000000 +0100 -+++ configure.in 2012-03-28 20:09:13.000000000 +0200 -@@ -630,6 +630,41 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -732,6 +732,41 @@ ;; esac @@ -44,10 +42,8 @@ AC_SUBST(LIBRARY) AC_MSG_CHECKING(LIBRARY) -Index: Include/pythonrun.h -=================================================================== ---- Include/pythonrun.h.orig 2012-03-16 02:26:31.000000000 +0100 -+++ Include/pythonrun.h 2012-03-28 20:09:13.000000000 +0200 +--- a/Include/pythonrun.h ++++ b/Include/pythonrun.h @@ -108,6 +108,8 @@ /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -57,10 +53,8 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Lib/distutils/command/install.py -=================================================================== ---- Lib/distutils/command/install.py.orig 2012-03-28 20:09:11.000000000 +0200 -+++ Lib/distutils/command/install.py 2012-03-28 20:09:13.000000000 +0200 +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py @@ -22,6 +22,8 @@ from site import USER_SITE @@ -79,11 +73,9 @@ 'headers': '$base/include/python$py_version_short/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Lib/distutils/sysconfig.py -=================================================================== ---- Lib/distutils/sysconfig.py.orig 2012-03-16 02:26:31.000000000 +0100 -+++ Lib/distutils/sysconfig.py 2012-03-28 20:09:13.000000000 +0200 -@@ -114,8 +114,11 @@ +--- a/Lib/distutils/sysconfig.py ++++ b/Lib/distutils/sysconfig.py +@@ -119,8 +119,11 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": @@ -97,10 +89,8 @@ if standard_lib: return libpython else: -Index: Lib/pydoc.py -=================================================================== ---- Lib/pydoc.py.orig 2012-03-16 02:26:33.000000000 +0100 -+++ Lib/pydoc.py 2012-03-28 20:09:13.000000000 +0200 +--- a/Lib/pydoc.py ++++ b/Lib/pydoc.py @@ -352,7 +352,7 @@ docloc = os.environ.get("PYTHONDOCS", @@ -110,11 +100,9 @@ "python"+sys.version[0:3]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Lib/site.py -=================================================================== ---- Lib/site.py.orig 2012-03-16 02:26:33.000000000 +0100 -+++ Lib/site.py 2012-03-28 20:09:13.000000000 +0200 -@@ -300,13 +300,18 @@ +--- a/Lib/site.py ++++ b/Lib/site.py +@@ -288,13 +288,18 @@ if sys.platform in ('os2emx', 'riscos'): sitepackages.append(os.path.join(prefix, "Lib", "site-packages")) elif os.sep == '/': @@ -136,10 +124,8 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Lib/sysconfig.py -=================================================================== ---- Lib/sysconfig.py.orig 2012-03-16 02:26:33.000000000 +0100 -+++ Lib/sysconfig.py 2012-03-28 20:09:13.000000000 +0200 +--- a/Lib/sysconfig.py ++++ b/Lib/sysconfig.py @@ -7,10 +7,10 @@ _INSTALL_SCHEMES = { @@ -168,10 +154,8 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data' : '{userbase}', -Index: Lib/test/test_dl.py -=================================================================== ---- Lib/test/test_dl.py.orig 2012-03-16 02:26:34.000000000 +0100 -+++ Lib/test/test_dl.py 2012-03-28 20:09:13.000000000 +0200 +--- a/Lib/test/test_dl.py ++++ b/Lib/test/test_dl.py @@ -5,10 +5,11 @@ import unittest from test.test_support import verbose, import_module @@ -186,10 +170,8 @@ ('/usr/bin/cygwin1.dll', 'getpid'), ('/usr/lib/libc.dylib', 'getpid'), ] -Index: Lib/test/test_site.py -=================================================================== ---- Lib/test/test_site.py.orig 2012-03-16 02:26:34.000000000 +0100 -+++ Lib/test/test_site.py 2012-03-28 20:11:10.000000000 +0200 +--- a/Lib/test/test_site.py ++++ b/Lib/test/test_site.py @@ -241,12 +241,16 @@ self.assertEqual(dirs[2], wanted) elif os.sep == '/': @@ -210,10 +192,8 @@ else: # other platforms self.assertEqual(len(dirs), 2) -Index: Lib/trace.py -=================================================================== ---- Lib/trace.py.orig 2012-03-16 02:26:34.000000000 +0100 -+++ Lib/trace.py 2012-03-28 20:09:13.000000000 +0200 +--- a/Lib/trace.py ++++ b/Lib/trace.py @@ -754,10 +754,10 @@ # should I also call expanduser? (after all, could use $HOME) @@ -227,20 +207,18 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Makefile.pre.in -=================================================================== ---- Makefile.pre.in.orig 2012-03-28 20:09:11.000000000 +0200 -+++ Makefile.pre.in 2012-03-28 20:09:13.000000000 +0200 -@@ -81,6 +81,8 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -87,6 +87,8 @@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ +LIB= @LIB@ +ARCH= @ARCH@ - # Install prefix for architecture-independent files - prefix= @prefix@ -@@ -533,6 +535,7 @@ + # Multiarch directory (may be empty) + MULTIARCH= @MULTIARCH@ +@@ -579,6 +581,7 @@ -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -248,7 +226,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -567,7 +570,7 @@ +@@ -621,7 +624,7 @@ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -257,10 +235,8 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Modules/getpath.c -=================================================================== ---- Modules/getpath.c.orig 2012-03-16 02:26:37.000000000 +0100 -+++ Modules/getpath.c 2012-03-28 20:09:13.000000000 +0200 +--- a/Modules/getpath.c ++++ b/Modules/getpath.c @@ -116,9 +116,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -284,10 +260,8 @@ static void reduce(char *dir) -Index: Python/getplatform.c -=================================================================== ---- Python/getplatform.c.orig 2012-03-16 02:26:38.000000000 +0100 -+++ Python/getplatform.c 2012-03-28 20:09:13.000000000 +0200 +--- a/Python/getplatform.c ++++ b/Python/getplatform.c @@ -10,3 +10,23 @@ { return PLATFORM; @@ -312,10 +286,8 @@ +{ + return LIB; +} -Index: Python/sysmodule.c -=================================================================== ---- Python/sysmodule.c.orig 2012-03-16 02:26:39.000000000 +0100 -+++ Python/sysmodule.c 2012-03-28 20:09:13.000000000 +0200 +--- a/Python/sysmodule.c ++++ b/Python/sysmodule.c @@ -1419,6 +1419,10 @@ PyString_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", @@ -327,30 +299,18 @@ SET_SYS_FROM_STRING("executable", PyString_FromString(Py_GetProgramFullPath())); SET_SYS_FROM_STRING("prefix", -Index: setup.py -=================================================================== ---- setup.py.orig 2012-03-16 02:26:39.000000000 +0100 -+++ setup.py 2012-03-28 20:09:13.000000000 +0200 -@@ -369,7 +369,7 @@ +--- a/setup.py ++++ b/setup.py +@@ -437,7 +437,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() - -@@ -427,8 +427,7 @@ - # if a file is found in one of those directories, it can - # be assumed that no additional -I,-L directives are needed. - lib_dirs = self.compiler.library_dirs + [ -- '/lib64', '/usr/lib64', -- '/lib', '/usr/lib', -+ '/' + sys.lib, '/usr/' + sys.lib, - ] - inc_dirs = self.compiler.include_dirs + ['/usr/include'] - exts = [] -@@ -677,11 +676,11 @@ +@@ -756,11 +756,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -364,9 +324,9 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1753,18 +1752,17 @@ +@@ -1861,18 +1861,17 @@ # Check for various platform-specific directories - if platform == 'sunos5': + if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') - added_lib_dirs.append('/usr/openwin/lib') + added_lib_dirs.append('/usr/openwin/' + sys.lib) @@ -386,4 +346,4 @@ + added_lib_dirs.append('/usr/X11/' + sys.lib) # If Cygwin, then verify that X is installed before proceeding - if platform == 'cygwin': + if host_platform == 'cygwin': ++++++ python-distutils-rpm-8.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:48.000000000 +0200 @@ -1,8 +1,6 @@ -Index: Python-2.6.2/Lib/distutils/command/install.py -=================================================================== ---- Python-2.6.2.orig/Lib/distutils/command/install.py -+++ Python-2.6.2/Lib/distutils/command/install.py -@@ -168,6 +168,8 @@ class install (Command): +--- a/Lib/distutils/command/install.py ++++ b/Lib/distutils/command/install.py +@@ -154,6 +154,8 @@ ('record=', None, "filename in which to record list of installed files"), @@ -11,7 +9,7 @@ ] boolean_options = ['compile', 'force', 'skip-build', 'user'] -@@ -243,6 +245,7 @@ class install (Command): +@@ -229,6 +231,7 @@ #self.install_info = None self.record = None @@ -19,7 +17,7 @@ # -- Option finalizing methods ------------------------------------- -@@ -592,12 +595,61 @@ class install (Command): +@@ -578,12 +581,61 @@ self.create_path_file() # write list of installed files, if requested. ++++++ remove-static-libpython.diff ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:48.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.pre.in -+++ Makefile.pre.in -@@ -396,7 +396,7 @@ +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -434,7 +434,7 @@ # Build the interpreter @@ -9,9 +9,9 @@ $(LINKCC) $(LDFLAGS) $(LINKFORSHARED) -o $@ \ Modules/python.o \ $(BLDLIBRARY) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -@@ -412,18 +412,6 @@ - *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \ - esac +@@ -460,18 +460,6 @@ + $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ + $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build -# Build static library -# avoid long command lines, same as LIBRARY_OBJS @@ -28,7 +28,7 @@ libpython$(VERSION).so: $(LIBRARY_OBJS) if test $(INSTSONAME) != $(LDLIBRARY); then \ $(BLDSHARED) -Wl,-h$(INSTSONAME) -o $(INSTSONAME) $(LIBRARY_OBJS) $(MODLIBS) $(SHLIBS) $(LIBC) $(LIBM) $(LDLAST); \ -@@ -1008,18 +996,6 @@ +@@ -1089,18 +1077,6 @@ else true; \ fi; \ done ++++++ sparc_longdouble.patch ++++++ --- /var/tmp/diff_new_pack.vjzMc3/_old 2013-06-25 06:57:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vjzMc3/_new 2013-06-25 06:57:48.000000000 +0200 @@ -5,11 +5,9 @@ Modules/_ctypes/libffi/src/sparc/ffi.c | 5 +++++ 1 file changed, 5 insertions(+) -Index: Python-2.6.5/Modules/_ctypes/libffi/src/sparc/ffi.c -=================================================================== ---- Python-2.6.5.orig/Modules/_ctypes/libffi/src/sparc/ffi.c -+++ Python-2.6.5/Modules/_ctypes/libffi/src/sparc/ffi.c -@@ -586,6 +586,11 @@ ffi_closure_sparc_inner_v9(ffi_closure * +--- a/Modules/_ctypes/libffi/src/sparc/ffi.c ++++ b/Modules/_ctypes/libffi/src/sparc/ffi.c +@@ -652,6 +652,11 @@ } else { -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
