Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (Client CN "mail.NetBSD.org", Issuer "mail.NetBSD.org CA" (not verified)) by mollari.NetBSD.org (Postfix) with ESMTPS id 202A71A9239 for ; Wed, 27 Oct 2021 23:58:57 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id C9B6184F60; Wed, 27 Oct 2021 23:58:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0FBF484D79 for ; Wed, 27 Oct 2021 23:58:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id jX8MRqfizpMq for ; Wed, 27 Oct 2021 23:58:55 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 668C884CD9 for ; Wed, 27 Oct 2021 23:58:55 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 5F86EFA97; Wed, 27 Oct 2021 23:58:55 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_163537913526920" MIME-Version: 1.0 Date: Wed, 27 Oct 2021 23:58:55 +0000 From: "David H. Gutteridge" Subject: CVS commit: pkgsrc/lang/python27 To: pkgsrc-changes@NetBSD.org Reply-To: gutteridge@netbsd.org X-Mailer: log_accum Message-Id: <20211027235855.5F86EFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_163537913526920 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.94 -r1.95 pkgsrc/lang/python27/Makefile cvs rdiff -u -r1.86 -r1.87 pkgsrc/lang/python27/distinfo cvs rdiff -u -r1.1 -r1.2 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. --_----------=_163537913526920 Content-Disposition: inline Content-Length: 3300 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python27/Makefile diff -u pkgsrc/lang/python27/Makefile:1.94 pkgsrc/lang/python27/Makefile:1.95 --- pkgsrc/lang/python27/Makefile:1.94 Sun Oct 10 03:00:59 2021 +++ pkgsrc/lang/python27/Makefile Wed Oct 27 23:58:55 2021 @@ -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/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.86 pkgsrc/lang/python27/distinfo:1.87 --- pkgsrc/lang/python27/distinfo:1.86 Tue Oct 26 10:51:51 2021 +++ pkgsrc/lang/python27/distinfo Wed Oct 27 23:58:55 2021 @@ -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) = 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 pkgsrc/lang/python27/patches/patch-Lib_urlparse.py:1.2 --- pkgsrc/lang/python27/patches/patch-Lib_urlparse.py:1.1 Sun Oct 10 03:00:59 2021 +++ pkgsrc/lang/python27/patches/patch-Lib_urlparse.py Wed Oct 27 23:58:55 2021 @@ -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/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, --_----------=_163537913526920--