CVS commit: [pkgsrc-2021Q3] pkgsrc/lang/python27

["Thomas Merkel" <tm%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tm
Date:           Tue Nov  2 18:42:01 UTC 2021

Modified Files:
        pkgsrc/lang/python27 [pkgsrc-2021Q3]: Makefile distinfo
        pkgsrc/lang/python27/patches [pkgsrc-2021Q3]: patch-Lib_urlparse.py

Log Message:
Pullup ticket #6523 - requested by david
lang/python27: bugfix

Revisions pulled up:
- lang/python27/Makefile                                        1.95
- lang/python27/distinfo                                        1.87
- lang/python27/patches/patch-Lib_urlparse.py                   1.2

---
   Module Name:    pkgsrc
   Committed By:   gutteridge
   Date:           Wed Oct 27 23:58:55 UTC 2021

   Modified Files:
           pkgsrc/lang/python27: Makefile distinfo
           pkgsrc/lang/python27/patches: patch-Lib_urlparse.py

   Log Message:
   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.


To generate a diff of this commit:
cvs rdiff -u -r1.93.8.1 -r1.93.8.2 pkgsrc/lang/python27/Makefile
cvs rdiff -u -r1.82.2.1 -r1.82.2.2 pkgsrc/lang/python27/distinfo
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 \
    pkgsrc/lang/python27/patches/patch-Lib_urlparse.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python27/Makefile
diff -u pkgsrc/lang/python27/Makefile:1.93.8.1 pkgsrc/lang/python27/Makefile:1.93.8.2
--- pkgsrc/lang/python27/Makefile:1.93.8.1      Wed Oct 13 21:04:00 2021
+++ pkgsrc/lang/python27/Makefile       Tue Nov  2 18:42:01 2021
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.93.8.1 2021/10/13 21:04:00 tm Exp $
+# $NetBSD: Makefile,v 1.93.8.2 2021/11/02 18:42:01 tm Exp $
 
 .include "dist.mk"
 
 PKGNAME=       python27-${PY_DISTVERSION}
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    lang python
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -188,6 +188,12 @@ SUBST_FILES.pkgversion=    Lib/lib2to3/pgen
 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

Index: pkgsrc/lang/python27/distinfo
diff -u pkgsrc/lang/python27/distinfo:1.82.2.1 pkgsrc/lang/python27/distinfo:1.82.2.2
--- pkgsrc/lang/python27/distinfo:1.82.2.1      Wed Oct 13 21:04:00 2021
+++ pkgsrc/lang/python27/distinfo       Tue Nov  2 18:42:01 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82.2.1 2021/10/13 21:04:00 tm Exp $
+$NetBSD: distinfo,v 1.82.2.2 2021/11/02 18:42:01 tm Exp $
 
 SHA1 (Python-2.7.18.tar.xz) = 678d4cf483a1c92efd347ee8e1e79326dc82810b
 RMD160 (Python-2.7.18.tar.xz) = 40a514bb05c9e631454ea8466e28f5bb229428ad
@@ -35,7 +35,7 @@ SHA1 (patch-Lib_test_test__unicode.py) =
 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

Index: pkgsrc/lang/python27/patches/patch-Lib_urlparse.py
diff -u pkgsrc/lang/python27/patches/patch-Lib_urlparse.py:1.1.2.2 pkgsrc/lang/python27/patches/patch-Lib_urlparse.py:1.1.2.3
--- pkgsrc/lang/python27/patches/patch-Lib_urlparse.py:1.1.2.2  Wed Oct 13 21:04:01 2021
+++ pkgsrc/lang/python27/patches/patch-Lib_urlparse.py  Tue Nov  2 18:42:01 2021
@@ -1,4 +1,4 @@
-$NetBSD: patch-Lib_urlparse.py,v 1.1.2.2 2021/10/13 21:04:01 tm Exp $
+$NetBSD: patch-Lib_urlparse.py,v 1.1.2.3 2021/11/02 18:42:01 tm 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/pytho
 +
 +# 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,