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: Thu, 30 Jul 2020 20:41:20
Message-Id: 1596141662.0bcbbcb192f41ccffc5bfafb2e3141a010547393.mgorny@gentoo
1 commit: 0bcbbcb192f41ccffc5bfafb2e3141a010547393
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 30 20:38:49 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 30 20:41:02 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcbbcb1
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-2020.4.5.1.ebuild | 43 ----------------------
14 .../certifi-2020.4.5.1-use-system-cacerts.patch | 30 ---------------
15 3 files changed, 74 deletions(-)
16
17 diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
18 index 29e2111ba5b..283e3260e86 100644
19 --- a/dev-python/certifi/Manifest
20 +++ b/dev-python/certifi/Manifest
21 @@ -1,2 +1 @@
22 -DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
23 DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd
24
25 diff --git a/dev-python/certifi/certifi-2020.4.5.1.ebuild b/dev-python/certifi/certifi-2020.4.5.1.ebuild
26 deleted file mode 100644
27 index 35515f2569a..00000000000
28 --- a/dev-python/certifi/certifi-2020.4.5.1.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,9} pypy3 )
37 -
38 -inherit distutils-r1 prefix readme.gentoo-r1
39 -
40 -DESCRIPTION="Python package for providing Mozilla's CA Bundle"
41 -HOMEPAGE="https://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}"/${PN}-2020.4.5.1-use-system-cacerts.patch )
54 -
55 -python_prepare_all() {
56 - distutils-r1_python_prepare_all
57 -
58 - # Precaution -- nothing should use bundled CA certificates
59 - rm certifi/cacert.pem || die "Failed to delete bundled CA certificates"
60 -
61 - eprefixify certifi/core.py
62 -}
63 -
64 -python_install_all() {
65 - distutils-r1_python_install_all
66 -
67 - local DOC_CONTENTS="
68 - In Gentoo, we don't use certifi's bundled CA certificates.
69 - Instead we remove bundled cacert.pem and patch certifi
70 - to return system's CA certificates.
71 - "
72 - readme.gentoo_create_doc
73 -}
74
75 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
76 deleted file mode 100644
77 index 692439a10ea..00000000000
78 --- a/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch
79 +++ /dev/null
80 @@ -1,30 +0,0 @@
81 -From f07497e36ccc883626ae5cdfa7f81fcb3fc0d549 Mon Sep 17 00:00:00 2001
82 -From: Sebastian Pipping <sebastian@×××××××.org>
83 -Date: Sun, 5 Apr 2020 23:43:30 +0200
84 -Subject: [PATCH] Use system's CA certificate store
85 -
86 ----
87 - certifi/core.py | 7 +++----
88 - 1 file changed, 3 insertions(+), 4 deletions(-)
89 -
90 -diff --git a/certifi/core.py b/certifi/core.py
91 -index 56b52a3..467880f 100644
92 ---- a/certifi/core.py
93 -+++ b/certifi/core.py
94 -@@ -21,10 +21,9 @@ except ImportError:
95 -
96 -
97 - def where():
98 -- f = os.path.dirname(__file__)
99 --
100 -- return os.path.join(f, "cacert.pem")
101 -+ return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"
102 -
103 -
104 - def contents():
105 -- return read_text("certifi", "cacert.pem", encoding="ascii")
106 -+ with open(where(), "r", encoding="ascii") as f:
107 -+ return f.read()
108 ---
109 -2.24.1
110 -