diff --git a/srcpkgs/python/patches/CVE-2019-5010.patch b/srcpkgs/python/patches/CVE-2019-5010.patch deleted file mode 100644 index aabdc01a45e..00000000000 --- a/srcpkgs/python/patches/CVE-2019-5010.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 06b15424b0dcacb1c551b2a36e739fffa8d0c595 -Author: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> -Date: Tue Jan 15 15:11:52 2019 -0800 - - bpo-35746: Fix segfault in ssl's cert parser (GH-11569) - - - Fix a NULL pointer deref in ssl module. The cert parser did not handle CRL - distribution points with empty DP or URI correctly. A malicious or buggy - certificate can result into segfault. - - Signed-off-by: Christian Heimes - - https://bugs.python.org/issue35746 - (cherry picked from commit a37f52436f9aa4b9292878b72f3ff1480e2606c3) - - Co-authored-by: Christian Heimes - -diff --git Modules/_ssl.c Modules/_ssl.c -index a96c419260..19bb1207b4 100644 ---- Modules/_ssl.c -+++ Modules/_ssl.c -@@ -1223,6 +1223,10 @@ _get_crl_dp(X509 *certificate) { - STACK_OF(GENERAL_NAME) *gns; - - dp = sk_DIST_POINT_value(dps, i); -+ if (dp->distpoint == NULL) { -+ /* Ignore empty DP value, CVE-2019-5010 */ -+ continue; -+ } - gns = dp->distpoint->name.fullname; - - for (j=0; j < sk_GENERAL_NAME_num(gns); j++) { diff --git a/srcpkgs/python/template b/srcpkgs/python/template index bdc0f2cf1fc..c2a8696950c 100644 --- a/srcpkgs/python/template +++ b/srcpkgs/python/template @@ -3,20 +3,20 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/python-tkinter". # pkgname=python -version=2.7.15 -revision=5 +version=2.7.16 +revision=1 wrksrc="Python-${version}" +pycompile_dirs="usr/lib/python2.7" hostmakedepends="pkg-config" makedepends="libffi-devel readline-devel gdbm-devel libressl-devel expat-devel sqlite-devel bzip2-devel zlib-devel" depends="ca-certificates" -pycompile_dirs="usr/lib/python2.7" short_desc="Interpreted, interactive, object-oriented programming language" maintainer="Juan RP " -homepage="https://www.python.org" license="Python-2.0" +homepage="https://www.python.org" distfiles="https://www.python.org/ftp/python/${version}/Python-${version}.tar.xz" -checksum=22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574 +checksum=f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7 alternatives=" python:idle:/usr/bin/idle2.7