From 2ed860677ddbfd8d4e3b5fd5e3e0213f33905992 Mon Sep 17 00:00:00 2001
From: Max Rees <maxcrees@me.com>
Date: Sun, 6 Oct 2019 22:11:14 -0500
Subject: system/python3: patch CVE-2019-16935, run test_threading separately

---
 system/python3/APKBUILD | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'system/python3/APKBUILD')

diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index 4fefa4e22..f5d28b236 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=python3
 pkgver=3.6.9
 _basever="${pkgver%.*}"
-pkgrel=1
+pkgrel=2
 pkgdesc="A high-level scripting language"
 url="https://www.python.org"
 arch="all"
@@ -41,6 +41,7 @@ source="https://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.xz
 	musl-find_library.patch
 	fix-xattrs-glibc.patch
 	CVE-2019-16056.patch
+	CVE-2019-16935.patch
 	"
 builddir="$srcdir/Python-$pkgver"
 
@@ -60,6 +61,8 @@ builddir="$srcdir/Python-$pkgver"
 #     - CVE-2019-9948
 #   3.6.9-r1:
 #     - CVE-2019-16056
+#   3.6.9-r2:
+#     - CVE-2019-16935
 
 prepare() {
 	default_prepare
@@ -139,13 +142,14 @@ EOF
 	# dumb
 	fail="$fail test_ssl"					# tries to do SSLv2 which we have disabled in OpenSSL
 
-	# needs network but doesn't declare it
-	fail="$fail test_normalization"
+	# hangs when run with other tests - run separately
+	fail="$fail test_threading"
 
-	# defaults from Tools/scripts/run_tests.py, with -network added
-	use="all,-largefile,-audio,-gui,-network"
+	# defaults from Tools/scripts/run_tests.py + -network,-urlfetch
+	use="all,-largefile,-audio,-gui,-network,-urlfetch"
 
 	make quicktest TESTOPTS="--use '$use' --exclude $fail"
+	make test TESTOPTS="test_threading"
 }
 
 package() {
@@ -188,4 +192,5 @@ wininst() {
 sha512sums="05de9c6f44d96a52bfce10ede4312de892573edaf8bece65926d19973a3a800d65eed7a857af945f69efcfb25efa3788e7a54016b03d80b611eb51c3ea074819  Python-3.6.9.tar.xz
 ab8eaa2858d5109049b1f9f553198d40e0ef8d78211ad6455f7b491af525bffb16738fed60fc84e960c4889568d25753b9e4a1494834fea48291b33f07000ec2  musl-find_library.patch
 37b6ee5d0d5de43799316aa111423ba5a666c17dc7f81b04c330f59c1d1565540eac4c585abe2199bbed52ebe7426001edb1c53bd0a17486a2a8e052d0f494ad  fix-xattrs-glibc.patch
-1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0  CVE-2019-16056.patch"
+1f1eb61355eb7832bef8e9c3915895cc3b2966a30c809371430b4416260452cd39c48ba593b2259574867bd1e8fea98efbc45c4b0bd95aeb0690c8514b380ea0  CVE-2019-16056.patch
+7f94d887c81f79d90afd4a9621547c13cbdd0232250f62a686b26a63160a4d286a6db9b342d06b9b63af64f994835b489c37bab499a2093c3c2585dc7a04d8a1  CVE-2019-16935.patch"
-- 
cgit v1.2.3-70-g09d2