Hello community,
here is the log from the commit of package python for openSUSE:Factory checked in at 2019-04-14 12:21:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python (Old)
and /work/SRC/openSUSE:Factory/.python.new.27019 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python"
Sun Apr 14 12:21:11 2019 rev:137 rq:692401 version:2.7.16
Changes:
--------
--- /work/SRC/openSUSE:Factory/python/python-base.changes 2019-02-26 22:13:42.594246870 +0100
+++ /work/SRC/openSUSE:Factory/.python.new.27019/python-base.changes 2019-04-14 12:21:24.491688153 +0200
@@ -1,0 +2,44 @@
+Mon Apr 8 22:40:01 CEST 2019 - Matej Cepl
From 8f99cc799e4393bf1112b9395b2342f81b3f45ef Mon Sep 17 00:00:00 2001 From: push0ebp
Date: Thu, 14 Feb 2019 02:05:46 +0900 Subject: [PATCH 1/2] bpo-35907: Avoid file reading as disallowing the unnecessary URL scheme in urllib
--- Lib/test/test_urllib.py | 12 ++++++++++++ Lib/urllib.py | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 1ce9201c0693..e5f210e62a18 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -1023,6 +1023,18 @@ def open_spam(self, url): "spam://c:|windows%/:=&?~#+!$,;'@()*[]|/path/"), "//c:|windows%/:=&?~#+!$,;'@()*[]|/path/") + def test_local_file_open(self): + class DummyURLopener(urllib.URLopener): + def open_local_file(self, url): + return url + self.assertEqual(DummyURLopener().open( + 'local-file://example'), '//example') + self.assertEqual(DummyURLopener().open( + 'local_file://example'), '//example') + self.assertRaises(IOError, urllib.urlopen, + 'local-file://example') + self.assertRaises(IOError, urllib.urlopen, + 'local_file://example') # Just commented them out. # Can't really tell why keep failing in windows and sparc. diff --git a/Lib/urllib.py b/Lib/urllib.py index d85504a5cb7e..a24e9a5c68fb 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -203,7 +203,10 @@ def open(self, fullurl, data=None): name = 'open_' + urltype self.type = urltype name = name.replace('-', '_') - if not hasattr(self, name): + + # bpo-35907: # disallow the file reading with the type not allowed + if not hasattr(self, name) or \ + (self == _urlopener and name == 'open_local_file'): if proxy: return self.open_unknown_proxy(proxy, fullurl, data) else:
From b86392511acd4cd30dc68711fa22f9f93228715a Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]"
Date: Wed, 13 Feb 2019 17:21:11 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
--- .../NEWS.d/next/Library/2019-02-13-17-21-10.bpo-35907.ckk2zg.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2019-02-13-17-21-10.bpo-35907.ckk2zg.rst diff --git a/Misc/NEWS.d/next/Library/2019-02-13-17-21-10.bpo-35907.ckk2zg.rst b/Misc/NEWS.d/next/Library/2019-02-13-17-21-10.bpo-35907.ckk2zg.rst new file mode 100644 index 000000000000..8118a5f40583 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2019-02-13-17-21-10.bpo-35907.ckk2zg.rst @@ -0,0 +1 @@ +Avoid file reading as disallowing the unnecessary URL scheme in urllib.urlopen \ No newline at end of file ++++++ Python-2.7.15.tar.xz -> Python-2.7.16.tar.xz ++++++ /work/SRC/openSUSE:Factory/python/Python-2.7.15.tar.xz /work/SRC/openSUSE:Factory/.python.new.27019/Python-2.7.16.tar.xz differ: char 26, line 1 ++++++ bpo36160-init-sysconfig_vars.patch ++++++
From 603a4461e3c889b06a5d78e57594ebbc580f1c03 Mon Sep 17 00:00:00 2001 From: Ivan Pozdeev
Date: Fri, 1 Mar 2019 21:44:24 +0300 Subject: [PATCH] Fix AttributeError on sysconfig._CONFIG_VARS.clear() if test_site is run separately
---
Lib/test/test_site.py | 4 +++-
.../next/Tests/2019-03-01-21-45-13.bpo-36160.4JjrqB.rst | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
create mode 100644 Misc/NEWS.d/next/Tests/2019-03-01-21-45-13.bpo-36160.4JjrqB.rst
--- a/Lib/test/test_site.py
+++ b/Lib/test/test_site.py
@@ -47,6 +47,9 @@ def setUpModule():
else:
raise
+ # sysconfig._CONFIG_VARS is None until the first call to this function
+ sysconfig.get_config_vars()
+
def tearDownModule():
sys.path[:] = OLD_SYS_PATH
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2019-03-01-21-45-13.bpo-36160.4JjrqB.rst
@@ -0,0 +1,2 @@
+Fix AttributeError on sysconfig._CONFIG_VARS.clear() if test_site is run
+separately
++++++ do-not-use-non-ascii-in-test_ssl.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.687690788 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.687690788 +0200
@@ -1,11 +1,11 @@
---- Python-2.7.15.orig/Lib/test/test_ssl.py 2018-04-30 00:47:33.000000000 +0200
-+++ Python-2.7.15/Lib/test/test_ssl.py 2018-05-21 21:23:23.905940795 +0200
-@@ -1001,7 +1001,7 @@
- with self.assertRaises(ssl.SSLError) as cm:
- ctx.load_dh_params(CERTFILE)
- with support.temp_dir() as d:
-- fname = os.path.join(d, u'dhpäräm.pem')
-+ fname = os.path.join(d, u'dhparam.pem')
- shutil.copy(DHFILE, fname)
- ctx.load_dh_params(fname)
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -1021,7 +1021,7 @@ class ContextTests(unittest.TestCase):
+
+ def test_load_dh_params(self):
+- filename = u'dhpäräm.pem'
++ filename = u'dhparam.pem'
+ fs_encoding = sys.getfilesystemencoding()
+ try:
+ filename.encode(fs_encoding)
++++++ openssl-111-middlebox-compat.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.715690821 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.715690821 +0200
@@ -11,16 +11,14 @@
Lib/test/test_ssl.py | 5 +++++
1 file changed, 5 insertions(+)
-Index: Python-2.7.15/Lib/test/test_ssl.py
-===================================================================
---- Python-2.7.15.orig/Lib/test/test_ssl.py 2018-10-29 13:32:59.190865648 +0100
-+++ Python-2.7.15/Lib/test/test_ssl.py 2018-10-29 13:41:01.857624490 +0100
-@@ -777,8 +777,12 @@ class ContextTests(unittest.TestCase):
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -807,8 +807,12 @@ class ContextTests(unittest.TestCase):
default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3)
# SSLContext also enables these by default
- default |= (ssl.OP_NO_COMPRESSION | ssl.OP_CIPHER_SERVER_PREFERENCE |
-- ssl.OP_SINGLE_DH_USE | ssl.OP_SINGLE_ECDH_USE |
-- ssl.OP_ENABLE_MIDDLEBOX_COMPAT)
+ default |= (OP_NO_COMPRESSION | OP_CIPHER_SERVER_PREFERENCE |
+- OP_SINGLE_DH_USE | OP_SINGLE_ECDH_USE |
+- OP_ENABLE_MIDDLEBOX_COMPAT)
+ ssl.OP_SINGLE_DH_USE | ssl.OP_SINGLE_ECDH_USE)
+ if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1):
+ # define MIDDLEBOX constant, as python2.7 does not know about it
++++++ openssl-111-ssl_options.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.723690830 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.723690830 +0200
@@ -1,13 +1,17 @@
-Index: Python-2.7.15/Lib/test/test_ssl.py
-===================================================================
---- Python-2.7.15.orig/Lib/test/test_ssl.py 2018-10-29 13:41:01.857624490 +0100
-+++ Python-2.7.15/Lib/test/test_ssl.py 2018-10-29 14:04:59.674004321 +0100
-@@ -776,7 +776,7 @@ class ContextTests(unittest.TestCase):
- # OP_ALL | OP_NO_SSLv2 | OP_NO_SSLv3 is the default value
+--- a/Lib/test/test_ssl.py
++++ b/Lib/test/test_ssl.py
+@@ -807,12 +807,8 @@ class ContextTests(unittest.TestCase):
default = (ssl.OP_ALL | ssl.OP_NO_SSLv2 | ssl.OP_NO_SSLv3)
# SSLContext also enables these by default
-- default |= (ssl.OP_NO_COMPRESSION | ssl.OP_CIPHER_SERVER_PREFERENCE |
-+ default |= (ssl.OP_NO_COMPRESSION |
- ssl.OP_SINGLE_DH_USE | ssl.OP_SINGLE_ECDH_USE)
- if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1):
- # define MIDDLEBOX constant, as python2.7 does not know about it
+ default |= (OP_NO_COMPRESSION | OP_CIPHER_SERVER_PREFERENCE |
+- ssl.OP_SINGLE_DH_USE | ssl.OP_SINGLE_ECDH_USE)
+- if not IS_LIBRESSL and ssl.OPENSSL_VERSION_INFO >= (1, 1, 1):
+- # define MIDDLEBOX constant, as python2.7 does not know about it
+- # but it is used by default.
+- OP_ENABLE_MIDDLEBOX_COMPAT = 1048576L
+- default |= OP_ENABLE_MIDDLEBOX_COMPAT
++ OP_SINGLE_DH_USE | OP_SINGLE_ECDH_USE |
++ OP_ENABLE_MIDDLEBOX_COMPAT)
+ self.assertEqual(default, ctx.options)
+ ctx.options |= ssl.OP_NO_TLSv1
+ self.assertEqual(default | ssl.OP_NO_TLSv1, ctx.options)
++++++ python-2.5.1-sqlite.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.735690845 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.739690850 +0200
@@ -1,6 +1,6 @@
--- a/Modules/_sqlite/cursor.c
+++ b/Modules/_sqlite/cursor.c
-@@ -837,6 +837,9 @@
+@@ -829,6 +829,9 @@ PyObject* pysqlite_cursor_executescript(
goto error;
}
++++++ python-2.6-gettext-plurals.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.747690859 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.747690859 +0200
@@ -1,8 +1,6 @@
-Index: Lib/gettext.py
-===================================================================
---- a/Lib/gettext.py.orig
+--- a/Lib/gettext.py
+++ b/Lib/gettext.py
-@@ -311,8 +311,9 @@ class GNUTranslations(NullTranslations):
+@@ -387,8 +387,9 @@ class GNUTranslations(NullTranslations):
self._charset = v.split('charset=')[1]
elif k == 'plural-forms':
v = v.split(';')
++++++ python-2.7-dirs.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.755690869 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.755690869 +0200
@@ -1,6 +1,6 @@
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
-@@ -106,7 +106,7 @@
+@@ -110,7 +110,7 @@ LIBDIR= @libdir@
MANDIR= @mandir@
INCLUDEDIR= @includedir@
CONFINCLUDEDIR= $(exec_prefix)/include
++++++ python-2.7.15-docs-pdf-a4.tar.bz2 -> python-2.7.16-docs-pdf-a4.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/python/python-2.7.15-docs-pdf-a4.tar.bz2 /work/SRC/openSUSE:Factory/.python.new.27019/python-2.7.16-docs-pdf-a4.tar.bz2 differ: char 11, line 1
++++++ python-2.7.15-docs-pdf-letter.tar.bz2 -> python-2.7.16-docs-pdf-letter.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/python/python-2.7.15-docs-pdf-letter.tar.bz2 /work/SRC/openSUSE:Factory/.python.new.27019/python-2.7.16-docs-pdf-letter.tar.bz2 differ: char 11, line 1
++++++ python-2.7.2-fix_date_time_compiler.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.791690912 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.791690912 +0200
@@ -1,8 +1,6 @@
-Index: Python-2.7.14/Makefile.pre.in
-===================================================================
---- Python-2.7.14.orig/Makefile.pre.in
-+++ Python-2.7.14/Makefile.pre.in
-@@ -638,8 +638,15 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
+@@ -647,8 +647,15 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \
-DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
-DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
-DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
++++++ python-2.7.4-canonicalize2.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.803690926 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.803690926 +0200
@@ -1,8 +1,6 @@
-Index: Python-2.7.7/Python/sysmodule.c
-===================================================================
---- Python-2.7.7.orig/Python/sysmodule.c 2014-06-20 14:33:06.696228064 +0200
-+++ Python-2.7.7/Python/sysmodule.c 2014-06-20 14:33:10.960250497 +0200
-@@ -1624,7 +1624,20 @@
+--- a/Python/sysmodule.c
++++ b/Python/sysmodule.c
+@@ -1638,7 +1638,20 @@ PySys_SetArgvEx(int argc, char **argv, i
char *p = NULL;
Py_ssize_t n = 0;
PyObject *a;
@@ -24,7 +22,7 @@
char link[MAXPATHLEN+1];
char argv0copy[2*MAXPATHLEN+1];
int nr = 0;
-@@ -1651,7 +1664,8 @@
+@@ -1665,7 +1678,8 @@ PySys_SetArgvEx(int argc, char **argv, i
}
}
}
@@ -34,7 +32,7 @@
#if SEP == '\\' /* Special case for MS filename syntax */
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
char *q;
-@@ -1680,11 +1694,6 @@
+@@ -1694,11 +1708,6 @@ PySys_SetArgvEx(int argc, char **argv, i
}
#else /* All other filename syntaxes */
if (argc > 0 && argv0 != NULL && strcmp(argv0, "-c") != 0) {
@@ -46,7 +44,7 @@
p = strrchr(argv0, SEP);
}
if (p != NULL) {
-@@ -1702,6 +1711,9 @@
+@@ -1716,6 +1725,9 @@ PySys_SetArgvEx(int argc, char **argv, i
a = PyString_FromStringAndSize(argv0, n);
if (a == NULL)
Py_FatalError("no mem for sys.path insertion");
@@ -56,10 +54,8 @@
if (PyList_Insert(path, 0, a) < 0)
Py_FatalError("sys.path.insert(0) failed");
Py_DECREF(a);
-Index: Python-2.7.7/pyconfig.h.in
-===================================================================
---- Python-2.7.7.orig/pyconfig.h.in 2014-05-31 20:58:40.000000000 +0200
-+++ Python-2.7.7/pyconfig.h.in 2014-06-20 14:33:10.961250502 +0200
+--- a/pyconfig.h.in
++++ b/pyconfig.h.in
@@ -109,6 +109,9 @@
/* Define to 1 if you have the 'chflags' function. */
#undef HAVE_CHFLAGS
@@ -70,13 +66,11 @@
/* Define to 1 if you have the `chown' function. */
#undef HAVE_CHOWN
-Index: Python-2.7.7/configure.ac
-===================================================================
---- Python-2.7.7.orig/configure.ac 2014-06-20 14:33:06.694228054 +0200
-+++ Python-2.7.7/configure.ac 2014-06-20 14:33:10.961250502 +0200
-@@ -2935,7 +2935,7 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -3159,7 +3159,7 @@ AC_CHECK_FUNCS(alarm setitimer getitimer
getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
- initgroups kill killpg lchmod lchown lstat mkfifo mknod mktime mmap \
+ initgroups kill killpg lchown lstat mkfifo mknod mktime mmap \
mremap nice pathconf pause plock poll pthread_init \
- putenv readlink realpath \
+ putenv readlink realpath canonicalize_file_name \
++++++ python-2.7.5-multilib.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.811690936 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.811690936 +0200
@@ -1,8 +1,6 @@
-Index: Python-2.7.14/configure.ac
-===================================================================
---- Python-2.7.14.orig/configure.ac
-+++ Python-2.7.14/configure.ac
-@@ -758,6 +758,41 @@ SunOS*)
+--- a/configure.ac
++++ b/configure.ac
+@@ -773,6 +773,41 @@ SunOS*)
;;
esac
@@ -44,10 +42,8 @@
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
-Index: Python-2.7.14/Include/pythonrun.h
-===================================================================
---- Python-2.7.14.orig/Include/pythonrun.h
-+++ Python-2.7.14/Include/pythonrun.h
+--- a/Include/pythonrun.h
++++ b/Include/pythonrun.h
@@ -108,6 +108,8 @@ PyAPI_FUNC(char *) Py_GetPath(void);
/* 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: Python-2.7.14/Lib/distutils/command/install.py
-===================================================================
---- Python-2.7.14.orig/Lib/distutils/command/install.py
-+++ Python-2.7.14/Lib/distutils/command/install.py
+--- a/Lib/distutils/command/install.py
++++ b/Lib/distutils/command/install.py
@@ -22,6 +22,8 @@ from site import USER_BASE
from site import USER_SITE
@@ -79,10 +73,8 @@
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
-Index: Python-2.7.14/Lib/distutils/sysconfig.py
-===================================================================
---- Python-2.7.14.orig/Lib/distutils/sysconfig.py
-+++ Python-2.7.14/Lib/distutils/sysconfig.py
+--- a/Lib/distutils/sysconfig.py
++++ b/Lib/distutils/sysconfig.py
@@ -119,8 +119,11 @@ def get_python_lib(plat_specific=0, stan
prefix = plat_specific and EXEC_PREFIX or PREFIX
@@ -97,10 +89,8 @@
if standard_lib:
return libpython
else:
-Index: Python-2.7.14/Lib/pydoc.py
-===================================================================
---- Python-2.7.14.orig/Lib/pydoc.py
-+++ Python-2.7.14/Lib/pydoc.py
+--- a/Lib/pydoc.py
++++ b/Lib/pydoc.py
@@ -375,7 +375,7 @@ class Doc:
docmodule = docclass = docroutine = docother = docproperty = docdata = fail
@@ -110,10 +100,8 @@
"python"+sys.version[0:3])):
"""Return the location of module docs or None"""
-Index: Python-2.7.14/Lib/site.py
-===================================================================
---- Python-2.7.14.orig/Lib/site.py
-+++ Python-2.7.14/Lib/site.py
+--- a/Lib/site.py
++++ b/Lib/site.py
@@ -231,29 +231,38 @@ def getuserbase():
USER_BASE = get_config_var('userbase')
return USER_BASE
@@ -197,10 +185,8 @@
return sitepackages
def addsitepackages(known_paths):
-Index: Python-2.7.14/Lib/sysconfig.py
-===================================================================
---- Python-2.7.14.orig/Lib/sysconfig.py
-+++ Python-2.7.14/Lib/sysconfig.py
+--- a/Lib/sysconfig.py
++++ b/Lib/sysconfig.py
@@ -7,10 +7,10 @@ from os.path import pardir, realpath
_INSTALL_SCHEMES = {
@@ -229,10 +215,8 @@
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
-Index: Python-2.7.14/Lib/test/test_dl.py
-===================================================================
---- Python-2.7.14.orig/Lib/test/test_dl.py
-+++ Python-2.7.14/Lib/test/test_dl.py
+--- a/Lib/test/test_dl.py
++++ b/Lib/test/test_dl.py
@@ -4,10 +4,11 @@
import unittest
from test.test_support import verbose, import_module
@@ -247,11 +231,9 @@
('/usr/bin/cygwin1.dll', 'getpid'),
('/usr/lib/libc.dylib', 'getpid'),
]
-Index: Python-2.7.14/Lib/test/test_site.py
-===================================================================
---- Python-2.7.14.orig/Lib/test/test_site.py
-+++ Python-2.7.14/Lib/test/test_site.py
-@@ -252,12 +252,16 @@ class HelperFunctionsTests(unittest.Test
+--- a/Lib/test/test_site.py
++++ b/Lib/test/test_site.py
+@@ -254,12 +254,16 @@ class HelperFunctionsTests(unittest.Test
self.assertEqual(dirs[0], wanted)
elif os.sep == '/':
# OS X, Linux, FreeBSD, etc
@@ -271,10 +253,21 @@
else:
# other platforms
self.assertEqual(len(dirs), 2)
-Index: Python-2.7.14/Lib/trace.py
-===================================================================
---- Python-2.7.14.orig/Lib/trace.py
-+++ Python-2.7.14/Lib/trace.py
+@@ -305,7 +309,11 @@ class HelperFunctionsTests(unittest.Test
+ known_paths = set()
+ site.addusersitepackages(known_paths)
+
+- self.assertEqual(fake_isdir.arg, user_site)
++ # value of user_site cannot be used for comparison, because
++ # the following assert mistakenly assumes 'platlib' and
++ # 'purelib' directories are same.
++ self.assertEqual(fake_isdir.arg,
++ site.getusersitepackages('platlib'))
+ self.assertFalse(known_paths)
+
+
+--- a/Lib/trace.py
++++ b/Lib/trace.py
@@ -754,10 +754,10 @@ def main(argv=None):
# should I also call expanduser? (after all, could use $HOME)
@@ -288,10 +281,8 @@
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
-Index: Python-2.7.14/Makefile.pre.in
-===================================================================
---- Python-2.7.14.orig/Makefile.pre.in
-+++ Python-2.7.14/Makefile.pre.in
+--- a/Makefile.pre.in
++++ b/Makefile.pre.in
@@ -91,6 +91,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
# Machine-dependent subdirectories
@@ -301,7 +292,7 @@
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
-@@ -644,6 +646,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
+@@ -653,6 +655,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
@@ -309,7 +300,7 @@
-o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c
-@@ -692,7 +695,7 @@ regen-ast:
+@@ -701,7 +704,7 @@ regen-ast:
Python/compile.o Python/symtable.o Python/ast.o: $(srcdir)/Include/graminit.h $(srcdir)/Include/Python-ast.h
Python/getplatform.o: $(srcdir)/Python/getplatform.c
@@ -318,10 +309,8 @@
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@ $(srcdir)/Python/importdl.c
-Index: Python-2.7.14/Modules/getpath.c
-===================================================================
---- Python-2.7.14.orig/Modules/getpath.c
-+++ Python-2.7.14/Modules/getpath.c
+--- a/Modules/getpath.c
++++ b/Modules/getpath.c
@@ -100,6 +100,8 @@
#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
#endif
@@ -340,10 +329,8 @@
static void
reduce(char *dir)
-Index: Python-2.7.14/Python/getplatform.c
-===================================================================
---- Python-2.7.14.orig/Python/getplatform.c
-+++ Python-2.7.14/Python/getplatform.c
+--- a/Python/getplatform.c
++++ b/Python/getplatform.c
@@ -10,3 +10,23 @@ Py_GetPlatform(void)
{
return PLATFORM;
@@ -368,10 +355,8 @@
+{
+ return LIB;
+}
-Index: Python-2.7.14/Python/sysmodule.c
-===================================================================
---- Python-2.7.14.orig/Python/sysmodule.c
-+++ Python-2.7.14/Python/sysmodule.c
+--- a/Python/sysmodule.c
++++ b/Python/sysmodule.c
@@ -1437,6 +1437,10 @@ _PySys_Init(void)
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
@@ -383,10 +368,8 @@
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
-Index: Python-2.7.14/setup.py
-===================================================================
---- Python-2.7.14.orig/setup.py
-+++ Python-2.7.14/setup.py
+--- a/setup.py
++++ b/setup.py
@@ -456,7 +456,7 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
@@ -410,7 +393,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -1941,18 +1941,17 @@ class PyBuildExt(build_ext):
+@@ -1933,18 +1933,17 @@ class PyBuildExt(build_ext):
# Check for various platform-specific directories
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
++++++ python-2.7.9-ssl_ca_path.patch ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.823690951 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.823690951 +0200
@@ -1,8 +1,6 @@
-Index: Python-2.7.9/Lib/ssl.py
-===================================================================
---- Python-2.7.9.orig/Lib/ssl.py 2014-12-10 16:59:40.000000000 +0100
-+++ Python-2.7.9/Lib/ssl.py 2015-02-25 17:28:19.538808314 +0100
-@@ -504,7 +504,15 @@
+--- a/Lib/ssl.py
++++ b/Lib/ssl.py
+@@ -537,7 +537,15 @@ class SSLSocket(socket):
self._context = SSLContext(ssl_version)
self._context.verify_mode = cert_reqs
if ca_certs:
++++++ python-bsddb6.diff ++++++
--- /var/tmp/diff_new_pack.QP9QkA/_old 2019-04-14 12:21:26.839690970 +0200
+++ /var/tmp/diff_new_pack.QP9QkA/_new 2019-04-14 12:21:26.843690974 +0200
@@ -16,10 +16,8 @@
setup.py | 6 +-
6 files changed, 120 insertions(+), 41 deletions(-)
-Index: Python-2.7.14/Lib/bsddb/test/test_all.py
-===================================================================
---- Python-2.7.14.orig/Lib/bsddb/test/test_all.py
-+++ Python-2.7.14/Lib/bsddb/test/test_all.py
+--- a/Lib/bsddb/test/test_all.py
++++ b/Lib/bsddb/test/test_all.py
@@ -74,8 +74,9 @@ if sys.version_info[0] >= 3 :
key = key.decode(charset)
return (key, value.decode(charset))
@@ -56,10 +54,8 @@
print 'My pid: %s' % os.getpid()
print '-=' * 38
-Index: Python-2.7.14/Lib/bsddb/test/test_misc.py
-===================================================================
---- Python-2.7.14.orig/Lib/bsddb/test/test_misc.py
-+++ Python-2.7.14/Lib/bsddb/test/test_misc.py
+--- a/Lib/bsddb/test/test_misc.py
++++ b/Lib/bsddb/test/test_misc.py
@@ -46,8 +46,9 @@ class MiscTestCase(unittest.TestCase):
d[repr(i)] = repr(100*i)
db.close()
@@ -72,10 +68,8 @@
db.close()
# http://sourceforge.net/tracker/index.php?func=detail&aid=1708868&group_id=13900&atid=313900
-Index: Python-2.7.14/Lib/bsddb/test/test_replication.py
-===================================================================
---- Python-2.7.14.orig/Lib/bsddb/test/test_replication.py
-+++ Python-2.7.14/Lib/bsddb/test/test_replication.py
+--- a/Lib/bsddb/test/test_replication.py
++++ b/Lib/bsddb/test/test_replication.py
@@ -165,21 +165,10 @@ class DBReplicationManager(DBReplication
# is not generated if the master has no new transactions.
# This is solved in BDB 4.6 (#15542).
@@ -124,10 +118,8 @@
while (time.time()