upg python

This commit is contained in:
joborun linux 2023-08-29 19:21:19 +03:00
parent cc3ff584a5
commit 2cfe125941
5 changed files with 64 additions and 18 deletions

View File

@ -8,20 +8,24 @@
shopt -s extglob
pkgbase=python
pkgname=(python python-tests)
pkgver=3.11.3
pkgrel=02
pkgver=3.11.5
pkgrel=01
_pybasever=${pkgver%.*}
pkgdesc="Next generation of the python high-level scripting language - no ipv6 "
url="https://www.python.org/"
depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib')
depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib' 'tzdata')
makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
#options=('debug') ## uncomment this to have the debug pkg produced
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
$pkgbase-3.11.5-raw_fstring.patch::https://github.com/python/cpython/commit/ed749be3aab081ce4e5d54e0273b96bdea02983f.patch
EXTERNALLY-MANAGED)
# https://github.com/python/cpython/commit/178a238f25ab8aff7689d7a09d66dc1583ecd6cb.patch)
prepare() {
cd Python-${pkgver}
# test fails due to unhandled warning: https://github.com/python/cpython/issues/108569
patch -Np1 -i ../$pkgbase-3.11.5-raw_fstring.patch
# FS#23997
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py
@ -159,14 +163,16 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re
'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz@langa.pl>
'A035C8C19219BA821ECEA86B64E628F8D684696D') # Pablo Galindo Salgado <pablogsal@gmail.com>
sha256sums=(8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e # Python-3.11.3.tar.xz
1a5d26f131506b735645debbf605767e197f98b046191fbcf08246256d2d682c # Python-3.11.3.tar.xz.asc
c07b94bf7dcbe7be5ba0cee29971a005a5be65002cbfb59c5a8f661fa92aa82f) # EXTERNALLY-MANAGED
sha512sums=('a3bba4b69322a47bfeefe42ba0fd7331b5b67fd2ab41441e2219d16ef8c6f307f1a48977afd073c18cfd24ec6cb1bfe0c4bb4b273031eb524dc7e9fb5fbcc3b6'
'SKIP'
sha512sums=('93fa640bedcea449060caac8aa691aa315a19f172fd9f0422183d17749c3512d4ecac60e7599f9ef14e3cdb3c8b4b060e484c9061b1e7ee8d958200d6041e408'
'SKIP'
'310819a88a68ba3131a5e4a079fb383036c759d7c29340048bf6e28ded760a7bc98215bd3c24dd4a8ba05ee16ca80e6ba2a1073464af96d7a5bf921a4fe47b9d'
'62a6fbfbaeaa3ba7c54e109d9c3b7f67e73bb21986da4c1fcc5d28cca83d71e0fcae28e1fc70ee8ddce7dea8cd0b64e18d1031dae3a2eae5eaa379c53efd53a0')
## c1f4e46b6779843d4bd0682fa646b86b056170b95e194647c5795e68f800830a python-3.11.3-02-x86_64.pkg.tar.lz
## 9cd49ba9a97f4f055dc0ad2e0be2ca65a90d9c517a5f34710a4284af280904f5 python-tests-3.11.3-02-x86_64.pkg.tar.lz
sha256sums=(85cd12e9cf1d6d5a45f17f7afe1cebe7ee628d3282281c492e86adf636defa3f # Python-3.11.5.tar.xz
8933facdcc0c5d5467ae9280a86fef5cf861fe4599ea32bc234d978994edb9db # Python-3.11.5.tar.xz.asc
21063bf49e025b972e5b7f588bd8dacf5bbb1df6e93889ae0dd1d2bbff7edde0 # python-3.11.5-raw_fstring.patch
c07b94bf7dcbe7be5ba0cee29971a005a5be65002cbfb59c5a8f661fa92aa82f) # EXTERNALLY-MANAGED
## 1e7c83f5054397a8201a79f47d55370b5c992e38ae027ca0ee4266041c57a593 python-3.11.5-01-x86_64.pkg.tar.lz
## b2748905663259496ed47b0e0311baeb0533af2a248530a5fef40b264c6cadd5 python-tests-3.11.5-01-x86_64.pkg.tar.lz

View File

@ -9,19 +9,21 @@ shopt -s extglob
pkgbase=python
pkgname=(python python-tests)
pkgver=3.11.3
pkgrel=2
pkgver=3.11.5
pkgrel=1
_pybasever=${pkgver%.*}
pkgdesc="Next generation of the python high-level scripting language"
arch=('x86_64')
license=('custom')
url="https://www.python.org/"
depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib')
depends=('bzip2' 'expat' 'gdbm' 'libffi' 'libnsl' 'libxcrypt' 'openssl' 'zlib' 'tzdata')
makedepends=('tk' 'sqlite' 'bluez-libs' 'mpdecimal' 'llvm' 'gdb' 'xorg-server-xvfb' 'ttf-font')
source=("https://www.python.org/ftp/python/${pkgver%rc*}/Python-${pkgver}.tar.xz"{,.asc}
$pkgbase-3.11.5-raw_fstring.patch::https://github.com/python/cpython/commit/ed749be3aab081ce4e5d54e0273b96bdea02983f.patch
EXTERNALLY-MANAGED)
sha512sums=('a3bba4b69322a47bfeefe42ba0fd7331b5b67fd2ab41441e2219d16ef8c6f307f1a48977afd073c18cfd24ec6cb1bfe0c4bb4b273031eb524dc7e9fb5fbcc3b6'
sha512sums=('93fa640bedcea449060caac8aa691aa315a19f172fd9f0422183d17749c3512d4ecac60e7599f9ef14e3cdb3c8b4b060e484c9061b1e7ee8d958200d6041e408'
'SKIP'
'310819a88a68ba3131a5e4a079fb383036c759d7c29340048bf6e28ded760a7bc98215bd3c24dd4a8ba05ee16ca80e6ba2a1073464af96d7a5bf921a4fe47b9d'
'62a6fbfbaeaa3ba7c54e109d9c3b7f67e73bb21986da4c1fcc5d28cca83d71e0fcae28e1fc70ee8ddce7dea8cd0b64e18d1031dae3a2eae5eaa379c53efd53a0')
validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python release signing key) <nad@python.org>
'E3FF2839C048B25C084DEBE9B26995E310250568' # Łukasz Langa (GPG langa.pl) <lukasz@langa.pl>
@ -30,6 +32,9 @@ validpgpkeys=('0D96DF4D4110E5C43FBFB17F2D347EA6AA65421D' # Ned Deily (Python re
prepare() {
cd Python-${pkgver}
# test fails due to unhandled warning: https://github.com/python/cpython/issues/108569
patch -Np1 -i ../$pkgbase-3.11.5-raw_fstring.patch
# FS#23997
sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python|" Lib/cgi.py

View File

@ -6,5 +6,6 @@ llvm
gdb
xorg-server-xvfb
ttf-liberation
libglvnd

View File

@ -0,0 +1,34 @@
From ed749be3aab081ce4e5d54e0273b96bdea02983f Mon Sep 17 00:00:00 2001
From: "Miss Islington (bot)"
<31488909+miss-islington@users.noreply.github.com>
Date: Mon, 28 Aug 2023 10:44:13 -0700
Subject: [PATCH] [3.11] gh-105821: Use a raw f-string in test_httpservers.py
(GH-105822) (#108576)
gh-105821: Use a raw f-string in test_httpservers.py (GH-105822)
Use a raw f-string in test_httpservers.py
(cherry picked from commit 09ce8c3b48f940eb8865330f029b8069854c3106)
Co-authored-by: Pablo Galindo Salgado <Pablogsal@gmail.com>
---
Lib/test/test_httpservers.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index cdd1bea754a02..cfd8a101dcc1c 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -442,10 +442,10 @@ def test_undecodable_filename(self):
def test_undecodable_parameter(self):
# sanity check using a valid parameter
response = self.request(self.base_url + '/?x=123').read()
- self.assertRegex(response, f'listing for {self.base_url}/\?x=123'.encode('latin1'))
+ self.assertRegex(response, rf'listing for {self.base_url}/\?x=123'.encode('latin1'))
# now the bogus encoding
response = self.request(self.base_url + '/?x=%bb').read()
- self.assertRegex(response, f'listing for {self.base_url}/\?x=\xef\xbf\xbd'.encode('latin1'))
+ self.assertRegex(response, rf'listing for {self.base_url}/\?x=\xef\xbf\xbd'.encode('latin1'))
def test_get_dir_redirect_location_domain_injection_bug(self):
"""Ensure //evil.co/..%2f../../X does not put //evil.co/ in Location.

View File

@ -1,6 +1,6 @@
real 19m48.923s
user 19m53.361s
sys 0m42.475s
real 26m39.075s
user 26m25.246s
sys 1m4.514s