diff --git a/PKGBUILD b/PKGBUILD index b03949a..2311a1c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,33 +5,43 @@ # Maintainer: Future Linux Team pkgname=python-requests -pkgver=2.31.0 +pkgver=2.32.3 pkgrel=1 pkgdesc="Python HTTP for Humans" arch=('x86_64') url="https://requests.readthedocs.io/" -license=('Apache') -depends=('python-charset-normalizer' 'python-idna' 'python-urllib3' 'ca-certificates') -makedepends=('python-build' 'python-installer' 'python-setuptools' 'python-wheel') -source=(https://files.pythonhosted.org/packages/source/r/${pkgname#*-}/${pkgname#*-}-${pkgver}.tar.gz - ${pkgname#*-}-${pkgver}-use_system_certs-1.patch) -sha256sums=(942c5a758f98d790eaed1a29cb6eefc7ffb0d1cf7af05c3d2791656dbd6ad1e1 - ec8a2cc4f3f7a0df4ed5f576367017010276c59d57260ac7b0060238b2324904) +license=('Apache-2.0') +depends=( + 'ca-certificates' + 'python-charset-normalizer' + 'python-idna' + 'python-urllib3' +) +makedepends=( + 'git' + 'python-build' + 'python-installer' + 'python-setuptools' + 'python-wheel') +source=(https://github.com/psf/requests/archive/v${pkgver}/${pkgname#*-}-${pkgver}.tar.gz + ${pkgname#*-}-${pkgver}-use_system_certs-1.patch) +sha256sums=(f665576fc02d02e7b7f21630b915d70c14288f48decf76fad89b16a9f3975c42 + ec1c7a1aa466a6f8c0f51803879ee51451a015bd467ed85cbd506370b87f8936) prepare() { cd ${pkgname#*-}-${pkgver} - - patch -Np1 -i ${srcdir}/${pkgname#*-}-${pkgver}-use_system_certs-1.patch - -} -build() { - cd ${pkgname#*-}-${pkgver} - python3 -m build --wheel --no-isolation + patch -Np1 -i ${srcdir}/${pkgname#*-}-${pkgver}-use_system_certs-1.patch +} + +build() { + cd ${pkgname#*-}-${pkgver} + + python3 -m build --wheel --no-isolation } package() { - cd ${pkgname#*-}-${pkgver} + cd ${pkgname#*-}-${pkgver} - python3 -m installer --destdir=${pkgdir} dist/*.whl + python3 -m installer --destdir=${pkgdir} dist/*.whl } diff --git a/requests-2.31.0-use_system_certs-1.patch b/requests-2.31.0-use_system_certs-1.patch deleted file mode 100644 index d3a4fc6..0000000 --- a/requests-2.31.0-use_system_certs-1.patch +++ /dev/null @@ -1,63 +0,0 @@ -Submitted By: Ken Moffat -Date: 2022-12-01 -Initial Package Version: 2.28.1 -Changelog: rediff'ed for 2.28.2 (Pierre Labastie) -Changelog: rediff'ed for 2.30.0 (Bruce Dubbs) -Upstream Status: N/A -Origin: Self, fedora and Arch -Description: Prefer system certificates. - -1. Based on what pip does to its vendored requests, use the - same environment variable to point to the certificates - instead of the certs from vendored certifi. - -2. If that variable is not present, use the system certs. - -Note that the variable can be set to point to -/usr/lib/python3.11/site-packages/pip/_vendor/certifi/cacert.pem -if there is a need to use the shipped certificates. - -3. Remove the requirement to install system Certifi. - -diff -Naur a/requests/certs.py b/requests/certs.py ---- a/requests/certs.py 2023-01-12 17:16:59.000000000 +0100 -+++ b/requests/certs.py 2023-01-22 09:35:23.075750198 +0100 -@@ -11,7 +11,15 @@ - environment, you can change the definition of where() to return a separately - packaged CA bundle. - """ --from certifi import where -+ -+import os -+ -+if "_PIP_STANDALONE_CERT" not in os.environ: -+ def where(): -+ return "/etc/pki/tls/certs/ca-bundle.crt" -+else: -+ def where(): -+ return os.environ["_PIP_STANDALONE_CERT"] - - if __name__ == "__main__": - print(where()) -diff -Naur a/setup.cfg b/setup.cfg ---- a/setup.cfg 2023-01-12 17:24:35.000000000 +0100 -+++ b/setup.cfg 2023-01-22 09:38:13.164481842 +0100 -@@ -4,7 +4,6 @@ - socks - use_chardet_on_py3 - requires-dist = -- certifi>=2017.4.17 - charset_normalizer>=2,<4 - idna>=2.5,<4 - urllib3>=1.21.1,<1.27 -diff -Naur a/setup.py b/setup.py ---- a/setup.py 2023-01-12 17:16:59.000000000 +0100 -+++ b/setup.py 2023-01-22 09:35:23.075750198 +0100 -@@ -62,7 +62,6 @@ - "charset_normalizer>=2,<4", - "idna>=2.5,<4", - "urllib3>=1.21.1,<3", -- "certifi>=2017.4.17", - ] - test_requirements = [ - "pytest-httpbin==0.0.7", diff --git a/requests-2.32.3-use_system_certs-1.patch b/requests-2.32.3-use_system_certs-1.patch new file mode 100644 index 0000000..49725fb --- /dev/null +++ b/requests-2.32.3-use_system_certs-1.patch @@ -0,0 +1,42 @@ +diff -Nuar requests-2.32.3.orig/setup.cfg requests-2.32.3/setup.cfg +--- requests-2.32.3.orig/setup.cfg 2024-05-29 23:36:10.000000000 +0800 ++++ requests-2.32.3/setup.cfg 2024-11-04 14:18:55.628151448 +0800 +@@ -4,7 +4,6 @@ + socks + use_chardet_on_py3 + requires-dist = +- certifi>=2017.4.17 + charset_normalizer>=2,<4 + idna>=2.5,<4 + urllib3>=1.21.1,<3 +diff -Nuar requests-2.32.3.orig/setup.py requests-2.32.3/setup.py +--- requests-2.32.3.orig/setup.py 2024-05-29 23:36:10.000000000 +0800 ++++ requests-2.32.3/setup.py 2024-11-04 14:19:19.835151355 +0800 +@@ -62,7 +62,6 @@ + "charset_normalizer>=2,<4", + "idna>=2.5,<4", + "urllib3>=1.21.1,<3", +- "certifi>=2017.4.17", + ] + test_requirements = [ + "pytest-httpbin==2.0.0", +diff -Nuar requests-2.32.3.orig/src/requests/certs.py requests-2.32.3/src/requests/certs.py +--- requests-2.32.3.orig/src/requests/certs.py 2024-05-29 23:36:10.000000000 +0800 ++++ requests-2.32.3/src/requests/certs.py 2024-11-04 14:18:20.840151580 +0800 +@@ -11,7 +11,15 @@ + environment, you can change the definition of where() to return a separately + packaged CA bundle. + """ +-from certifi import where ++ ++import os ++ ++if "_PIP_STANDALONE_CERT" not in os.environ: ++ def where(): ++ return "/etc/pki/tls/certs/ca-bundle.crt" ++else: ++ def where(): ++ return os.environ["_PIP_STANDALONE_CERT"] + + if __name__ == "__main__": + print(where())