patches: packages: python 3.6.8

Bump to latest python 3.6 version and squah one patch in to it.

patches/packages/to-upstream/0013-python3-bump-version-to-3.6.7.patch

-From 177b449691efc58983c79ffdab64e60948ecd612 Mon Sep 17 00:00:00 2001
-From: Michal Hrusecky <Michal@Hrusecky.net>
-Date: Sat, 24 Nov 2018 00:45:00 +0100
-Subject: [PATCH] python3: bump version to 3.6.7
-
-There is problem with compilation with OpenSSL 1.1.0f on our build
-servers. There seems to be some fixes for OpenSSL 1.1.0 later revisions
-in Python 3.6.6 so let's test newest version.
----
- lang/python/python3-version.mk                |  4 +-
- lang/python/python3/Makefile                  |  2 +-
- ...L_SetHashSalt-in-_elementtree-GH-914.patch | 88 -------------------
- ...ntion-CVE-2018-14647-in-news-entry-G.patch | 31 -------
- 4 files changed, 3 insertions(+), 122 deletions(-)
- delete mode 100644 lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch
- delete mode 100644 lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch
-
-diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
-index 522971758..1c7dc46b3 100644
---- a/lang/python/python3-version.mk
-+++ b/lang/python/python3-version.mk
-@@ -8,7 +8,7 @@
- # Note: keep in sync with setuptools & pip
- PYTHON3_VERSION_MAJOR:=3
- PYTHON3_VERSION_MINOR:=6
--PYTHON3_VERSION_MICRO:=5
-+PYTHON3_VERSION_MICRO:=7
- 
- PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
- 
-@@ -16,4 +16,4 @@ PYTHON3_SETUPTOOLS_PKG_RELEASE:=2
- PYTHON3_PIP_PKG_RELEASE:=2
- 
- PYTHON3_SETUPTOOLS_VERSION:=39.0.1
--PYTHON3_PIP_VERSION:=9.0.3
-+PYTHON3_PIP_VERSION:=10.0.1
-diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
-index 304e2e51a..f419b3a8b 100644
---- a/lang/python/python3/Makefile
-+++ b/lang/python/python3/Makefile
-@@ -19,7 +19,7 @@ PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
- 
- PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
- PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
--PKG_HASH:=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
-+PKG_HASH:=81fd1401a9d66533b0a3e9e3f4ea1c7c6702d57d5b90d659f971e6f1b745f77d
- 
- PKG_LICENSE:=PSF
- PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
-diff --git a/lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch b/lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch
-deleted file mode 100644
-index 09a4014c3..000000000
---- a/lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch
-+++ /dev/null
-@@ -1,88 +0,0 @@
--From f7666e828cc3d5873136473ea36ba2013d624fa1 Mon Sep 17 00:00:00 2001
--From: "Miss Islington (bot)"
-- <31488909+miss-islington@users.noreply.github.com>
--Date: Tue, 18 Sep 2018 06:14:13 -0700
--Subject: [PATCH] bpo-34623: Use XML_SetHashSalt in _elementtree (GH-9146)
--
--The C accelerated _elementtree module now initializes hash randomization
--salt from _Py_HashSecret instead of libexpat's default CPRNG.
--
--Signed-off-by: Christian Heimes <christian@python.org>
--
--https://bugs.python.org/issue34623
--(cherry picked from commit cb5778f00ce48631c7140f33ba242496aaf7102b)
--
--Co-authored-by: Christian Heimes <christian@python.org>
-----
-- Include/pyexpat.h                                            | 4 +++-
-- .../next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst   | 2 ++
-- Modules/_elementtree.c                                       | 5 +++++
-- Modules/pyexpat.c                                            | 5 +++++
-- 4 files changed, 15 insertions(+), 1 deletion(-)
-- create mode 100644 Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
--
--diff --git a/Include/pyexpat.h b/Include/pyexpat.h
--index 44259bf6d7..07020b5dc9 100644
----- a/Include/pyexpat.h
--+++ b/Include/pyexpat.h
--@@ -3,7 +3,7 @@
-- 
-- /* note: you must import expat.h before importing this module! */
-- 
---#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.0"
--+#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.1"
-- #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
-- 
-- struct PyExpat_CAPI
--@@ -48,6 +48,8 @@ struct PyExpat_CAPI
--     enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding);
--     int (*DefaultUnknownEncodingHandler)(
--         void *encodingHandlerData, const XML_Char *name, XML_Encoding *info);
--+    /* might be none for expat < 2.1.0 */
--+    int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
--     /* always add new stuff to the end! */
-- };
-- 
--diff --git a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
--new file mode 100644
--index 0000000000..31ad92ef85
----- /dev/null
--+++ b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
--@@ -0,0 +1,2 @@
--+The C accelerated _elementtree module now initializes hash randomization
--+salt from _Py_HashSecret instead of libexpat's default CSPRNG.
--diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
--index 707ab2912b..53f05f937f 100644
----- a/Modules/_elementtree.c
--+++ b/Modules/_elementtree.c
--@@ -3261,6 +3261,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html,
--         PyErr_NoMemory();
--         return -1;
--     }
--+    /* expat < 2.1.0 has no XML_SetHashSalt() */
--+    if (EXPAT(SetHashSalt) != NULL) {
--+        EXPAT(SetHashSalt)(self->parser,
--+                           (unsigned long)_Py_HashSecret.expat.hashsalt);
--+    }
-- 
--     if (target) {
--         Py_INCREF(target);
--diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
--index 47c3e86c20..aa21d93c11 100644
----- a/Modules/pyexpat.c
--+++ b/Modules/pyexpat.c
--@@ -1887,6 +1887,11 @@ MODULE_INITFUNC(void)
--     capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler;
--     capi.SetEncoding = XML_SetEncoding;
--     capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler;
--+#if XML_COMBINED_VERSION >= 20100
--+    capi.SetHashSalt = XML_SetHashSalt;
--+#else
--+    capi.SetHashSalt = NULL;
--+#endif
-- 
--     /* export using capsule */
--     capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL);
---- 
--2.19.1
--
-diff --git a/lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch b/lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch
-deleted file mode 100644
-index c83236a58..000000000
---- a/lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch
-+++ /dev/null
-@@ -1,31 +0,0 @@
--From d1b336e530472f316b1d164d04626724c83b16d7 Mon Sep 17 00:00:00 2001
--From: "Miss Islington (bot)"
-- <31488909+miss-islington@users.noreply.github.com>
--Date: Fri, 21 Sep 2018 21:57:28 -0700
--Subject: [PATCH] [3.6] bpo-34623: Mention CVE-2018-14647 in news entry
-- (GH-9482) (GH-9489)
--
--https://bugs.python.org/issue34623
--(cherry picked from commit 026337a7101369297c8083047d2f3c6fc9dd1e2b)
--
--
--Co-authored-by: Christian Heimes <christian@python.org>
--
--
--https://bugs.python.org/issue34623
-----
-- .../next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst    | 4 ++--
-- 1 file changed, 2 insertions(+), 2 deletions(-)
--
--diff --git a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
--index 31ad92ef85..cbaa4b7506 100644
----- a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
--+++ b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
--@@ -1,2 +1,2 @@
---The C accelerated _elementtree module now initializes hash randomization
---salt from _Py_HashSecret instead of libexpat's default CSPRNG.
--+CVE-2018-14647: The C accelerated _elementtree module now initializes hash
--+randomization salt from _Py_HashSecret instead of libexpat's default CSPRNG.
---- 
--2.19.1
--
--- 
-2.20.1
-

patches/packages/to-upstream/0015-Revert-18.06-python3-fix-CVE-2018-20406.patch → patches/packages/to-upstream/0018-python3-bump-version-to-3.6.8.patch

-From c1fc2aebb1275f43002602e5d019b4d815c9ec25 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
-Date: Mon, 18 Feb 2019 11:44:27 +0100
-Subject: [PATCH] Revert "[18.06] python3: fix [CVE-2018-20406]"
+From 37cf853a4fedf6988fa73af1e62910085a0fa311 Mon Sep 17 00:00:00 2001
+From: Michal Hrusecky <Michal@Hrusecky.net>
+Date: Sat, 24 Nov 2018 00:45:00 +0100
+Subject: [PATCH] python3: bump version to 3.6.8
 
-This reverts commit d0f5ae180cff25057dfd513293e6e164bf8fb0aa.
-
-This fix is already part of python3 version we are using.
 ---
+ lang/python/python3-version.mk                |   4 +-
  lang/python/python3/Makefile                  |   2 +-
+ ...L_SetHashSalt-in-_elementtree-GH-914.patch |  88 --------
+ ...ntion-CVE-2018-14647-in-news-entry-G.patch |  31 ---
  ...-Avoid-relying-on-signed-overflow-in.patch | 206 ------------------
- 2 files changed, 1 insertion(+), 207 deletions(-)
+ 5 files changed, 3 insertions(+), 328 deletions(-)
+ delete mode 100644 lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch
+ delete mode 100644 lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch
  delete mode 100644 lang/python/python3/patches/018-closes-bpo-34656-Avoid-relying-on-signed-overflow-in.patch
 
+diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk
+index 5229717..84a51c6 100644
+--- a/lang/python/python3-version.mk
++++ b/lang/python/python3-version.mk
+@@ -8,7 +8,7 @@
+ # Note: keep in sync with setuptools & pip
+ PYTHON3_VERSION_MAJOR:=3
+ PYTHON3_VERSION_MINOR:=6
+-PYTHON3_VERSION_MICRO:=5
++PYTHON3_VERSION_MICRO:=8
+ 
+ PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
+ 
+@@ -16,4 +16,4 @@ PYTHON3_SETUPTOOLS_PKG_RELEASE:=2
+ PYTHON3_PIP_PKG_RELEASE:=2
+ 
+ PYTHON3_SETUPTOOLS_VERSION:=39.0.1
+-PYTHON3_PIP_VERSION:=9.0.3
++PYTHON3_PIP_VERSION:=10.0.1
 diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
-index fc96c319b..0c5c2fca4 100644
+index 8ba49cd..7825624 100644
 --- a/lang/python/python3/Makefile
 +++ b/lang/python/python3/Makefile
-@@ -14,7 +14,7 @@ PYTHON_VERSION:=$(PYTHON3_VERSION)
- PYTHON_VERSION_MICRO:=$(PYTHON3_VERSION_MICRO)
- 
- PKG_NAME:=python3
--PKG_RELEASE:=4
-+PKG_RELEASE:=3
- PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
+@@ -19,7 +19,7 @@ PKG_VERSION:=$(PYTHON_VERSION).$(PYTHON_VERSION_MICRO)
  
  PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
+ PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
+-PKG_HASH:=f434053ba1b5c8a5cc597e966ead3c5143012af827fd3f0697d21450bb8d87a6
++PKG_HASH:=81fd1401a9d66533b0a3e9e3f4ea1c7c6702d57d5b90d659f971e6f1b745f77d
+ 
+ PKG_LICENSE:=PSF
+ PKG_LICENSE_FILES:=LICENSE Modules/_ctypes/libffi_msvc/LICENSE Modules/_ctypes/darwin/LICENSE Modules/_ctypes/libffi/LICENSE Modules/_ctypes/libffi_osx/LICENSE Tools/pybench/LICENSE
+diff --git a/lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch b/lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch
+deleted file mode 100644
+index 09a4014..0000000
+--- a/lang/python/python3/patches/008-bpo-34623-Use-XML_SetHashSalt-in-_elementtree-GH-914.patch
++++ /dev/null
+@@ -1,88 +0,0 @@
+-From f7666e828cc3d5873136473ea36ba2013d624fa1 Mon Sep 17 00:00:00 2001
+-From: "Miss Islington (bot)"
+- <31488909+miss-islington@users.noreply.github.com>
+-Date: Tue, 18 Sep 2018 06:14:13 -0700
+-Subject: [PATCH] bpo-34623: Use XML_SetHashSalt in _elementtree (GH-9146)
+-
+-The C accelerated _elementtree module now initializes hash randomization
+-salt from _Py_HashSecret instead of libexpat's default CPRNG.
+-
+-Signed-off-by: Christian Heimes <christian@python.org>
+-
+-https://bugs.python.org/issue34623
+-(cherry picked from commit cb5778f00ce48631c7140f33ba242496aaf7102b)
+-
+-Co-authored-by: Christian Heimes <christian@python.org>
+----
+- Include/pyexpat.h                                            | 4 +++-
+- .../next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst   | 2 ++
+- Modules/_elementtree.c                                       | 5 +++++
+- Modules/pyexpat.c                                            | 5 +++++
+- 4 files changed, 15 insertions(+), 1 deletion(-)
+- create mode 100644 Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
+-
+-diff --git a/Include/pyexpat.h b/Include/pyexpat.h
+-index 44259bf6d7..07020b5dc9 100644
+---- a/Include/pyexpat.h
+-+++ b/Include/pyexpat.h
+-@@ -3,7 +3,7 @@
+- 
+- /* note: you must import expat.h before importing this module! */
+- 
+--#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.0"
+-+#define PyExpat_CAPI_MAGIC  "pyexpat.expat_CAPI 1.1"
+- #define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI"
+- 
+- struct PyExpat_CAPI
+-@@ -48,6 +48,8 @@ struct PyExpat_CAPI
+-     enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding);
+-     int (*DefaultUnknownEncodingHandler)(
+-         void *encodingHandlerData, const XML_Char *name, XML_Encoding *info);
+-+    /* might be none for expat < 2.1.0 */
+-+    int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt);
+-     /* always add new stuff to the end! */
+- };
+- 
+-diff --git a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
+-new file mode 100644
+-index 0000000000..31ad92ef85
+---- /dev/null
+-+++ b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
+-@@ -0,0 +1,2 @@
+-+The C accelerated _elementtree module now initializes hash randomization
+-+salt from _Py_HashSecret instead of libexpat's default CSPRNG.
+-diff --git a/Modules/_elementtree.c b/Modules/_elementtree.c
+-index 707ab2912b..53f05f937f 100644
+---- a/Modules/_elementtree.c
+-+++ b/Modules/_elementtree.c
+-@@ -3261,6 +3261,11 @@ _elementtree_XMLParser___init___impl(XMLParserObject *self, PyObject *html,
+-         PyErr_NoMemory();
+-         return -1;
+-     }
+-+    /* expat < 2.1.0 has no XML_SetHashSalt() */
+-+    if (EXPAT(SetHashSalt) != NULL) {
+-+        EXPAT(SetHashSalt)(self->parser,
+-+                           (unsigned long)_Py_HashSecret.expat.hashsalt);
+-+    }
+- 
+-     if (target) {
+-         Py_INCREF(target);
+-diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c
+-index 47c3e86c20..aa21d93c11 100644
+---- a/Modules/pyexpat.c
+-+++ b/Modules/pyexpat.c
+-@@ -1887,6 +1887,11 @@ MODULE_INITFUNC(void)
+-     capi.SetStartDoctypeDeclHandler = XML_SetStartDoctypeDeclHandler;
+-     capi.SetEncoding = XML_SetEncoding;
+-     capi.DefaultUnknownEncodingHandler = PyUnknownEncodingHandler;
+-+#if XML_COMBINED_VERSION >= 20100
+-+    capi.SetHashSalt = XML_SetHashSalt;
+-+#else
+-+    capi.SetHashSalt = NULL;
+-+#endif
+- 
+-     /* export using capsule */
+-     capi_object = PyCapsule_New(&capi, PyExpat_CAPSULE_NAME, NULL);
+--- 
+-2.19.1
+-
+diff --git a/lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch b/lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch
+deleted file mode 100644
+index c83236a..0000000
+--- a/lang/python/python3/patches/009-3.6-bpo-34623-Mention-CVE-2018-14647-in-news-entry-G.patch
++++ /dev/null
+@@ -1,31 +0,0 @@
+-From d1b336e530472f316b1d164d04626724c83b16d7 Mon Sep 17 00:00:00 2001
+-From: "Miss Islington (bot)"
+- <31488909+miss-islington@users.noreply.github.com>
+-Date: Fri, 21 Sep 2018 21:57:28 -0700
+-Subject: [PATCH] [3.6] bpo-34623: Mention CVE-2018-14647 in news entry
+- (GH-9482) (GH-9489)
+-
+-https://bugs.python.org/issue34623
+-(cherry picked from commit 026337a7101369297c8083047d2f3c6fc9dd1e2b)
+-
+-
+-Co-authored-by: Christian Heimes <christian@python.org>
+-
+-
+-https://bugs.python.org/issue34623
+----
+- .../next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst    | 4 ++--
+- 1 file changed, 2 insertions(+), 2 deletions(-)
+-
+-diff --git a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
+-index 31ad92ef85..cbaa4b7506 100644
+---- a/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
+-+++ b/Misc/NEWS.d/next/Security/2018-09-10-16-05-39.bpo-34623.Ua9jMv.rst
+-@@ -1,2 +1,2 @@
+--The C accelerated _elementtree module now initializes hash randomization
+--salt from _Py_HashSecret instead of libexpat's default CSPRNG.
+-+CVE-2018-14647: The C accelerated _elementtree module now initializes hash
+-+randomization salt from _Py_HashSecret instead of libexpat's default CSPRNG.
+--- 
+-2.19.1
+-
 diff --git a/lang/python/python3/patches/018-closes-bpo-34656-Avoid-relying-on-signed-overflow-in.patch b/lang/python/python3/patches/018-closes-bpo-34656-Avoid-relying-on-signed-overflow-in.patch
 deleted file mode 100644
-index 46e0312b8..000000000
+index 46e0312..0000000
 --- a/lang/python/python3/patches/018-closes-bpo-34656-Avoid-relying-on-signed-overflow-in.patch
 +++ /dev/null
 @@ -1,206 +0,0 @@
@@ -238,5 +390,5 @@ index 46e0312b8..000000000
 -2.17.1
 -
 -- 
-2.20.1
+2.21.0