Hello community,
here is the log from the commit of package python for openSUSE:Factory checked
in at 2017-11-30 12:33:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python (Old)
and /work/SRC/openSUSE:Factory/.python.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python"
Thu Nov 30 12:33:14 2017 rev:125 rq:544427 version:2.7.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/python/python-base.changes 2017-11-10
14:37:32.279160119 +0100
+++ /work/SRC/openSUSE:Factory/.python.new/python-base.changes 2017-11-30
12:33:17.600311784 +0100
@@ -1,0 +2,13 @@
+Mon Nov 20 16:11:48 UTC 2017 - jmate...@suse.com
+
+- update to 2.7.14
+ * dozens of bugfixes, see NEWS for details
+ * fixed possible integer overflow in PyString_DecodeEscape
(CVE-2017-1000158, bsc#1068664)
+ * fixed segfaults with dict mutated during search
+ * fixed possible free-after-use problems with buffer objects with custom
indexing
+ * fixed urllib.splithost to correctly parse fragments (bpo-30500)
+- drop upstreamed python-2.7.13-overflow_check.patch
+- drop unneeded python-2.7.12-makeopcode.patch
+- drop upstreamed 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch
+
+-------------------------------------------------------------------
python-doc.changes: same change
python.changes: same change
Old:
----
0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch
Python-2.7.13.tar.xz
Python-2.7.13.tar.xz.asc
python-2.7.12-makeopcode.patch
python-2.7.13-docs-pdf-a4.tar.bz2
python-2.7.13-docs-pdf-letter.tar.bz2
python-2.7.13-overflow_check.patch
New:
----
Python-2.7.14.tar.xz
Python-2.7.14.tar.xz.asc
python-2.7.14-docs-pdf-a4.tar.bz2
python-2.7.14-docs-pdf-letter.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-base.spec ++++++
--- /var/tmp/diff_new_pack.hGkUfp/_old 2017-11-30 12:33:20.736197750 +0100
+++ /var/tmp/diff_new_pack.hGkUfp/_new 2017-11-30 12:33:20.740197605 +0100
@@ -17,7 +17,7 @@
Name: python-base
-Version: 2.7.13
+Version: 2.7.14
Release: 0
Summary: Python Interpreter base package
License: Python-2.0
@@ -54,11 +54,8 @@
Patch34: python-2.7.9-sles-disable-verification-by-default.patch
# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dims...@opensuse.org
-- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1
Patch35: python-ncurses-6.0-accessors.patch
-Patch36: python-2.7.13-overflow_check.patch
-Patch37: python-2.7.12-makeopcode.patch
# PATCH-FIX-UPSTREAM bmwiedem...@suse.de -- allow python packages to build
reproducibly
Patch38: reproducible.patch
-Patch39: 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch
# COMMON-PATCH-END
%define python_version %(echo %{tarversion} | head -c 3)
BuildRequires: automake
@@ -161,10 +158,7 @@
%patch34 -p1
%endif
%patch35 -p1
-%patch36 -p1
-%patch37 -p1
%patch38 -p1
-%patch39 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
++++++ python-doc.spec ++++++
--- /var/tmp/diff_new_pack.hGkUfp/_old 2017-11-30 12:33:20.776196296 +0100
+++ /var/tmp/diff_new_pack.hGkUfp/_new 2017-11-30 12:33:20.780196151 +0100
@@ -17,7 +17,7 @@
Name: python-doc
-Version: 2.7.13
+Version: 2.7.14
Release: 0
Summary: Additional Package Documentation for Python
License: Python-2.0
@@ -55,11 +55,8 @@
Patch34: python-2.7.9-sles-disable-verification-by-default.patch
# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dims...@opensuse.org
-- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1
Patch35: python-ncurses-6.0-accessors.patch
-Patch36: python-2.7.13-overflow_check.patch
-Patch37: python-2.7.12-makeopcode.patch
# PATCH-FIX-UPSTREAM bmwiedem...@suse.de -- allow python packages to build
reproducibly
Patch38: reproducible.patch
-Patch39: 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch
# COMMON-PATCH-END
Provides: pyth_doc
Provides: pyth_ps
@@ -108,10 +105,7 @@
%patch34 -p1
%endif
%patch35 -p1
-%patch36 -p1
-%patch37 -p1
%patch38 -p1
-%patch39 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
++++++ python.spec ++++++
--- /var/tmp/diff_new_pack.hGkUfp/_old 2017-11-30 12:33:20.824194551 +0100
+++ /var/tmp/diff_new_pack.hGkUfp/_new 2017-11-30 12:33:20.832194260 +0100
@@ -17,7 +17,7 @@
Name: python
-Version: 2.7.13
+Version: 2.7.14
Release: 0
Summary: Python Interpreter
License: Python-2.0
@@ -60,11 +60,8 @@
Patch34: python-2.7.9-sles-disable-verification-by-default.patch
# PATCH-FIX-UPSTREAM python-ncurses-6.0-accessors.patch dims...@opensuse.org
-- Fix build with NCurses 6.0 and OPAQUE_WINDOW set to 1
Patch35: python-ncurses-6.0-accessors.patch
-Patch36: python-2.7.13-overflow_check.patch
-Patch37: python-2.7.12-makeopcode.patch
# PATCH-FIX-UPSTREAM bmwiedem...@suse.de -- allow python packages to build
reproducibly
Patch38: reproducible.patch
-Patch39: 0001-2.7-bpo-30714-ALPN-changes-for-OpenSSL-1.1.0f-3094.patch
# COMMON-PATCH-END
BuildRequires: automake
BuildRequires: db-devel
@@ -214,10 +211,7 @@
%patch34 -p1
%endif
%patch35 -p1
-%patch36 -p1
-%patch37 -p1
%patch38 -p1
-%patch39 -p1
# drop Autoconf version requirement
sed -i 's/^version_required/dnl version_required/' configure.ac
++++++ Python-2.7.13.tar.xz -> Python-2.7.14.tar.xz ++++++
/work/SRC/openSUSE:Factory/python/Python-2.7.13.tar.xz
/work/SRC/openSUSE:Factory/.python.new/Python-2.7.14.tar.xz differ: char 26,
line 1
++++++ python-2.7.13-docs-pdf-a4.tar.bz2 -> python-2.7.14-docs-pdf-a4.tar.bz2
++++++
/work/SRC/openSUSE:Factory/python/python-2.7.13-docs-pdf-a4.tar.bz2
/work/SRC/openSUSE:Factory/.python.new/python-2.7.14-docs-pdf-a4.tar.bz2
differ: char 11, line 1
++++++ python-2.7.13-docs-pdf-letter.tar.bz2 ->
python-2.7.14-docs-pdf-letter.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/python/python-2.7.13-docs-pdf-letter.tar.bz2
/work/SRC/openSUSE:Factory/.python.new/python-2.7.14-docs-pdf-letter.tar.bz2
differ: char 12, line 1
++++++ python-2.7.2-fix_date_time_compiler.patch ++++++
--- /var/tmp/diff_new_pack.hGkUfp/_old 2017-11-30 12:33:21.116183933 +0100
+++ /var/tmp/diff_new_pack.hGkUfp/_new 2017-11-30 12:33:21.120183787 +0100
@@ -1,9 +1,11 @@
---- 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)`\"" \
+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) \
+ -DGITVERSION="\"`LC_ALL=C $(GITVERSION)`\"" \
+ -DGITTAG="\"`LC_ALL=C $(GITTAG)`\"" \
+ -DGITBRANCH="\"`LC_ALL=C $(GITBRANCH)`\"" \
+ -DDATE="\"`LC_ALL=C date -u -r Makefile.pre.in +"%b %d %Y"`\"" \
+ -DTIME="\"`LC_ALL=C date -u -r Makefile.pre.in +"%T"`\"" \
-o $@ $(srcdir)/Modules/getbuildinfo.c
++++++ python-2.7.5-multilib.patch ++++++
--- /var/tmp/diff_new_pack.hGkUfp/_old 2017-11-30 12:33:21.152182624 +0100
+++ /var/tmp/diff_new_pack.hGkUfp/_new 2017-11-30 12:33:21.156182478 +0100
@@ -1,8 +1,8 @@
-Index: Python-2.7.13/configure.ac
+Index: Python-2.7.14/configure.ac
===================================================================
---- Python-2.7.13.orig/configure.ac
-+++ Python-2.7.13/configure.ac
-@@ -759,6 +759,41 @@ SunOS*)
+--- Python-2.7.14.orig/configure.ac
++++ Python-2.7.14/configure.ac
+@@ -758,6 +758,41 @@ SunOS*)
;;
esac
@@ -44,10 +44,10 @@
AC_SUBST(LIBRARY)
AC_MSG_CHECKING(LIBRARY)
-Index: Python-2.7.13/Include/pythonrun.h
+Index: Python-2.7.14/Include/pythonrun.h
===================================================================
---- Python-2.7.13.orig/Include/pythonrun.h
-+++ Python-2.7.13/Include/pythonrun.h
+--- Python-2.7.14.orig/Include/pythonrun.h
++++ Python-2.7.14/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 +57,10 @@
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.13/Lib/distutils/command/install.py
+Index: Python-2.7.14/Lib/distutils/command/install.py
===================================================================
---- Python-2.7.13.orig/Lib/distutils/command/install.py
-+++ Python-2.7.13/Lib/distutils/command/install.py
+--- Python-2.7.14.orig/Lib/distutils/command/install.py
++++ Python-2.7.14/Lib/distutils/command/install.py
@@ -22,6 +22,8 @@ from site import USER_BASE
from site import USER_SITE
@@ -79,10 +79,10 @@
'headers': '$base/include/python$py_version_short/$dist_name',
'scripts': '$base/bin',
'data' : '$base',
-Index: Python-2.7.13/Lib/distutils/sysconfig.py
+Index: Python-2.7.14/Lib/distutils/sysconfig.py
===================================================================
---- Python-2.7.13.orig/Lib/distutils/sysconfig.py
-+++ Python-2.7.13/Lib/distutils/sysconfig.py
+--- Python-2.7.14.orig/Lib/distutils/sysconfig.py
++++ Python-2.7.14/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 +97,10 @@
if standard_lib:
return libpython
else:
-Index: Python-2.7.13/Lib/pydoc.py
+Index: Python-2.7.14/Lib/pydoc.py
===================================================================
---- Python-2.7.13.orig/Lib/pydoc.py
-+++ Python-2.7.13/Lib/pydoc.py
+--- Python-2.7.14.orig/Lib/pydoc.py
++++ Python-2.7.14/Lib/pydoc.py
@@ -375,7 +375,7 @@ class Doc:
docmodule = docclass = docroutine = docother = docproperty = docdata =
fail
@@ -110,10 +110,10 @@
"python"+sys.version[0:3])):
"""Return the location of module docs or None"""
-Index: Python-2.7.13/Lib/site.py
+Index: Python-2.7.14/Lib/site.py
===================================================================
---- Python-2.7.13.orig/Lib/site.py
-+++ Python-2.7.13/Lib/site.py
+--- Python-2.7.14.orig/Lib/site.py
++++ Python-2.7.14/Lib/site.py
@@ -231,29 +231,38 @@ def getuserbase():
USER_BASE = get_config_var('userbase')
return USER_BASE
@@ -197,10 +197,10 @@
return sitepackages
def addsitepackages(known_paths):
-Index: Python-2.7.13/Lib/sysconfig.py
+Index: Python-2.7.14/Lib/sysconfig.py
===================================================================
---- Python-2.7.13.orig/Lib/sysconfig.py
-+++ Python-2.7.13/Lib/sysconfig.py
+--- Python-2.7.14.orig/Lib/sysconfig.py
++++ Python-2.7.14/Lib/sysconfig.py
@@ -7,10 +7,10 @@ from os.path import pardir, realpath
_INSTALL_SCHEMES = {
@@ -229,10 +229,10 @@
'include': '{userbase}/include/python{py_version_short}',
'scripts': '{userbase}/bin',
'data' : '{userbase}',
-Index: Python-2.7.13/Lib/test/test_dl.py
+Index: Python-2.7.14/Lib/test/test_dl.py
===================================================================
---- Python-2.7.13.orig/Lib/test/test_dl.py
-+++ Python-2.7.13/Lib/test/test_dl.py
+--- Python-2.7.14.orig/Lib/test/test_dl.py
++++ Python-2.7.14/Lib/test/test_dl.py
@@ -4,10 +4,11 @@
import unittest
from test.test_support import verbose, import_module
@@ -247,11 +247,11 @@
('/usr/bin/cygwin1.dll', 'getpid'),
('/usr/lib/libc.dylib', 'getpid'),
]
-Index: Python-2.7.13/Lib/test/test_site.py
+Index: Python-2.7.14/Lib/test/test_site.py
===================================================================
---- Python-2.7.13.orig/Lib/test/test_site.py
-+++ Python-2.7.13/Lib/test/test_site.py
-@@ -235,12 +235,16 @@ class HelperFunctionsTests(unittest.Test
+--- 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
self.assertEqual(dirs[0], wanted)
elif os.sep == '/':
# OS X, Linux, FreeBSD, etc
@@ -271,10 +271,10 @@
else:
# other platforms
self.assertEqual(len(dirs), 2)
-Index: Python-2.7.13/Lib/trace.py
+Index: Python-2.7.14/Lib/trace.py
===================================================================
---- Python-2.7.13.orig/Lib/trace.py
-+++ Python-2.7.13/Lib/trace.py
+--- Python-2.7.14.orig/Lib/trace.py
++++ Python-2.7.14/Lib/trace.py
@@ -754,10 +754,10 @@ def main(argv=None):
# should I also call expanduser? (after all, could use $HOME)
@@ -288,11 +288,11 @@
"python" + sys.version[:3]))
s = os.path.normpath(s)
ignore_dirs.append(s)
-Index: Python-2.7.13/Makefile.pre.in
+Index: Python-2.7.14/Makefile.pre.in
===================================================================
---- Python-2.7.13.orig/Makefile.pre.in
-+++ Python-2.7.13/Makefile.pre.in
-@@ -92,6 +92,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
+--- Python-2.7.14.orig/Makefile.pre.in
++++ Python-2.7.14/Makefile.pre.in
+@@ -91,6 +91,8 @@ PY_CFLAGS= $(CFLAGS) $(CPPFLAGS) $(CFLAG
# Machine-dependent subdirectories
MACHDEP= @MACHDEP@
@@ -301,7 +301,7 @@
# Multiarch directory (may be empty)
MULTIARCH= @MULTIARCH@
-@@ -668,6 +670,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
+@@ -644,6 +646,7 @@ Modules/getpath.o: $(srcdir)/Modules/get
-DEXEC_PREFIX='"$(exec_prefix)"' \
-DVERSION='"$(VERSION)"' \
-DVPATH='"$(VPATH)"' \
@@ -309,8 +309,8 @@
-o $@ $(srcdir)/Modules/getpath.c
Modules/python.o: $(srcdir)/Modules/python.c
-@@ -708,7 +711,7 @@ $(AST_C): $(AST_ASDL) $(ASDLGEN_FILES)
- Python/compile.o Python/symtable.o Python/ast.o: $(GRAMMAR_H) $(AST_H)
+@@ -692,7 +695,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
- $(CC) -c $(PY_CFLAGS) -DPLATFORM='"$(MACHDEP)"' -o $@
$(srcdir)/Python/getplatform.c
@@ -318,10 +318,10 @@
Python/importdl.o: $(srcdir)/Python/importdl.c
$(CC) -c $(PY_CFLAGS) -I$(DLINCLDIR) -o $@
$(srcdir)/Python/importdl.c
-Index: Python-2.7.13/Modules/getpath.c
+Index: Python-2.7.14/Modules/getpath.c
===================================================================
---- Python-2.7.13.orig/Modules/getpath.c
-+++ Python-2.7.13/Modules/getpath.c
+--- Python-2.7.14.orig/Modules/getpath.c
++++ Python-2.7.14/Modules/getpath.c
@@ -100,6 +100,8 @@
#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined"
#endif
@@ -340,10 +340,10 @@
static void
reduce(char *dir)
-Index: Python-2.7.13/Python/getplatform.c
+Index: Python-2.7.14/Python/getplatform.c
===================================================================
---- Python-2.7.13.orig/Python/getplatform.c
-+++ Python-2.7.13/Python/getplatform.c
+--- Python-2.7.14.orig/Python/getplatform.c
++++ Python-2.7.14/Python/getplatform.c
@@ -10,3 +10,23 @@ Py_GetPlatform(void)
{
return PLATFORM;
@@ -368,10 +368,10 @@
+{
+ return LIB;
+}
-Index: Python-2.7.13/Python/sysmodule.c
+Index: Python-2.7.14/Python/sysmodule.c
===================================================================
---- Python-2.7.13.orig/Python/sysmodule.c
-+++ Python-2.7.13/Python/sysmodule.c
+--- Python-2.7.14.orig/Python/sysmodule.c
++++ Python-2.7.14/Python/sysmodule.c
@@ -1437,6 +1437,10 @@ _PySys_Init(void)
PyString_FromString(Py_GetCopyright()));
SET_SYS_FROM_STRING("platform",
@@ -383,10 +383,10 @@
SET_SYS_FROM_STRING("executable",
PyString_FromString(Py_GetProgramFullPath()));
SET_SYS_FROM_STRING("prefix",
-Index: Python-2.7.13/setup.py
+Index: Python-2.7.14/setup.py
===================================================================
---- Python-2.7.13.orig/setup.py
-+++ Python-2.7.13/setup.py
+--- Python-2.7.14.orig/setup.py
++++ Python-2.7.14/setup.py
@@ -456,7 +456,7 @@ class PyBuildExt(build_ext):
def detect_modules(self):
# Ensure that /usr/local is always used
@@ -410,7 +410,7 @@
extra_link_args=readline_extra_link_args,
libraries=readline_libs) )
else:
-@@ -1938,18 +1938,17 @@ class PyBuildExt(build_ext):
+@@ -1941,18 +1941,17 @@ class PyBuildExt(build_ext):
# Check for various platform-specific directories
if host_platform == 'sunos5':
include_dirs.append('/usr/openwin/include')
++++++ python-bsddb6.diff ++++++
--- /var/tmp/diff_new_pack.hGkUfp/_old 2017-11-30 12:33:21.188181315 +0100
+++ /var/tmp/diff_new_pack.hGkUfp/_new 2017-11-30 12:33:21.188181315 +0100
@@ -16,10 +16,10 @@
setup.py | 6 +-
6 files changed, 120 insertions(+), 41 deletions(-)
-Index: Python-2.7.5/Lib/bsddb/test/test_all.py
+Index: Python-2.7.14/Lib/bsddb/test/test_all.py
===================================================================
---- Python-2.7.5.orig/Lib/bsddb/test/test_all.py
-+++ Python-2.7.5/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
@@ -74,8 +74,9 @@ if sys.version_info[0] >= 3 :
key = key.decode(charset)
return (key, value.decode(charset))
@@ -43,7 +43,7 @@
return self._fix(v)
def pget(self, key=None, data=None, flags=0) :
-@@ -492,7 +493,11 @@ def print_versions():
+@@ -489,7 +490,11 @@ def print_versions():
print 'py module: %s' % getattr(bsddb, "__file"+suffix)
print 'extension module: %s' % getattr(bsddb, "__file"+suffix)
@@ -56,10 +56,10 @@
print 'My pid: %s' % os.getpid()
print '-=' * 38
-Index: Python-2.7.5/Lib/bsddb/test/test_misc.py
+Index: Python-2.7.14/Lib/bsddb/test/test_misc.py
===================================================================
---- Python-2.7.5.orig/Lib/bsddb/test/test_misc.py
-+++ Python-2.7.5/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
@@ -46,8 +46,9 @@ class MiscTestCase(unittest.TestCase):
d[repr(i)] = repr(100*i)
db.close()
@@ -72,10 +72,10 @@
db.close()
#
http://sourceforge.net/tracker/index.php?func=detail&aid=1708868&group_id=13900&atid=313900
-Index: Python-2.7.5/Lib/bsddb/test/test_replication.py
+Index: Python-2.7.14/Lib/bsddb/test/test_replication.py
===================================================================
---- Python-2.7.5.orig/Lib/bsddb/test/test_replication.py
-+++ Python-2.7.5/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
@@ -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).
@@ -100,7 +100,7 @@
d = self.dbenvMaster.repmgr_site_list()
self.assertEqual(len(d), 1)
-@@ -239,14 +228,6 @@ class DBReplicationManager(DBReplication
+@@ -237,14 +226,6 @@ class DBReplicationManager(DBReplication
txn.commit()
if v is None :
time.sleep(0.02)
@@ -112,10 +112,10 @@
- if time.time()>=timeout and startup_timeout:
- self.skipTest("replication test skipped due to random failure, "
- "see issue 3892")
- self.assertTrue(time.time()<timeout)
+ self.assertLess(time.time(), timeout)
self.assertEqual("123", v)
-@@ -377,7 +358,7 @@ class DBBaseReplication(DBReplication) :
+@@ -375,7 +356,7 @@ class DBBaseReplication(DBReplication) :
# is not generated if the master has no new transactions.
# This is solved in BDB 4.6 (#15542).
import time
@@ -124,10 +124,10 @@
while (time.time()<timeout) and not (self.confirmed_master and
self.client_startupdone) :
time.sleep(0.02)
-Index: Python-2.7.5/Modules/_bsddb.c
+Index: Python-2.7.14/Modules/_bsddb.c
===================================================================
---- Python-2.7.5.orig/Modules/_bsddb.c
-+++ Python-2.7.5/Modules/_bsddb.c
+--- Python-2.7.14.orig/Modules/_bsddb.c
++++ Python-2.7.14/Modules/_bsddb.c
@@ -124,10 +124,14 @@ typedef int Py_ssize_t;
#define NUMBER_Check PyLong_Check
#define NUMBER_AsLong PyLong_AsLong
@@ -162,7 +162,7 @@
/* The same, when the value is a time_t */
static void _addTimeTToDict(PyObject* dict, char *name, time_t value)
{
-@@ -2662,13 +2678,21 @@ _default_cmp(const DBT *leftKey,
+@@ -2655,13 +2671,21 @@ _default_cmp(const DBT *leftKey,
static int
_db_compareCallback(DB* db,
const DBT *leftKey,
@@ -185,7 +185,7 @@
if (self == NULL || self->btCompareCallback == NULL) {
MYDB_BEGIN_BLOCK_THREADS;
PyErr_SetString(PyExc_TypeError,
-@@ -2776,13 +2800,21 @@ DB_set_bt_compare(DBObject* self, PyObje
+@@ -2769,13 +2793,21 @@ DB_set_bt_compare(DBObject* self, PyObje
static int
_db_dupCompareCallback(DB* db,
const DBT *leftKey,
@@ -208,7 +208,7 @@
if (self == NULL || self->dupCompareCallback == NULL) {
MYDB_BEGIN_BLOCK_THREADS;
PyErr_SetString(PyExc_TypeError,
-@@ -3559,13 +3591,14 @@ Py_ssize_t DB_length(PyObject* _self)
+@@ -3554,13 +3586,14 @@ Py_ssize_t DB_length(PyObject* _self)
err = self->db->stat(self->db, /*txnid*/ NULL, &sp, 0);
MYDB_END_ALLOW_THREADS;
@@ -226,7 +226,7 @@
free(sp);
return size;
}
-@@ -8406,12 +8439,22 @@ static PyObject*
+@@ -8398,12 +8431,22 @@ static PyObject*
DBSequence_get(DBSequenceObject* self, PyObject* args, PyObject* kwargs)
{
int err, flags = 0;
@@ -250,7 +250,7 @@
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
-@@ -8541,8 +8584,19 @@ DBSequence_remove(DBSequenceObject* self
+@@ -8533,8 +8576,19 @@ DBSequence_remove(DBSequenceObject* self
static PyObject*
DBSequence_set_cachesize(DBSequenceObject* self, PyObject* args)
{
@@ -272,7 +272,7 @@
return NULL;
CHECK_SEQUENCE_NOT_CLOSED(self)
-@@ -8557,7 +8611,11 @@ DBSequence_set_cachesize(DBSequenceObjec
+@@ -8549,7 +8603,11 @@ DBSequence_set_cachesize(DBSequenceObjec
static PyObject*
DBSequence_get_cachesize(DBSequenceObject* self)
{
@@ -285,7 +285,7 @@
CHECK_SEQUENCE_NOT_CLOSED(self)
-@@ -8686,6 +8744,9 @@ DBSequence_stat(DBSequenceObject* self,
+@@ -8678,6 +8736,9 @@ DBSequence_stat(DBSequenceObject* self,
#define MAKE_INT_ENTRY(name) _addIntToDict(dict_stat, #name, sp->st_##name)
@@ -295,7 +295,7 @@
#define MAKE_LONG_LONG_ENTRY(name) _addDb_seq_tToDict(dict_stat, #name,
sp->st_##name)
MAKE_INT_ENTRY(wait);
-@@ -8695,10 +8756,15 @@ DBSequence_stat(DBSequenceObject* self,
+@@ -8687,10 +8748,15 @@ DBSequence_stat(DBSequenceObject* self,
MAKE_LONG_LONG_ENTRY(last_value);
MAKE_LONG_LONG_ENTRY(min);
MAKE_LONG_LONG_ENTRY(max);
@@ -311,7 +311,7 @@
#undef MAKE_LONG_LONG_ENTRY
free(sp);
-@@ -9000,7 +9066,7 @@ static PyMethodDef DBEnv_methods[] = {
+@@ -8992,7 +9058,7 @@ static PyMethodDef DBEnv_methods[] = {
{"txn_recover", (PyCFunction)DBEnv_txn_recover, METH_NOARGS},
#if (DBVER < 48)
{"set_rpc_server", (PyCFunction)DBEnv_set_rpc_server,
@@ -320,7 +320,7 @@
#endif
{"set_mp_max_openfd", (PyCFunction)DBEnv_set_mp_max_openfd, METH_VARARGS},
{"get_mp_max_openfd", (PyCFunction)DBEnv_get_mp_max_openfd, METH_NOARGS},
-@@ -9972,6 +10038,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /
+@@ -9964,6 +10030,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /
ADD_INT(d, DB_LOG_ZERO);
#endif
@@ -331,7 +331,7 @@
#if (DBVER >= 44)
ADD_INT(d, DB_DSYNC_DB);
#endif
-@@ -10032,6 +10102,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /
+@@ -10024,6 +10094,10 @@ PyMODINIT_FUNC PyInit__bsddb(void) /
ADD_INT(d, DB_EVENT_REG_PANIC);
#endif
@@ -342,7 +342,7 @@
#if (DBVER >=52)
ADD_INT(d, DB_EVENT_REP_SITE_ADDED);
ADD_INT(d, DB_EVENT_REP_SITE_REMOVED);
-@@ -10136,6 +10210,20 @@ PyMODINIT_FUNC PyInit__bsddb(void) /
+@@ -10128,6 +10202,20 @@ PyMODINIT_FUNC PyInit__bsddb(void) /
ADD_INT(d, DB_REP_CONF_INMEM);
#endif
@@ -363,10 +363,10 @@
ADD_INT(d, DB_TIMEOUT);
#if (DBVER >= 50)
-Index: Python-2.7.5/Modules/bsddb.h
+Index: Python-2.7.14/Modules/bsddb.h
===================================================================
---- Python-2.7.5.orig/Modules/bsddb.h
-+++ Python-2.7.5/Modules/bsddb.h
+--- Python-2.7.14.orig/Modules/bsddb.h
++++ Python-2.7.14/Modules/bsddb.h
@@ -110,7 +110,7 @@
#error "eek! DBVER can't handle minor versions > 9"
#endif
@@ -376,11 +376,11 @@
/* Python object definitions */
-Index: Python-2.7.5/setup.py
+Index: Python-2.7.14/setup.py
===================================================================
---- Python-2.7.5.orig/setup.py
-+++ Python-2.7.5/setup.py
-@@ -879,7 +879,7 @@ class PyBuildExt(build_ext):
+--- Python-2.7.14.orig/setup.py
++++ Python-2.7.14/setup.py
+@@ -905,7 +905,7 @@ class PyBuildExt(build_ext):
# a release. Most open source OSes come with one or more
# versions of BerkeleyDB already installed.
@@ -389,7 +389,7 @@
min_db_ver = (4, 3)
db_setup_debug = False # verbose debug prints from this script?
-@@ -919,6 +919,7 @@ class PyBuildExt(build_ext):
+@@ -945,6 +945,7 @@ class PyBuildExt(build_ext):
# construct a list of paths to look for the header file in on
# top of the normal inc_dirs.
db_inc_paths = [
@@ -397,7 +397,7 @@
'/usr/include/db4',
'/usr/local/include/db4',
'/opt/sfw/include/db4',
-@@ -958,6 +959,7 @@ class PyBuildExt(build_ext):
+@@ -984,6 +985,7 @@ class PyBuildExt(build_ext):
for dn in inc_dirs:
std_variants.append(os.path.join(dn, 'db3'))
std_variants.append(os.path.join(dn, 'db4'))
