Updates for 3.3.53.3.5-03.3.5

4 files changed, 24 insertions, 10 deletions

diff --git a/patches/01_all_static_library_location.patch b/patches/01_all_static_library_location.patch
index fb33aa0..36ac67a 100644
--- a/patches/01_all_static_library_location.patch
+++ b/patches/01_all_static_library_location.patch
@@ -24,7 +24,7 @@ http://bugs.python.org/issue6103
  
  bininstall: altbininstall
  	-if test -f $(DESTDIR)$(BINDIR)/python3$(EXE) -o -h $(DESTDIR)$(BINDIR)/python3$(EXE); \
-@@ -1199,18 +1212,6 @@
+@@ -1200,18 +1213,6 @@
  		else	true; \
  		fi; \
  	done
diff --git a/patches/05_all_regenerate_platform-specific_modules.patch b/patches/05_all_regenerate_platform-specific_modules.patch
index 5e2a74f..68f33f7 100644
--- a/patches/05_all_regenerate_platform-specific_modules.patch
+++ b/patches/05_all_regenerate_platform-specific_modules.patch
@@ -79,7 +79,7 @@ http://bugs.python.org/issue12619
  # Build static library
  # avoid long command lines, same as LIBRARY_OBJS
  $(LIBRARY): $(LIBRARY_OBJS)
-@@ -1073,7 +1099,7 @@
+@@ -1074,7 +1100,7 @@
  		unittest unittest/test unittest/test/testmock \
  		venv venv/scripts venv/scripts/posix \
  		curses pydoc_data $(MACHDEPS)
@@ -88,7 +88,7 @@ http://bugs.python.org/issue12619
  	@for i in $(SCRIPTDIR) $(LIBDEST); \
  	do \
  		if test ! -d $(DESTDIR)$$i; then \
-@@ -1156,23 +1182,6 @@
+@@ -1157,23 +1183,6 @@
  	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
  		$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt
  
@@ -112,7 +112,7 @@ http://bugs.python.org/issue12619
  python-config: $(srcdir)/Misc/python-config.in
  	# Substitution happens here, as the completely-expanded BINDIR
  	# is not available in configure
-@@ -1475,7 +1484,7 @@
+@@ -1476,7 +1485,7 @@
  Python/thread.o: @THREADHEADERS@
  
  # Declare targets that aren't real files
diff --git a/patches/24_all_sqlite-3.8.4.patch b/patches/24_all_sqlite-3.8.4.patch
new file mode 100644
index 0000000..d6af2eb
--- /dev/null
+++ b/patches/24_all_sqlite-3.8.4.patch
@@ -0,0 +1,14 @@
+http://bugs.python.org/issue20901
+http://hg.python.org/cpython/rev/dbc9e3ed5e9f
+
+--- Lib/sqlite3/test/hooks.py
++++ Lib/sqlite3/test/hooks.py
+@@ -162,7 +162,7 @@
+             create table bar (a, b)
+             """)
+         second_count = len(progress_calls)
+-        self.assertGreater(first_count, second_count)
++        self.assertGreaterEqual(first_count, second_count)
+ 
+     def CheckCancelOperation(self):
+         """
diff --git a/patches/61_all_process_data.patch b/patches/61_all_process_data.patch
index cc065c4..b7738c7 100644
--- a/patches/61_all_process_data.patch
+++ b/patches/61_all_process_data.patch
@@ -38,7 +38,7 @@ python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARG
  
 --- Modules/posixmodule.c
 +++ Modules/posixmodule.c
-@@ -1158,6 +1158,10 @@
+@@ -1157,6 +1157,10 @@
          char *p = strchr(*e, '=');
          if (p == NULL)
              continue;
@@ -97,7 +97,7 @@ python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARG
          PyMem_Free(argv_copy2[i]);
 --- Python/sysmodule.c
 +++ Python/sysmodule.c
-@@ -1779,6 +1779,10 @@
+@@ -1778,6 +1778,10 @@
  makeargvobject(int argc, wchar_t **argv)
  {
      PyObject *av;
@@ -108,7 +108,7 @@ python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARG
      if (argc <= 0 || argv == NULL) {
          /* Ensure at least one (empty) argument is seen */
          static wchar_t *empty_argv[1] = {L""};
-@@ -1803,7 +1807,16 @@
+@@ -1802,7 +1806,16 @@
              } else
                  v = PyUnicode_FromString(argv[i]);
  #else
@@ -126,7 +126,7 @@ python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARG
  #endif
              if (v == NULL) {
                  Py_DECREF(av);
-@@ -1823,7 +1836,12 @@
+@@ -1822,7 +1835,12 @@
  static void
  sys_update_path(int argc, wchar_t **argv)
  {
@@ -140,7 +140,7 @@ python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARG
      wchar_t *p = NULL;
      Py_ssize_t n = 0;
      PyObject *a;
-@@ -1843,7 +1861,14 @@
+@@ -1842,7 +1860,14 @@
      if (path == NULL)
          return;
  
@@ -156,7 +156,7 @@ python_generate_wrapper_scripts() to check if Python supports GENTOO_PYTHON_TARG
  
  #ifdef HAVE_READLINK
      if (_HAVE_SCRIPT_ARGUMENT(argc, argv))
-@@ -1920,6 +1945,7 @@
+@@ -1919,6 +1944,7 @@
      if (PyList_Insert(path, 0, a) < 0)
          Py_FatalError("sys.path.insert(0) failed");
      Py_DECREF(a);