diff options
author | Michał Wojdyła | 2022-09-24 17:46:31 +0200 |
---|---|---|
committer | Michał Wojdyła | 2022-09-24 17:46:31 +0200 |
commit | 288f1c480a099b52ab29bb6920f5fe7f9b288d07 (patch) | |
tree | f40a00ae73e23f7b9b0ccf03503724aa78853a1a | |
parent | d95cc492a7ae6598ee45c92ef7f80798422ca47e (diff) | |
download | aur-288f1c480a099b52ab29bb6920f5fe7f9b288d07.tar.gz |
update gentoo patches
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | py2-ize-the-CJK-codec-test.patch | 46 |
3 files changed, 13 insertions, 61 deletions
@@ -1,7 +1,7 @@ pkgbase = python2 pkgdesc = A high-level scripting language pkgver = 2.7.18 - pkgrel = 5 + pkgrel = 6 url = https://www.python.org/ arch = x86_64 license = PSF @@ -23,17 +23,15 @@ pkgbase = python2 optdepends = python2-setuptools optdepends = python2-pip conflicts = python<3 - noextract = python-gentoo-patches-2.7.18_p7.tar.xz + noextract = python-gentoo-patches-2.7.18_p15.tar.xz source = https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz source = https://www.python.org/ftp/python/2.7.18/Python-2.7.18.tar.xz.asc source = mtime-workaround.patch - source = https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p7.tar.xz - source = py2-ize-the-CJK-codec-test.patch + source = https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-2.7.18_p15.tar.xz validpgpkeys = C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF sha512sums = a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c sha512sums = SKIP sha512sums = 4e761cfd57791e8b72ecdf84c2e03875bf074311130eea5b8e97409fa304fa3468dbd359a511c4e9978e686e662c58054b4174d3e73f845fa9ded2e83a3a8076 - sha512sums = a3cd34f38a717183d9a8d6b91817a6ac989fb8ae4275f35cba4be810813a4c9c45f4e72d16aee33904eddaee77c4719b516392d629d2c4627c840e4ecc6bc121 - sha512sums = 67fb8116825f646cbe0f12d9ffb68c2e2006e98721c80c674738315160c0dfdb5f200b8d3229f85dbac2510ba436b0f701e44542ce4494cdd191cd1b8ca0bf0f + sha512sums = d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f pkgname = python2 @@ -1,11 +1,12 @@ -# Maintainer: Felix Yan <felixonmars@archlinux.org> +# Maintainer: Michał Wojdyła < micwoj9292 at gmail dot com > +# Contributor: Felix Yan <felixonmars@archlinux.org> # Contributor: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> # Contributor: Jason Chu <jason@archlinux.org> pkgname=python2 pkgver=2.7.18 -pkgrel=5 +pkgrel=6 _pybasever=2.7 pkgdesc="A high-level scripting language" arch=('x86_64') @@ -18,16 +19,14 @@ optdepends=('tk: for IDLE' 'python2-setuptools' 'python2-pip') conflicts=('python<3') -_gentoo_patches="python-gentoo-patches-${pkgver}_p7" +_gentoo_patches="python-gentoo-patches-${pkgver}_p15" source=("https://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz"{,.asc} mtime-workaround.patch - "https://dev.gentoo.org/~mgorny/dist/python/$_gentoo_patches.tar.xz" - py2-ize-the-CJK-codec-test.patch) + "https://dev.gentoo.org/~mgorny/dist/python/$_gentoo_patches.tar.xz") sha512sums=('a7bb62b51f48ff0b6df0b18f5b0312a523e3110f49c3237936bfe56ed0e26838c0274ff5401bda6fc21bf24337477ccac49e8026c5d651e4b4cafb5eb5086f6c' 'SKIP' '4e761cfd57791e8b72ecdf84c2e03875bf074311130eea5b8e97409fa304fa3468dbd359a511c4e9978e686e662c58054b4174d3e73f845fa9ded2e83a3a8076' - 'a3cd34f38a717183d9a8d6b91817a6ac989fb8ae4275f35cba4be810813a4c9c45f4e72d16aee33904eddaee77c4719b516392d629d2c4627c840e4ecc6bc121' - '67fb8116825f646cbe0f12d9ffb68c2e2006e98721c80c674738315160c0dfdb5f200b8d3229f85dbac2510ba436b0f701e44542ce4494cdd191cd1b8ca0bf0f') + 'd9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f') validpgpkeys=('C01E1CAD5EA2C4F0B8E3571504C367C218ADD4FF') # Benjamin Peterson noextract=("$_gentoo_patches.tar.xz") @@ -47,8 +46,9 @@ prepare() { patch -p1 -i ../0005-bpo-41944-No-longer-call-eval-on-content-received-vi.patch #CVE-2020-27619 patch -p1 -i ../0006-bpo-40791-Make-compare_digest-more-constant-time.-GH.patch patch -p1 -i ../0007-3.6-closes-bpo-42938-Replace-snprintf-with-Python-un.patch #CVE-2021-3177 - patch -p1 -i ../0024-3.6-bpo-42967-only-use-as-a-query-string-separator-G.patch #CVE-2021-23336 - patch -p1 -i ../py2-ize-the-CJK-codec-test.patch + patch -p1 -i ../0008-3.6-bpo-42967-only-use-as-a-query-string-separator-G.patch #CVE-2021-23336 + patch -p1 -i ../0009-py2-ize-the-CJK-codec-test.patch + patch -p1 -i ../0017-bpo-46811-Make-test-suite-support-Expat-2.4.5-GH-314.patch # Temporary workaround for FS#22322 # See http://bugs.python.org/issue10835 for upstream report diff --git a/py2-ize-the-CJK-codec-test.patch b/py2-ize-the-CJK-codec-test.patch deleted file mode 100644 index 72166c74b4b4..000000000000 --- a/py2-ize-the-CJK-codec-test.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ed1aa2f4738efe948242f252bcb0aa0b4314d2a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> -Date: Fri, 5 Mar 2021 10:34:50 +0100 -Subject: py2-ize the CJK codec test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Michał Górny <mgorny@gentoo.org> ---- - Lib/test/multibytecodec_support.py | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Lib/test/multibytecodec_support.py b/Lib/test/multibytecodec_support.py -index b7d7a3aba7..661ef9ee37 100644 ---- a/Lib/test/multibytecodec_support.py -+++ b/Lib/test/multibytecodec_support.py -@@ -2,6 +2,7 @@ - # Common Unittest Routines for CJK codecs - # - -+import binascii - import codecs - import os - import re -@@ -280,7 +281,7 @@ class TestBase_Mapping(unittest.TestCase): - - def _test_mapping_file_plain(self): - def unichrs(s): -- return ''.join(chr(int(x, 16)) for x in s.split('+')) -+ return ''.join(unichr(int(x, 16)) for x in s.split('+')) - - urt_wa = {} - -@@ -294,7 +295,7 @@ class TestBase_Mapping(unittest.TestCase): - - if data[0][:2] != '0x': - self.fail("Invalid line: {line!r}".format(line=line)) -- csetch = bytes.fromhex(data[0][2:]) -+ csetch = binascii.a2b_hex(data[0][2:]) - if len(csetch) == 1 and 0x80 <= csetch[0]: - continue - --- -cgit v1.2.3 - |