diff options
| author | gutteridge <gutteridge@pkgsrc.org> | 2021-10-27 23:58:55 +0000 |
|---|---|---|
| committer | gutteridge <gutteridge@pkgsrc.org> | 2021-10-27 23:58:55 +0000 |
| commit | 3c0986d1ca4fb47e3b916276a2d858e2a14a8b3f (patch) | |
| tree | 99237e03edcd6167ece1f0766f2ac11defec60e2 /lang | |
| parent | c741bee4664c88d0f66b6013b691d6e0b948b71e (diff) | |
| download | pkgsrc-3c0986d1ca4fb47e3b916276a2d858e2a14a8b3f.tar.gz | |
python27: fix definition of variable added in security patch
Correct a merge botch introduced in a previous commit. It was intended
that a variable be redefined, but it was committed in an incomplete
testing state.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python27/Makefile | 10 | ||||
| -rw-r--r-- | lang/python27/distinfo | 4 | ||||
| -rw-r--r-- | lang/python27/patches/patch-Lib_urlparse.py | 4 |
3 files changed, 12 insertions, 6 deletions
diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 097230428ed..7692843764d 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.94 2021/10/10 03:00:59 gutteridge Exp $ +# $NetBSD: Makefile,v 1.95 2021/10/27 23:58:55 gutteridge Exp $ .include "dist.mk" PKGNAME= python27-${PY_DISTVERSION} -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= lang python MAINTAINER= pkgsrc-users@NetBSD.org @@ -188,6 +188,12 @@ SUBST_FILES.pkgversion= Lib/lib2to3/pgen2/driver.py SUBST_FILES.pkgversion+=Lib/distutils/command/install_egg_info.py SUBST_VARS.pkgversion= PKGVERSION_NOREV +SUBST_CLASSES+= urllib +SUBST_MESSAGE.urllib= Fixing path to urllib.cfg. +SUBST_STAGE.urllib= pre-configure +SUBST_FILES.urllib= Lib/urlparse.py +SUBST_VARS.urllib= PKG_SYSCONFDIR + .include "options.mk" SUBST_CLASSES+= sslbase diff --git a/lang/python27/distinfo b/lang/python27/distinfo index 39eaf788517..b7b1c06e5e5 100644 --- a/lang/python27/distinfo +++ b/lang/python27/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.86 2021/10/26 10:51:51 nia Exp $ +$NetBSD: distinfo,v 1.87 2021/10/27 23:58:55 gutteridge Exp $ BLAKE2s (Python-2.7.18.tar.xz) = 1b673ec8c9362a178e044691392bc4f67ad13457d7fddd84a88de346f23f9812 SHA512 (Python-2.7.18.tar.xz) = a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c @@ -34,7 +34,7 @@ SHA1 (patch-Lib_test_test__unicode.py) = 1bd182bdbd880d0a847f9d8b69277a607f9f052 SHA1 (patch-Lib_test_test__urllib2.py) = 89baa57daf2f3282e4fc5009915dbc4910b96ef1 SHA1 (patch-Lib_test_test__urlparse.py) = 257cb3bf7a0e9b5e0dcb204f675959b10953ba7b SHA1 (patch-Lib_urllib2.py) = 0cc0dc811bb9544496962e08b040b5c96fb9073c -SHA1 (patch-Lib_urlparse.py) = ec45dd48966eb806a5c0e79af6a7369fb45b9859 +SHA1 (patch-Lib_urlparse.py) = 69db5325a19474113e72c1feeb895a25534412c4 SHA1 (patch-Mac_Tools_pythonw.c) = 2b9a60d4b349c240471fd305be69c28e0f654cdc SHA1 (patch-Makefile.pre.in) = ceaf34237588b527478ce1f9163c9168382fa201 SHA1 (patch-Modules___ctypes_callbacks.c) = 8c335edfc9d2ef47988c5bdf1c3dd8473757637b diff --git a/lang/python27/patches/patch-Lib_urlparse.py b/lang/python27/patches/patch-Lib_urlparse.py index 03bcd74422c..4c25e4d53eb 100644 --- a/lang/python27/patches/patch-Lib_urlparse.py +++ b/lang/python27/patches/patch-Lib_urlparse.py @@ -1,4 +1,4 @@ -$NetBSD: patch-Lib_urlparse.py,v 1.1 2021/10/10 03:00:59 gutteridge Exp $ +$NetBSD: patch-Lib_urlparse.py,v 1.2 2021/10/27 23:58:55 gutteridge Exp $ Fix CVE-2021-23336: Add `separator` argument to parse_qs; warn with default Via Fedora: @@ -42,7 +42,7 @@ https://src.fedoraproject.org/rpms/python2.7/blob/rawhide/f/00359-CVE-2021-23336 + +# The default "separator" for parse_qsl can be specified in a config file. +# It's cached after first read. -+#_QS_SEPARATOR_CONFIG_FILENAME = '/etc/python/urllib.cfg' ++_QS_SEPARATOR_CONFIG_FILENAME = '@PKG_SYSCONFDIR@/python/urllib.cfg' +_default_qs_separator = None + +def parse_qsl(qs, keep_blank_values=0, strict_parsing=0, max_num_fields=None, |