* [gentoo-commits] repo/gentoo:master commit in: dev-python/certifi/files/, dev-python/certifi/
@ 2020-05-25 12:18 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2020-05-25 12:18 UTC (permalink / raw
To: gentoo-commits
commit: adc8a88aa020f0bc68ff233d8205a54f020cac2b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 11:33:16 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May 25 12:18:08 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=adc8a88a
dev-python/certifi: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/certifi/Manifest | 1 -
dev-python/certifi/certifi-2019.11.28.ebuild | 43 ----------------------
.../certifi-2018.4.16-use-system-cacerts.patch | 10 -----
3 files changed, 54 deletions(-)
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index a94c533cbe9..bb51482438f 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,2 +1 @@
-DIST certifi-2019.11.28.tar.gz 156407 BLAKE2B 61fdee083aa1f5467bb4a6a65c9cdff2eb9e88261b4702f9d03b53abebb9f9815499a0cbcb53e983e81d5c54ed40e2ff7b351c19c90b2340373414e7e8afaea6 SHA512 6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad
DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
diff --git a/dev-python/certifi/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild
deleted file mode 100644
index c2048ff68cd..00000000000
--- a/dev-python/certifi/certifi-2019.11.28.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} pypy3 )
-
-inherit distutils-r1 prefix readme.gentoo-r1
-
-DESCRIPTION="Python package for providing Mozilla's CA Bundle"
-HOMEPAGE="http://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}"/certifi-2018.4.16-use-system-cacerts.patch )
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- 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
-
- # Precaution -- nothing should use bundled CA certificates
- find "${D}" -name 'cacert.pem' -delete || die "Failed to delete bundled CA certificates"
-}
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
deleted file mode 100644
index 1c21a2ae1e0..00000000000
--- a/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-Use system's CA certificate store
-
---- a/certifi/core.py
-+++ b/certifi/core.py
-@@ -21,4 +21,2 @@ class DeprecatedBundleWarning(DeprecationWarning):
- def where():
-- f = os.path.dirname(__file__)
--
-- return os.path.join(f, 'cacert.pem')
-+ return "@GENTOO_PORTAGE_EPREFIX@/etc/ssl/certs/ca-certificates.crt"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/certifi/files/, dev-python/certifi/
@ 2020-07-30 20:41 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2020-07-30 20:41 UTC (permalink / raw
To: gentoo-commits
commit: 0bcbbcb192f41ccffc5bfafb2e3141a010547393
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 20:38:49 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 20:41:02 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bcbbcb1
dev-python/certifi: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/certifi/Manifest | 1 -
dev-python/certifi/certifi-2020.4.5.1.ebuild | 43 ----------------------
.../certifi-2020.4.5.1-use-system-cacerts.patch | 30 ---------------
3 files changed, 74 deletions(-)
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 29e2111ba5b..283e3260e86 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,2 +1 @@
-DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738
DIST certifi-shim-9999.tar.gz 3762 BLAKE2B 3ea85314e37a989d4894ea5fc89fb138e06c7912277f90466c6edb121c39f33b031bcc08346c4766c99fb193a2d53801aa1e8ef30cfede9a7e8247c7e443faef SHA512 ca2844f1680a019dbb5a440141d8ebaddd7c78ce47a23a48a50d2d857d012f90d74d4200168964787e31f16b1e9d7c981c033ff99f1e3ea1fa73cbbbf255edbd
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 35515f2569a..00000000000
--- 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 692439a10ea..00000000000
--- 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
-
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-30 20:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-30 20:41 [gentoo-commits] repo/gentoo:master commit in: dev-python/certifi/files/, dev-python/certifi/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-05-25 12:18 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox