From 520b0cab9c33df6668a9cf2afde5499215b0fec2 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 17 Nov 2021 20:29:41 +0100 Subject: [PATCH] dev-python/certifi: Sync with gentoo It's from gentoo commit b7f3689cb779637ff5cac89e303facb46bc4057f. --- .../dev-python/certifi/Manifest | 3 +- .../certifi/certifi-2018.4.16.ebuild | 43 --------------- .../dev-python/certifi/certifi-2999.ebuild | 33 +++++++++++ .../certifi/certifi-3021.3.16.ebuild | 55 +++++++++++++++++++ ...certifi-2018.4.16-use-system-cacerts.patch | 15 ----- .../dev-python/certifi/metadata.xml | 6 +- 6 files changed, 94 insertions(+), 61 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild create mode 100644 sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest index a9eeaebda9..7640968ec1 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/Manifest @@ -1 +1,2 @@ -DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682 +DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c +DIST certifi-system-store-3021.3.16.tar.gz 13784 BLAKE2B c0c2322fe298d363c4ef4dada2c0db8837bf7a32d86a7b54a1b45bb3dd3c99d732b2612f25495f4a59d9692f896e2b962e7057fa5fec9998724476db48f90c2a SHA512 44953ed8a3deb5fa4aff3f74afa557219e042acea395e9cdebfd26fd43ce0bdeca07c6b6dfe91977f88852e7674b94337b93c4d78fd2da6f47a6187fa46d6668 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild deleted file mode 100644 index 7daec8f073..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2018.4.16.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy pypy3 ) - -inherit distutils-r1 prefix readme.gentoo-r1 versionator - -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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-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/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild new file mode 100644 index 0000000000..c78d9961bb --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-2999.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..10} pypy3 ) + +inherit distutils-r1 + +MY_P=certifi-shim-10001 +DESCRIPTION="Thin replacement for certifi using system certificate store" +HOMEPAGE=" + https://github.com/mgorny/certifi-shim/ + https://pypi.org/project/certifi/" +SRC_URI=" + https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz" +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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild new file mode 100644 index 0000000000..9fb5fa1b80 --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/certifi-3021.3.16.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# please keep this ebuild at EAPI 7 -- sys-apps/portage dep +EAPI=7 + +PYTHON_COMPAT=( python3_{8..10} pypy3 ) +inherit distutils-r1 + +MY_P=certifi-system-store-${PV} +DESCRIPTION="A certifi hack to use system trust store on Linux/FreeBSD" +HOMEPAGE=" + https://github.com/tiran/certifi-system-store/ + https://pypi.org/project/certifi-system-store/" +SRC_URI=" + https://github.com/tiran/certifi-system-store/archive/v${PV}.tar.gz + -> ${MY_P}.tar.gz" +S=${WORKDIR}/${MY_P} + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + +RDEPEND="app-misc/ca-certificates" + +distutils_enable_tests --install pytest + +EPYTEST_IGNORE=( + # requires Internet + tests/test_requests.py +) + +src_prepare() { + sed -i -e "s^/etc^${EPREFIX}/etc^" src/certifi/core.py || die + distutils-r1_src_prepare +} + +symlink_info() { + pushd "${1}" >/dev/null || die + local egginfo=( certifi_system_store*.egg-info ) + [[ -d ${egginfo} ]] || die + ln -v -s "${egginfo}" "${egginfo/_system_store}" || die + popd >/dev/null || die +} + +python_test() { + distutils_install_for_testing + symlink_info "${TEST_DIR}"/lib + epytest +} + +python_install() { + distutils-r1_python_install + symlink_info "${D}$(python_get_sitedir)" +} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch b/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch deleted file mode 100644 index 009f21168c..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/files/certifi-2018.4.16-use-system-cacerts.patch +++ /dev/null @@ -1,15 +0,0 @@ -Use system's CA certificate store - ---- a/certifi/core.py -+++ b/certifi/core.py -@@ -19,9 +19,7 @@ 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" - - - def old_where(): diff --git a/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml index 85d50281c5..db64a2b878 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/certifi/metadata.xml @@ -1,11 +1,13 @@ - + python@gentoo.org Python + - certifi + tiran/certifi-system-store + certifi-system-store