Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/certifi/files/, dev-python/certifi/
Date: Mon, 25 May 2020 12:18:15
Message-Id: 1590409088.adc8a88aa020f0bc68ff233d8205a54f020cac2b.mgorny@gentoo
1 commit: adc8a88aa020f0bc68ff233d8205a54f020cac2b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 25 11:33:16 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon May 25 12:18:08 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc8a88a
7
8 dev-python/certifi: Remove old
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 dev-python/certifi/Manifest | 1 -
13 dev-python/certifi/certifi-2019.11.28.ebuild | 43 ----------------------
14 .../certifi-2018.4.16-use-system-cacerts.patch | 10 -----
15 3 files changed, 54 deletions(-)
16
17 diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
18 index a94c533cbe9..bb51482438f 100644
19 --- a/dev-python/certifi/Manifest
20 +++ b/dev-python/certifi/Manifest
21 @@ -1,2 +1 @@
22 -DIST certifi-2019.11.28.tar.gz 156407 BLAKE2B 61fdee083aa1f5467bb4a6a65c9cdff2eb9e88261b4702f9d03b53abebb9f9815499a0cbcb53e983e81d5c54ed40e2ff7b351c19c90b2340373414e7e8afaea6 SHA512 6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad
23 DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
24
25 diff --git a/dev-python/certifi/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild
26 deleted file mode 100644
27 index c2048ff68cd..00000000000
28 --- a/dev-python/certifi/certifi-2019.11.28.ebuild
29 +++ /dev/null
30 @@ -1,43 +0,0 @@
31 -# Copyright 1999-2020 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=7
35 -
36 -PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
37 -
38 -inherit distutils-r1 prefix readme.gentoo-r1
39 -
40 -DESCRIPTION="Python package for providing Mozilla's CA Bundle"
41 -HOMEPAGE="http://certifi.io/ https://pypi.org/project/certifi"
42 -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
43 -
44 -LICENSE="MPL-2.0"
45 -SLOT="0"
46 -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"
47 -IUSE=""
48 -
49 -RDEPEND="app-misc/ca-certificates"
50 -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
51 -
52 -# Do not drop this patch -- this will affect system's security
53 -PATCHES=( "${FILESDIR}"/certifi-2018.4.16-use-system-cacerts.patch )
54 -
55 -python_prepare_all() {
56 - distutils-r1_python_prepare_all
57 -
58 - eprefixify certifi/core.py
59 -}
60 -
61 -python_install_all() {
62 - distutils-r1_python_install_all
63 -
64 - local DOC_CONTENTS="
65 - In Gentoo, we don't use certifi's bundled CA certificates.
66 - Instead we remove bundled cacert.pem and patch certifi
67 - to return system's CA certificates.
68 - "
69 - readme.gentoo_create_doc
70 -
71 - # Precaution -- nothing should use bundled CA certificates
72 - find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
73 -}
74
75 diff --git a/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch b/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch
76 deleted file mode 100644
77 index 1c21a2ae1e0..00000000000
78 --- a/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch
79 +++ /dev/null
80 @@ -1,10 +0,0 @@
81 -Use system's CA certificate store
82 -
83 ---- a/certifi/core.py
84 -+++ b/certifi/core.py
85 -@@ -21,4 +21,2 @@ class DeprecatedBundleWarning(DeprecationWarning):
86 - def where():
87 -- f = os.path.dirname(__file__)
88 --
89 -- return os.path.join(f, 'cacert.pem')
90 -+ return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"