diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-python/certifi | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-python/certifi')
-rw-r--r-- | dev-python/certifi/Manifest | 7 | ||||
-rw-r--r-- | dev-python/certifi/certifi-10001.ebuild (renamed from dev-python/certifi/certifi-9999.ebuild) | 5 | ||||
-rw-r--r-- | dev-python/certifi/certifi-2020.4.5.1.ebuild | 43 | ||||
-rw-r--r-- | dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch | 30 |
4 files changed, 6 insertions, 79 deletions
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest index 5c63ae7be6e2..28ecbb506b29 100644 --- a/dev-python/certifi/Manifest +++ b/dev-python/certifi/Manifest @@ -1,6 +1,3 @@ -AUX certifi-2020.4.5.1-use-system-cacerts.patch 797 BLAKE2B c870e8f65f63295cc68703a1ee15bd8ee30da6e1f038e988cc359227904e8a0f6f236752399677f145ec7d4bb5767b4e97456bc65bb9b5cddd25926ff5df37d6 SHA512 c2dfb2fa730556c791efb4aa320e0164608d24adacf91f90d9398e31744d98dfb1cdba82d00eea2d75fc09c9e2d7408852b1791378e20b8e4a8b3a6342da539d -DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738 -DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd -EBUILD certifi-2020.4.5.1.ebuild 1369 BLAKE2B 231ca1e683d6da675f3a02b93b60e43a01d6790789d0a07ac34f4c608af335a84cc0b26cbe03e7dbc9727be29924e42299036b636d07cb846be81a09ed26ea67 SHA512 3d6a2876e5ab7bc4d4307b842e28db3af6f89f3e56fba244c362b254bf16ee5eb2b45ee1a4a5e65cd8641f1e9f998d88e1c23ed5708b3852ae441babe727c16b -EBUILD certifi-9999.ebuild 896 BLAKE2B d0fff5f6befad9010e913f1e84bfd80c06c5d70e11b210ea48680f966176e1fb9bff785f5f09271be807fc2c149cc8ce4374a0f18c9c665d02e4ae648181a062 SHA512 4b3c27da78aab44abc3a63b4bd4953318e8e8c48ab4f36af46cbf92c93519deaec6a7c11e78b2d276552f09876214cd4356d7fc7a65aa7d1ea5e3d371d077c2d +DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c +EBUILD certifi-10001.ebuild 948 BLAKE2B 96903071c2d78f4fa556b36c8f2e367adc1e24face20abe6e4e872dfd94f17ebce210bb30defd61aab1b3f9937bf350c06a1f83214e83a4b6c989a436c9c9801 SHA512 84892fb0678dd12aecde7aef383d23996bea4aac62aca46bb71a4c10597e1f81391a3fce66ecbde94ce5706b549eba4b3c4e96929f521519b9dc5fdc211ddb20 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9 diff --git a/dev-python/certifi/certifi-9999.ebuild b/dev-python/certifi/certifi-10001.ebuild index d05d83f13c9a..11944fbf8606 100644 --- a/dev-python/certifi/certifi-9999.ebuild +++ b/dev-python/certifi/certifi-10001.ebuild @@ -3,6 +3,7 @@ EAPI=7 +DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 ) inherit distutils-r1 @@ -19,10 +20,12 @@ S=${WORKDIR}/${MY_P} LICENSE="CC0-1.0" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" RDEPEND="app-misc/ca-certificates" +distutils_enable_tests unittest + src_prepare() { sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die distutils-r1_src_prepare diff --git a/dev-python/certifi/certifi-2020.4.5.1.ebuild b/dev-python/certifi/certifi-2020.4.5.1.ebuild deleted file mode 100644 index 35515f2569a1..000000000000 --- a/dev-python/certifi/certifi-2020.4.5.1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 ) - -inherit distutils-r1 prefix readme.gentoo-r1 - -DESCRIPTION="Python package for providing Mozilla's CA Bundle" -HOMEPAGE="https://certifi.io/ https://pypi.org/project/certifi" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -RDEPEND="app-misc/ca-certificates" -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" - -# Do not drop this patch -- this will affect system's security -PATCHES=( "${FILESDIR}"/${PN}-2020.4.5.1-use-system-cacerts.patch ) - -python_prepare_all() { - distutils-r1_python_prepare_all - - # Precaution -- nothing should use bundled CA certificates - rm certifi/cacert.pem || die "Failed to delete bundled CA certificates" - - eprefixify certifi/core.py -} - -python_install_all() { - distutils-r1_python_install_all - - local DOC_CONTENTS=" - In Gentoo, we don't use certifi's bundled CA certificates. - Instead we remove bundled cacert.pem and patch certifi - to return system's CA certificates. - " - readme.gentoo_create_doc -} diff --git a/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch b/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch deleted file mode 100644 index 692439a10eac..000000000000 --- a/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f07497e36ccc883626ae5cdfa7f81fcb3fc0d549 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping <sebastian@pipping.org> -Date: Sun, 5 Apr 2020 23:43:30 +0200 -Subject: [PATCH] Use system's CA certificate store - ---- - certifi/core.py | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/certifi/core.py b/certifi/core.py -index 56b52a3..467880f 100644 ---- a/certifi/core.py -+++ b/certifi/core.py -@@ -21,10 +21,9 @@ except ImportError: - - - def where(): -- f = os.path.dirname(__file__) -- -- return os.path.join(f, "cacert.pem") -+ return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt" - - - def contents(): -- return read_text("certifi", "cacert.pem", encoding="ascii") -+ with open(where(), "r", encoding="ascii") as f: -+ return f.read() --- -2.24.1 - |