From 178ffb41f1ba561089034e7c1dec188adf1472f7 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Fri, 2 Nov 2018 09:44:00 +0200 Subject: [PATCH] python3: bump to version 3.7.1 This change bumps Python3 version to 3.7.1. Patch `002-fix-implicit-dh-free-declaration.patch` is now included in upstream. This also fixes CVE-2018-1061. https://www.cvedetails.com/cve/CVE-2018-1061/ Compile & run-tested on x86. Signed-off-by: Alexandru Ardelean --- lang/python/python3-version.mk | 2 +- lang/python/python3/Makefile | 2 +- .../002-fix-implicit-dh-free-declaration.patch | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 lang/python/python3/patches/002-fix-implicit-dh-free-declaration.patch diff --git a/lang/python/python3-version.mk b/lang/python/python3-version.mk index 8f4cf1ebb..60dcbccbc 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:=7 -PYTHON3_VERSION_MICRO:=0 +PYTHON3_VERSION_MICRO:=1 PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR) diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index adb5d2019..ba0d9e32b 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:=0382996d1ee6aafe59763426cf0139ffebe36984474d0ec4126dd1c40a8b3549 +PKG_HASH:=fa7e2b8e8c9402f192ad56dc4f814089d1c4466c97d780f5e5acc02c04243d6d 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/002-fix-implicit-dh-free-declaration.patch b/lang/python/python3/patches/002-fix-implicit-dh-free-declaration.patch deleted file mode 100644 index 46cfa9b1c..000000000 --- a/lang/python/python3/patches/002-fix-implicit-dh-free-declaration.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Modules/_ssl.c b/Modules/_ssl.c -index 2bce4816d2..3c93884809 100644 ---- a/Modules/_ssl.c -+++ b/Modules/_ssl.c -@@ -63,6 +63,7 @@ static PySocketModule_APIObject PySocketModule; - #include "openssl/err.h" - #include "openssl/rand.h" - #include "openssl/bio.h" -+#include "openssl/dh.h" - - #ifndef HAVE_X509_VERIFY_PARAM_SET1_HOST - # ifdef LIBRESSL_VERSION_NUMBER