python: Update to 3.7.4

2 files changed, 12 insertions, 50 deletions

diff --git a/pkg/python/patch/0002-bpo-36594-Fix-incorrect-use-of-p-in-format-strings-G.patch b/pkg/python/patch/0001-bpo-36594-Fix-incorrect-use-of-p-in-format-strings-G.patch
index e6286af4..bc9b0eef 100644
--- a/pkg/python/patch/0002-bpo-36594-Fix-incorrect-use-of-p-in-format-strings-G.patch
+++ b/pkg/python/patch/0001-bpo-36594-Fix-incorrect-use-of-p-in-format-strings-G.patch
@@ -1,4 +1,4 @@
-From 94f9d25b16f3600aa85a68c4bf83b3282b0ad8ab Mon Sep 17 00:00:00 2001
+From 2060c4983a600b654c0128e93640f702cf1cbc3e Mon Sep 17 00:00:00 2001
 From: Zackery Spytz <zspytz@gmail.com>
 Date: Mon, 6 May 2019 10:56:51 -0600
 Subject: [PATCH] bpo-36594: Fix incorrect use of %p in format strings
@@ -68,7 +68,7 @@ index 0152945ca1..c837c4cbf8 100644
      ptr = Xalloc(32);
      Xfree(ptr);
 diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
-index e971388f69..611585f0fe 100644
+index ec854c864c..8de36893a1 100644
 --- a/Modules/_ctypes/callproc.c
 +++ b/Modules/_ctypes/callproc.c
 @@ -528,11 +528,11 @@ PyCArg_repr(PyCArgObject *self)
@@ -99,7 +99,7 @@ index e6f8daf796..4a36a1e71c 100644
          printf("avg_chain_len=%.1f, ", (double)total_chain_len / nchains);
      printf("max_chain_len=%" PY_FORMAT_SIZE_T "u, %" PY_FORMAT_SIZE_T "u KiB\n",
 diff --git a/Objects/object.c b/Objects/object.c
-index 138df44880..246c5befd4 100644
+index 8a3f8831d6..b2baf0c7a5 100644
 --- a/Objects/object.c
 +++ b/Objects/object.c
 @@ -359,7 +359,7 @@ PyObject_Print(PyObject *op, FILE *fp, int flags)
@@ -111,7 +111,7 @@ index 138df44880..246c5befd4 100644
              Py_END_ALLOW_THREADS
          else {
              PyObject *s;
-@@ -474,7 +474,7 @@ _PyObject_Dump(PyObject* op)
+@@ -472,7 +472,7 @@ _PyObject_Dump(PyObject* op)
          "address : %p\n",
          Py_TYPE(op)==NULL ? "NULL" : Py_TYPE(op)->tp_name,
          (long)op->ob_refcnt,
@@ -139,10 +139,10 @@ index 138df44880..246c5befd4 100644
  }
  
 diff --git a/Objects/obmalloc.c b/Objects/obmalloc.c
-index 3b0c35bcc9..187e40055e 100644
+index 885ad537ad..4966ac8a10 100644
 --- a/Objects/obmalloc.c
 +++ b/Objects/obmalloc.c
-@@ -2369,7 +2369,7 @@ _PyObject_DebugDumpAddress(const void *p)
+@@ -2362,7 +2362,7 @@ _PyObject_DebugDumpAddress(const void *p)
      }
  
      tail = q + nbytes;
@@ -152,7 +152,7 @@ index 3b0c35bcc9..187e40055e 100644
      for (i = 0; i < SST; ++i) {
          if (tail[i] != FORBIDDENBYTE) {
 diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
-index b67ffac4e9..c5b308cbd6 100644
+index c0e9c2d112..dda2208edc 100644
 --- a/Objects/unicodeobject.c
 +++ b/Objects/unicodeobject.c
 @@ -1214,7 +1214,7 @@ void *_PyUnicode_compact_data(void *unicode) {
@@ -195,10 +195,10 @@ index 7de641e1a5..609133cca8 100644
          fprintf(outfile, "\n");
      }
 diff --git a/Python/sysmodule.c b/Python/sysmodule.c
-index cdc2edf038..69ac43d9bf 100644
+index 942a8b6bec..9f73bbd62c 100644
 --- a/Python/sysmodule.c
 +++ b/Python/sysmodule.c
-@@ -1681,7 +1681,7 @@ _alloc_preinit_entry(const wchar_t *value)
+@@ -1683,7 +1683,7 @@ _alloc_preinit_entry(const wchar_t *value)
  
      PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
      return node;
@@ -207,7 +207,7 @@ index cdc2edf038..69ac43d9bf 100644
  
  static int
  _append_preinit_entry(_Py_PreInitEntry *optionlist, const wchar_t *value)
-@@ -1703,7 +1703,7 @@ _append_preinit_entry(_Py_PreInitEntry *optionlist, const wchar_t *value)
+@@ -1705,7 +1705,7 @@ _append_preinit_entry(_Py_PreInitEntry *optionlist, const wchar_t *value)
          last_entry->next = new_entry;
      }
      return 0;
@@ -216,7 +216,7 @@ index cdc2edf038..69ac43d9bf 100644
  
  static void
  _clear_preinit_entries(_Py_PreInitEntry *optionlist)
-@@ -1720,7 +1720,7 @@ _clear_preinit_entries(_Py_PreInitEntry *optionlist)
+@@ -1722,7 +1722,7 @@ _clear_preinit_entries(_Py_PreInitEntry *optionlist)
          current = next;
      }
      PyMem_SetAllocator(PYMEM_DOMAIN_RAW, &old_alloc);
@@ -225,7 +225,7 @@ index cdc2edf038..69ac43d9bf 100644
  
  static void
  _clear_all_preinit_options(void)
-@@ -1751,7 +1751,7 @@ _PySys_ReadPreInitOptions(void)
+@@ -1753,7 +1753,7 @@ _PySys_ReadPreInitOptions(void)
  
      _clear_all_preinit_options();
      return 0;
diff --git a/pkg/python/patch/0001-bpo-36734-Fix-compilation-of-faulthandler.c-on-HP-UX.patch b/pkg/python/patch/0001-bpo-36734-Fix-compilation-of-faulthandler.c-on-HP-UX.patch
deleted file mode 100644
index d4aee47a..00000000
--- a/pkg/python/patch/0001-bpo-36734-Fix-compilation-of-faulthandler.c-on-HP-UX.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From c4c5cf8ebe27232ed72e047989ee428b51613835 Mon Sep 17 00:00:00 2001
-From: Victor Stinner <vstinner@redhat.com>
-Date: Tue, 30 Apr 2019 12:19:34 +0200
-Subject: [PATCH] bpo-36734: Fix compilation of faulthandler.c on HP-UX
- (GH-12970)
-
-Initialize "stack_t current_stack" to zero using memset().
----
- .../next/Library/2019-04-26-17-14-20.bpo-36734.p2MaiN.rst      | 2 ++
- Modules/faulthandler.c                                         | 3 ++-
- 2 files changed, 4 insertions(+), 1 deletion(-)
- create mode 100644 Misc/NEWS.d/next/Library/2019-04-26-17-14-20.bpo-36734.p2MaiN.rst
-
-diff --git a/Misc/NEWS.d/next/Library/2019-04-26-17-14-20.bpo-36734.p2MaiN.rst b/Misc/NEWS.d/next/Library/2019-04-26-17-14-20.bpo-36734.p2MaiN.rst
-new file mode 100644
-index 0000000000..09341990a6
---- /dev/null
-+++ b/Misc/NEWS.d/next/Library/2019-04-26-17-14-20.bpo-36734.p2MaiN.rst
-@@ -0,0 +1,2 @@
-+Fix compilation of ``faulthandler.c`` on HP-UX. Initialize ``stack_t
-+current_stack`` to zero using ``memset()``.
-diff --git a/Modules/faulthandler.c b/Modules/faulthandler.c
-index cf24c9b2b9..ec5192832c 100644
---- a/Modules/faulthandler.c
-+++ b/Modules/faulthandler.c
-@@ -1369,7 +1369,8 @@ void _PyFaulthandler_Fini(void)
- #ifdef HAVE_SIGALTSTACK
-     if (stack.ss_sp != NULL) {
-         /* Fetch the current alt stack */
--        stack_t current_stack = {};
-+        stack_t current_stack;
-+        memset(&current_stack, 0, sizeof(current_stack));
-         if (sigaltstack(NULL, &current_stack) == 0) {
-             if (current_stack.ss_sp == stack.ss_sp) {
-                 /* The current alt stack is the one that we installed.
--- 
-2.22.0
-