Hello community, here is the log from the commit of package python3 for openSUSE:Factory checked in at 2015-05-16 07:13:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3 (Old) and /work/SRC/openSUSE:Factory/.python3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3" Changes: -------- --- /work/SRC/openSUSE:Factory/python3/python3-base.changes 2015-04-10 09:45:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-base.changes 2015-05-16 07:13:27.000000000 +0200 @@ -1,0 +2,17 @@ +Thu May 14 09:53:29 UTC 2015 - [email protected] + +- python-3.4.3-test-conditional-ssl.patch - restore tests failing because + test_urllib was unconditionally importing ssl (without really needing it) +- restore functionality of multilib patch +- drop libffi-ppc64le.diff because upstream completely changed everything + yet again (sorry ppc64 folks :| ) + + +------------------------------------------------------------------- +Fri May 1 15:11:21 UTC 2015 - [email protected] + +- Update to version 3.4.3 +- Drop upstreamed CVE-2014-4650-CGIHTTPServer-traversal.patch + (bpo#21766) + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3-doc.changes 2014-10-31 12:30:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3.new/python3-doc.changes 2015-05-16 07:13:27.000000000 +0200 @@ -1,0 +2,12 @@ +Thu May 14 10:58:36 UTC 2015 - [email protected] + +- drop the PDF subpackage + (removes the massive texlive dependency, and most likely nobody is + using the PDFs anyway) + +------------------------------------------------------------------- +Fri May 1 15:11:21 UTC 2015 - [email protected] + +- Update to version 3.4.3 + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/python3/python3.changes 2014-10-31 12:30:46.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3.new/python3.changes 2015-05-16 07:13:27.000000000 +0200 @@ -1,0 +2,7 @@ +Fri May 1 15:11:21 UTC 2015 - [email protected] + +- Update to version 3.4.3 +- Drop upstreamed CVE-2014-4650-CGIHTTPServer-traversal.patch + (bpo#21766) + +------------------------------------------------------------------- Old: ---- CVE-2014-4650-CGIHTTPServer-traversal.patch Python-3.4.1.tar.xz Python-3.4.1.tar.xz.asc libffi-ppc64le.diff New: ---- Python-3.4.3.tar.xz Python-3.4.3.tar.xz.asc python-3.4.3-test-conditional-ssl.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-base.spec ++++++ --- /var/tmp/diff_new_pack.1xumi3/_old 2015-05-16 07:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1xumi3/_new 2015-05-16 07:13:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-base # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -36,7 +36,7 @@ Summary: Python3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Version: 3.4.1 +Version: 3.4.3 Release: 0 %define tarversion %{version} %define tarname Python-%{tarversion} @@ -88,14 +88,12 @@ Patch10: ctypes-libffi-aarch64.patch # Disable global and distutils sysconfig comparison test, we deviate from the default depending on optflags Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch -# Add support for ppc64le (ELFv2) to libffi copy for ctypes -Patch13: libffi-ppc64le.diff # Raise timeout value for test_subprocess Patch15: subprocess-raise-timeout.patch -# CVE-2014-4650 - File disclosure and directory traversal in CGIHTTPServer -Patch16: CVE-2014-4650-CGIHTTPServer-traversal.patch # Upstream patch for bogus faulthandler which fails with GCC 5 Patch17: python-3.4.1-fix-faulthandler.patch +# PATCH-FIX-UPSTREAM require SSL conditionally in test_urllib +Patch18: python-3.4.3-test-conditional-ssl.patch ### COMMON-PATCH-END ### BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -219,10 +217,9 @@ %patch09 -p1 %patch10 -p1 %patch12 -p1 -%patch13 -p0 %patch15 -p1 -%patch16 -p1 %patch17 -p1 +%patch18 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac ++++++ python3-doc.spec ++++++ --- /var/tmp/diff_new_pack.1xumi3/_old 2015-05-16 07:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1xumi3/_new 2015-05-16 07:13:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3-doc # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -23,27 +23,13 @@ Summary: Additional Package Documentation for Python License: Python-2.0 Group: Development/Languages/Python -Version: 3.4.1 +Version: 3.4.3 Release: 0 BuildArch: noarch %define tarversion %{version} %define tarname Python-%{tarversion} Source0: http://www.python.org/ftp/python/%{tarversion}/%{tarname}.tar.xz BuildRequires: python-Sphinx -BuildRequires: texlive-cmap -BuildRequires: texlive-collection-fontsrecommended -BuildRequires: texlive-fancybox -BuildRequires: texlive-fancyvrb -BuildRequires: texlive-framed -BuildRequires: texlive-mdwtools -BuildRequires: texlive-multirow -BuildRequires: texlive-parskip -BuildRequires: texlive-scheme-basic -BuildRequires: texlive-threeparttable -BuildRequires: texlive-titlesec -BuildRequires: texlive-ucs -BuildRequires: texlive-upquote -BuildRequires: texlive-wrapfig # for consistency: ### COMMON-PATCH-BEGIN ### @@ -66,14 +52,12 @@ Patch10: ctypes-libffi-aarch64.patch # Disable global and distutils sysconfig comparison test, we deviate from the default depending on optflags Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch -# Add support for ppc64le (ELFv2) to libffi copy for ctypes -Patch13: libffi-ppc64le.diff # Raise timeout value for test_subprocess Patch15: subprocess-raise-timeout.patch -# CVE-2014-4650 - File disclosure and directory traversal in CGIHTTPServer -Patch16: CVE-2014-4650-CGIHTTPServer-traversal.patch # Upstream patch for bogus faulthandler which fails with GCC 5 Patch17: python-3.4.1-fix-faulthandler.patch +# PATCH-FIX-UPSTREAM require SSL conditionally in test_urllib +Patch18: python-3.4.3-test-conditional-ssl.patch ### COMMON-PATCH-END ### ### COMMON-DEF-BEGIN ### @@ -107,22 +91,6 @@ Python, and Macintosh Module Reference in HTML format. - -%package pdf -Summary: Python PDF Documentation -Group: Development/Languages/Python - -%description pdf -Tutorial, Global Module Index, Language Reference, Library Reference, -Extending and Embedding Reference, Python/C API Reference, Documenting -Python, and Macintosh Module Reference in PDF format. - - - -Authors: --------- - Guido van Rossum <[email protected]> - %prep %setup -q -n %{tarname} @@ -139,10 +107,9 @@ %patch09 -p1 %patch10 -p1 %patch12 -p1 -%patch13 -p0 %patch15 -p1 -%patch16 -p1 %patch17 -p1 +%patch18 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -164,25 +131,13 @@ cd Doc sed -i "s/^today = .*/today = '$TODAY_DATE'/" conf.py make html -make latex PAPER=a4 -( cd build/latex; make all-pdf ) -mv build/latex build/paper-a4 -make latex PAPER=letter -( cd build/latex; make all-pdf ) -mv build/latex build/paper-letter %install export PDOCS=${RPM_BUILD_ROOT}%{_docdir}/python3 mkdir -p $PDOCS # generated docs -pushd Doc -rm build/html/.buildinfo -cp -r build/html $PDOCS -install -d -m 755 $PDOCS/paper-a4 -cp build/paper-a4/*.pdf $PDOCS/paper-a4 -install -d -m 755 $PDOCS/paper-letter -cp build/paper-letter/*.pdf $PDOCS/paper-letter -popd +rm Doc/build/html/.buildinfo +cp -r Doc/build/html $PDOCS # misc install -d -m 755 $PDOCS/Misc rm Misc/README.AIX @@ -199,9 +154,4 @@ %doc %{_docdir}/python3/Misc %doc %{_docdir}/python3/html -%files pdf -%defattr(644, root, root, 755) -%doc %{_docdir}/python3/paper-a4 -%doc %{_docdir}/python3/paper-letter - %changelog ++++++ python3.spec ++++++ --- /var/tmp/diff_new_pack.1xumi3/_old 2015-05-16 07:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1xumi3/_new 2015-05-16 07:13:28.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python3 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -40,7 +40,7 @@ Summary: Python3 Interpreter License: Python-2.0 Group: Development/Languages/Python -Version: 3.4.1 +Version: 3.4.3 Release: 0 %define tarversion %{version} %define tarname Python-%{tarversion} @@ -83,14 +83,12 @@ Patch10: ctypes-libffi-aarch64.patch # Disable global and distutils sysconfig comparison test, we deviate from the default depending on optflags Patch12: python-3.3.3-skip-distutils-test_sysconfig_module.patch -# Add support for ppc64le (ELFv2) to libffi copy for ctypes -Patch13: libffi-ppc64le.diff # Raise timeout value for test_subprocess Patch15: subprocess-raise-timeout.patch -# CVE-2014-4650 - File disclosure and directory traversal in CGIHTTPServer -Patch16: CVE-2014-4650-CGIHTTPServer-traversal.patch # Upstream patch for bogus faulthandler which fails with GCC 5 Patch17: python-3.4.1-fix-faulthandler.patch +# PATCH-FIX-UPSTREAM require SSL conditionally in test_urllib +Patch18: python-3.4.3-test-conditional-ssl.patch ### COMMON-PATCH-END ### BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -191,10 +189,9 @@ %patch09 -p1 %patch10 -p1 %patch12 -p1 -%patch13 -p0 %patch15 -p1 -%patch16 -p1 %patch17 -p1 +%patch18 -p1 # drop Autoconf version requirement sed -i 's/^AC_PREREQ/dnl AC_PREREQ/' configure.ac @@ -239,7 +236,7 @@ fi # only test the parts skipped in python3-base -TESTS="test_dbm_gnu test_dbm_ndbm test_readline test_ssl test_tcl test_tk test_ttk_guionly test_ttk_textonly test_curses test_socketserver test_sqlite test_hashlib test_smtpnet" +TESTS="test_dbm_gnu test_dbm_ndbm test_readline test_ssl test_tcl test_tk test_ttk_guionly test_ttk_textonly test_curses test_socketserver test_sqlite test_hashlib test_smtpnet test_urllib test_httplib test_imaplib test_ftplib test_asyncio test_urllib2_localnet test_nntplib" # ensurepip-based tests TESTS="$TESTS test_venv test_ensurepip test_tools" ++++++ Python-3.3.0b2-multilib.patch ++++++ --- /var/tmp/diff_new_pack.1xumi3/_old 2015-05-16 07:13:28.000000000 +0200 +++ /var/tmp/diff_new_pack.1xumi3/_new 2015-05-16 07:13:28.000000000 +0200 @@ -1,7 +1,7 @@ -Index: Python-3.4.0b3/Include/pythonrun.h +Index: Python-3.4.3/Include/pythonrun.h =================================================================== ---- Python-3.4.0b3.orig/Include/pythonrun.h 2014-01-27 05:13:48.000000000 +0100 -+++ Python-3.4.0b3/Include/pythonrun.h 2014-02-04 17:18:37.567144169 +0100 +--- Python-3.4.3.orig/Include/pythonrun.h 2015-05-13 16:46:55.851521859 +0200 ++++ Python-3.4.3/Include/pythonrun.h 2015-05-13 16:46:57.157528715 +0200 @@ -220,6 +220,8 @@ /* In their own files */ PyAPI_FUNC(const char *) Py_GetVersion(void); @@ -11,32 +11,23 @@ PyAPI_FUNC(const char *) Py_GetCopyright(void); PyAPI_FUNC(const char *) Py_GetCompiler(void); PyAPI_FUNC(const char *) Py_GetBuildInfo(void); -Index: Python-3.4.0b3/Lib/distutils/command/install.py +Index: Python-3.4.3/Lib/distutils/command/install.py =================================================================== ---- Python-3.4.0b3.orig/Lib/distutils/command/install.py 2014-02-04 17:18:32.199117143 +0100 -+++ Python-3.4.0b3/Lib/distutils/command/install.py 2014-02-04 17:18:37.568144174 +0100 -@@ -25,6 +25,8 @@ - from site import USER_SITE - HAS_USER_SITE = True - -+libname = sys.lib -+ - if sys.version < "2.2": - WINDOWS_SCHEME = { - 'purelib': '$base', -@@ -45,7 +47,7 @@ +--- Python-3.4.3.orig/Lib/distutils/command/install.py 2015-05-13 16:46:55.852521864 +0200 ++++ Python-3.4.3/Lib/distutils/command/install.py 2015-05-13 16:48:05.857889431 +0200 +@@ -30,7 +30,7 @@ INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', -+ 'platlib': '$platbase/'+libname+'/python$py_version_short/site-packages', ++ 'platlib': '$platbase/'+sys.lib+'/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', -Index: Python-3.4.0b3/Lib/distutils/sysconfig.py +Index: Python-3.4.3/Lib/distutils/sysconfig.py =================================================================== ---- Python-3.4.0b3.orig/Lib/distutils/sysconfig.py 2014-01-27 05:13:48.000000000 +0100 -+++ Python-3.4.0b3/Lib/distutils/sysconfig.py 2014-02-04 17:18:37.568144174 +0100 +--- Python-3.4.3.orig/Lib/distutils/sysconfig.py 2015-05-13 16:46:55.853521870 +0200 ++++ Python-3.4.3/Lib/distutils/sysconfig.py 2015-05-13 16:46:57.158528720 +0200 @@ -141,8 +141,11 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX @@ -51,11 +42,11 @@ if standard_lib: return libpython else: -Index: Python-3.4.0b3/Lib/pydoc.py +Index: Python-3.4.3/Lib/pydoc.py =================================================================== ---- Python-3.4.0b3.orig/Lib/pydoc.py 2014-01-27 05:13:49.000000000 +0100 -+++ Python-3.4.0b3/Lib/pydoc.py 2014-02-04 17:18:37.568144174 +0100 -@@ -379,7 +379,7 @@ +--- Python-3.4.3.orig/Lib/pydoc.py 2015-05-13 16:46:55.853521870 +0200 ++++ Python-3.4.3/Lib/pydoc.py 2015-05-13 16:46:57.158528720 +0200 +@@ -394,7 +394,7 @@ docloc = os.environ.get("PYTHONDOCS", self.PYTHONDOCS) @@ -64,11 +55,11 @@ "python%d.%d" % sys.version_info[:2]) if (isinstance(object, type(os)) and (object.__name__ in ('errno', 'exceptions', 'gc', 'imp', -Index: Python-3.4.0b3/Lib/site.py +Index: Python-3.4.3/Lib/site.py =================================================================== ---- Python-3.4.0b3.orig/Lib/site.py 2014-01-27 05:13:49.000000000 +0100 -+++ Python-3.4.0b3/Lib/site.py 2014-02-04 17:18:37.568144174 +0100 -@@ -244,28 +244,37 @@ +--- Python-3.4.3.orig/Lib/site.py 2015-05-13 16:46:55.854521875 +0200 ++++ Python-3.4.3/Lib/site.py 2015-05-13 16:46:57.159528726 +0200 +@@ -247,28 +247,37 @@ USER_BASE = get_config_var('userbase') return USER_BASE @@ -112,7 +103,7 @@ def addusersitepackages(known_paths): """Add a per user site-package to sys.path -@@ -275,10 +284,12 @@ +@@ -278,10 +287,12 @@ """ # get the per user site-package path # this call will also make sure USER_BASE and USER_SITE are set @@ -128,19 +119,19 @@ return known_paths def getsitepackages(prefixes=None): -@@ -304,13 +304,19 @@ +@@ -304,13 +315,19 @@ seen.add(prefix) if os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib", + sitepackages.append(os.path.join(prefix, sys.lib, ++ "python" + sys.version[:3], ++ "site-packages")) ++ if sys.lib != "lib": ++ sitepackages.append(os.path.join(prefix, "lib", "python" + sys.version[:3], "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", "site-python")) -+ if sys.lib != "lib": -+ sitepackages.append(os.path.join(prefix, "lib", -+ "python" + sys.version[:3], -+ "site-packages")) + sitepackages.append(os.path.join(prefix, sys.lib, "site-python")) + if sys.lib != "lib": + sitepackages.append(os.path.join(prefix, "lib", "site-python")) @@ -151,10 +142,10 @@ if sys.platform == "darwin": # for framework builds *only* we add the standard Apple # locations. -Index: Python-3.4.0b3/Lib/trace.py +Index: Python-3.4.3/Lib/trace.py =================================================================== ---- Python-3.4.0b3.orig/Lib/trace.py 2014-01-27 05:13:50.000000000 +0100 -+++ Python-3.4.0b3/Lib/trace.py 2014-02-04 17:18:37.569144179 +0100 +--- Python-3.4.3.orig/Lib/trace.py 2015-05-13 16:46:55.854521875 +0200 ++++ Python-3.4.3/Lib/trace.py 2015-05-13 16:46:57.159528726 +0200 @@ -751,10 +751,10 @@ # should I also call expanduser? (after all, could use $HOME) @@ -168,11 +159,11 @@ "python" + sys.version[:3])) s = os.path.normpath(s) ignore_dirs.append(s) -Index: Python-3.4.0b3/Makefile.pre.in +Index: Python-3.4.3/Makefile.pre.in =================================================================== ---- Python-3.4.0b3.orig/Makefile.pre.in 2014-01-27 05:13:50.000000000 +0100 -+++ Python-3.4.0b3/Makefile.pre.in 2014-02-04 17:18:37.569144179 +0100 -@@ -96,6 +96,8 @@ +--- Python-3.4.3.orig/Makefile.pre.in 2015-05-13 16:46:55.855521880 +0200 ++++ Python-3.4.3/Makefile.pre.in 2015-05-13 16:46:57.160528731 +0200 +@@ -101,6 +101,8 @@ # Machine-dependent subdirectories MACHDEP= @MACHDEP@ @@ -181,7 +172,7 @@ # Multiarch directory (may be empty) MULTIARCH= @MULTIARCH@ -@@ -115,7 +117,7 @@ +@@ -120,7 +122,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include @@ -190,7 +181,7 @@ ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -@@ -695,6 +697,7 @@ +@@ -711,6 +713,7 @@ -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ @@ -198,7 +189,7 @@ -o $@ $(srcdir)/Modules/getpath.c Modules/python.o: $(srcdir)/Modules/python.c -@@ -763,7 +766,7 @@ +@@ -779,7 +782,7 @@ Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H) Python/getplatform.o: $(srcdir)/Python/getplatform.c @@ -207,10 +198,10 @@ Python/importdl.o: $(srcdir)/Python/importdl.c $(CC) -c $(PY_CORE_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c -Index: Python-3.4.0b3/Modules/getpath.c +Index: Python-3.4.3/Modules/getpath.c =================================================================== ---- Python-3.4.0b3.orig/Modules/getpath.c 2014-01-27 05:13:50.000000000 +0100 -+++ Python-3.4.0b3/Modules/getpath.c 2014-02-04 17:19:38.126449128 +0100 +--- Python-3.4.3.orig/Modules/getpath.c 2015-05-13 16:46:55.856521885 +0200 ++++ Python-3.4.3/Modules/getpath.c 2015-05-13 16:46:57.160528731 +0200 @@ -117,9 +117,11 @@ #define EXEC_PREFIX PREFIX #endif @@ -234,10 +225,10 @@ if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { Py_FatalError( -Index: Python-3.4.0b3/Python/getplatform.c +Index: Python-3.4.3/Python/getplatform.c =================================================================== ---- Python-3.4.0b3.orig/Python/getplatform.c 2014-01-27 05:13:51.000000000 +0100 -+++ Python-3.4.0b3/Python/getplatform.c 2014-02-04 17:18:37.569144179 +0100 +--- Python-3.4.3.orig/Python/getplatform.c 2015-05-13 16:46:55.856521885 +0200 ++++ Python-3.4.3/Python/getplatform.c 2015-05-13 16:46:57.160528731 +0200 @@ -10,3 +10,23 @@ { return PLATFORM; @@ -262,11 +253,11 @@ +{ + return LIB; +} -Index: Python-3.4.0b3/Python/sysmodule.c +Index: Python-3.4.3/Python/sysmodule.c =================================================================== ---- Python-3.4.0b3.orig/Python/sysmodule.c 2014-01-27 05:13:51.000000000 +0100 -+++ Python-3.4.0b3/Python/sysmodule.c 2014-02-04 17:18:37.569144179 +0100 -@@ -1691,6 +1691,10 @@ +--- Python-3.4.3.orig/Python/sysmodule.c 2015-05-13 16:46:55.857521891 +0200 ++++ Python-3.4.3/Python/sysmodule.c 2015-05-13 16:46:57.161528736 +0200 +@@ -1702,6 +1702,10 @@ PyUnicode_FromString(Py_GetCopyright())); SET_SYS_FROM_STRING("platform", PyUnicode_FromString(Py_GetPlatform())); @@ -277,11 +268,11 @@ SET_SYS_FROM_STRING("executable", PyUnicode_FromWideChar( Py_GetProgramFullPath(), -1)); -Index: Python-3.4.0b3/setup.py +Index: Python-3.4.3/setup.py =================================================================== ---- Python-3.4.0b3.orig/setup.py 2014-01-27 05:13:51.000000000 +0100 -+++ Python-3.4.0b3/setup.py 2014-02-04 17:18:37.570144184 +0100 -@@ -445,7 +445,7 @@ +--- Python-3.4.3.orig/setup.py 2015-05-13 16:46:55.858521896 +0200 ++++ Python-3.4.3/setup.py 2015-05-13 16:46:57.161528736 +0200 +@@ -451,7 +451,7 @@ # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: @@ -290,7 +281,7 @@ add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: -@@ -502,8 +502,7 @@ +@@ -508,8 +508,7 @@ # be assumed that no additional -I,-L directives are needed. if not cross_compiling: lib_dirs = self.compiler.library_dirs + [ @@ -300,7 +291,7 @@ ] inc_dirs = self.compiler.include_dirs + ['/usr/include'] else: -@@ -722,11 +721,11 @@ +@@ -730,11 +729,11 @@ elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + @@ -314,7 +305,7 @@ extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: -@@ -1732,18 +1731,17 @@ +@@ -1750,18 +1749,17 @@ # Check for various platform-specific directories if host_platform == 'sunos5': include_dirs.append('/usr/openwin/include') @@ -337,10 +328,10 @@ # If Cygwin, then verify that X is installed before proceeding if host_platform == 'cygwin': -Index: Python-3.4.0b3/Lib/sysconfig.py +Index: Python-3.4.3/Lib/sysconfig.py =================================================================== ---- Python-3.4.0b3.orig/Lib/sysconfig.py 2014-01-27 05:13:49.000000000 +0100 -+++ Python-3.4.0b3/Lib/sysconfig.py 2014-02-04 17:18:37.570144184 +0100 +--- Python-3.4.3.orig/Lib/sysconfig.py 2015-05-13 16:46:55.858521896 +0200 ++++ Python-3.4.3/Lib/sysconfig.py 2015-05-13 16:46:57.162528741 +0200 @@ -20,10 +20,10 @@ _INSTALL_SCHEMES = { @@ -369,11 +360,11 @@ 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', -Index: Python-3.4.0b3/configure.ac +Index: Python-3.4.3/configure.ac =================================================================== ---- Python-3.4.0b3.orig/configure.ac 2014-01-27 05:13:51.000000000 +0100 -+++ Python-3.4.0b3/configure.ac 2014-02-04 17:18:37.571144189 +0100 -@@ -788,6 +788,41 @@ +--- Python-3.4.3.orig/configure.ac 2015-05-13 16:46:55.859521901 +0200 ++++ Python-3.4.3/configure.ac 2015-05-13 16:46:57.163528747 +0200 +@@ -791,6 +791,41 @@ MULTIARCH=$($CC --print-multiarch 2>/dev/null) AC_SUBST(MULTIARCH) ++++++ Python-3.4.1.tar.xz -> Python-3.4.3.tar.xz ++++++ /work/SRC/openSUSE:Factory/python3/Python-3.4.1.tar.xz /work/SRC/openSUSE:Factory/.python3.new/Python-3.4.3.tar.xz differ: char 25, line 1 ++++++ python-3.4.3-test-conditional-ssl.patch ++++++ Index: Python-3.4.3/Lib/test/test_urllib.py =================================================================== --- Python-3.4.3.orig/Lib/test/test_urllib.py 2015-02-25 12:27:45.000000000 +0100 +++ Python-3.4.3/Lib/test/test_urllib.py 2015-05-14 11:56:46.581551577 +0200 @@ -10,7 +10,6 @@ from unittest.mock import patch from test import support import os -import ssl import sys import tempfile from nturl2path import url2pathname, pathname2url @@ -18,6 +17,11 @@ from base64 import b64encode import collections +try: + import ssl +except ImportError: + ssl = None + def hexescape(char): """Escape char as RFC 2396 specifies""" @@ -380,6 +384,7 @@ with support.check_warnings(('',DeprecationWarning)): urllib.request.URLopener() + @unittest.skipUnless(ssl, 'requires SSL support') def test_cafile_and_context(self): context = ssl.create_default_context() with self.assertRaises(ValueError):
