From 623ee73d661e5ed8475cb264511f683407d87365 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 12 Apr 2020 03:41:30 +0100 Subject: gentoo Easter resync : 12.04.2020 --- dev-python/certifi/Manifest | 13 +++---- dev-python/certifi/certifi-2018.4.16.ebuild | 43 ---------------------- dev-python/certifi/certifi-2019.11.28.ebuild | 2 +- dev-python/certifi/certifi-2019.6.16.ebuild | 43 ---------------------- dev-python/certifi/certifi-2019.9.11.ebuild | 43 ---------------------- dev-python/certifi/certifi-2020.4.5.1.ebuild | 43 ++++++++++++++++++++++ .../certifi-2020.4.5.1-use-system-cacerts.patch | 30 +++++++++++++++ dev-python/certifi/metadata.xml | 1 + 8 files changed, 80 insertions(+), 138 deletions(-) delete mode 100644 dev-python/certifi/certifi-2018.4.16.ebuild delete mode 100644 dev-python/certifi/certifi-2019.6.16.ebuild delete mode 100644 dev-python/certifi/certifi-2019.9.11.ebuild create mode 100644 dev-python/certifi/certifi-2020.4.5.1.ebuild create mode 100644 dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch (limited to 'dev-python/certifi') diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest index 0b80ce68624f..58f4249ee3d5 100644 --- a/dev-python/certifi/Manifest +++ b/dev-python/certifi/Manifest @@ -1,10 +1,7 @@ AUX certifi-2018.4.16-use-system-cacerts.patch 314 BLAKE2B 30c9d53dba96f0062df843c98e507a477888a5d8d4de32fded32c9c6729c3e71690a1a1463372d991fbeb5135298a8fe308ab2ea10521e4a5408591eb1a336a6 SHA512 ff533ca05a736e35c1c567e0da6e79124bc7e070fa1db03fdcda6989df885a16568e4d0dffe07658480b1141dd1fc4c374230c46ce7d7b20e0ada82600ae9141 -DIST certifi-2018.4.16.tar.gz 149967 BLAKE2B 4a69ec495266d54032dfabc9c17d0b1e78ad1467214f9f981feb4fae279c1f4b5f0bc3f7a643c2229b17d19e32c1ea894dc16d73b036a0b32f17faa9ac55615c SHA512 96369b318df9592ed4ff48d79ae695f89d27d85e8f5de72548fccb19ac15b83a33fb8bc096a3092d7a7f5b201af08805576888418c7927cf48b892df56464682 +AUX certifi-2020.4.5.1-use-system-cacerts.patch 797 BLAKE2B c870e8f65f63295cc68703a1ee15bd8ee30da6e1f038e988cc359227904e8a0f6f236752399677f145ec7d4bb5767b4e97456bc65bb9b5cddd25926ff5df37d6 SHA512 c2dfb2fa730556c791efb4aa320e0164608d24adacf91f90d9398e31744d98dfb1cdba82d00eea2d75fc09c9e2d7408852b1791378e20b8e4a8b3a6342da539d DIST certifi-2019.11.28.tar.gz 156407 BLAKE2B 61fdee083aa1f5467bb4a6a65c9cdff2eb9e88261b4702f9d03b53abebb9f9815499a0cbcb53e983e81d5c54ed40e2ff7b351c19c90b2340373414e7e8afaea6 SHA512 6821444f02db0d9d03ab1891731178af1d7858df3c729f079147a9c588cf97a456e050da3421a0d2a3559145610826669034a8d46cd50b7c76e90249db1b09ad -DIST certifi-2019.6.16.tar.gz 156721 BLAKE2B 3990a9c122dbaf554f4482ad97192efa66f1cf54e83bd4ee67248bbea8797dc4da38ab537230a8263a491a2a2115528138965480ef4da6d6cba9ac2af5bff830 SHA512 4641626bc5073cd0b3a520855ddef1007dcb42933baa7a3469856f936e725581042bcbd5b67e984ba9748e7faa62b9125cba7dc160dcc5db2eafe46461a29f5e -DIST certifi-2019.9.11.tar.gz 154855 BLAKE2B 1a2e39b44e2285bcf2dfc0104873fc2c5004c54b346a27beebffa28894c22ba77b7ba0b17131e686846be14c2200ea0fba89f8b465f4c61139122d88d6d1ebf6 SHA512 aab5734bf65cbad12772bb120153b0325a5c3226339e0a03fdf4c3413303feb930b6d53d1d9dab93bd4f3cf00d2bfbe86419c4c462570340f1a4aa143a31373c -EBUILD certifi-2018.4.16.ebuild 1388 BLAKE2B f7907b5d646e49ebcabd3bcc26189d9a6413a342c8e2c9d0271ec0fe033a74551862fcf54d2a93e5a81974f9a87d10ac906a924d55aa7bd85693de082b0953de SHA512 80b12f43b61ee3393af42e95363889c4a7c63c57a946bcd97a2061a2c774dba33609a5e4600c247ea582427ef073f9f351ea5a7637d84891ff13aed909bd1881 -EBUILD certifi-2019.11.28.ebuild 1389 BLAKE2B 2c1140d25d1076b09b4adf3fa2e1c39b80f2e444a2542519aec0a5cc974a4349ace78b3efdf08698ee273d8a56e76caa337144900da6906de1cb8d48c08378f3 SHA512 2eb0750132c1fe67db9c52308f5498753fc132fee7567193d6c281e835136c10cd58e549d86e2f6296661e2b949f3fa9ec1a365e4d9a1d9d6a4e4e050cfa2706 -EBUILD certifi-2019.6.16.ebuild 1376 BLAKE2B a48ebc3b6d0121f1242557842c3c8ad24cb0bc233f0adad68782aade3311a35bec4fe7786ec20aa39b7cb2b3ad7006737e4f5b3e11773892468fd914f7979b4e SHA512 f5ae0824a84842ff6aaa461abc2c5c4e63c648c6808d83d26d083bc6d302aea9c7b71448888aadf2255b7d5929583e173a214c1fca645cfa1279fae46fd43b6c -EBUILD certifi-2019.9.11.ebuild 1397 BLAKE2B 6252b9a806c50d2f8de2a9543f571c986ec9ea1dea1a29d6ceaf2090952329e4d87d31dd777416a90a12ec7fbbea2fd2e0e692490434e05225024b3ef314188f SHA512 7ea1dc8bbcf856b2dfcda268f4a5e4ef6d84e056a45b97b666d3219247ec751e19ba803428d951ad4109483b44ccf6df5e636dd569f77dcf8535b635594b572b -MISC metadata.xml 320 BLAKE2B ba5c3c1018c5cba293969a523ab6c388f5bc0d0cfdfc69a4b143f1c966aad036df449bb091eacdeae2335a6bdc722da85882caad2a447bf87b600da2ed7c5309 SHA512 0e99564887f0a0b314056b2e1f4b6e3afcaf908de6824a2cc87deab9d1832566e97b8ba88cc7d2bdc5d11e7f1c8532830fc59602efd8c2f1a6061c0ad4853fdd +DIST certifi-2020.4.5.1.tar.gz 158038 BLAKE2B 988b29097b869b43095363b6ca344e3ce6c895f699b9d8b2576cb7108c5e12ea8a485c5f1dbc3d304d4243bdb09bce231fae15eb6abe47eee30afc1dc4ab4075 SHA512 8b0312aba427c29f6ebaf8140493f9673043e3f76f9bb1002a8fbc7a943303effad15173805e276147548d0978630655763b9ea60410135ba08f413fa77a5738 +EBUILD certifi-2019.11.28.ebuild 1383 BLAKE2B 24c68a72af3da2d6565b8f6aea0998c63cb8f9324b31bd68b77632e88cac638fedc8af8491c796ad159e52c161da5d8e0e97c8c1475a9cd58b75699e1218d8d8 SHA512 4ca1221b472f745c8625c2e65dace08108331f7cfb72aee1a825b907f2887538d9dcc033c94749ccb444b48e31e4d4056526babb34e3cff6401fd2ed7d2b4598 +EBUILD certifi-2020.4.5.1.ebuild 1375 BLAKE2B bb716ae9baa8c9553b8d88edac70529d3121cbbf86ed9e02da05290dd357301f143515b84236f8a8e9a74e4468209a4fee4ca6d6f409188c3345bddc8d36145f SHA512 2913ecc6b201496b9ddf484cf4e659cce113ec5debfce54e853a99a3ea7a2bd91e1570f00a66508f041187f379677c5797de6f3ec8e963ea1f15f06d1ed01457 +MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9 diff --git a/dev-python/certifi/certifi-2018.4.16.ebuild b/dev-python/certifi/certifi-2018.4.16.ebuild deleted file mode 100644 index cd3a7f9da416..000000000000 --- a/dev-python/certifi/certifi-2018.4.16.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{6,7} 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-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/certifi-2019.11.28.ebuild b/dev-python/certifi/certifi-2019.11.28.ebuild index 07d5f9d89643..120439ddb24d 100644 --- a/dev-python/certifi/certifi-2019.11.28.ebuild +++ b/dev-python/certifi/certifi-2019.11.28.ebuild @@ -13,7 +13,7 @@ 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 ~sh 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" IUSE="" RDEPEND="app-misc/ca-certificates" diff --git a/dev-python/certifi/certifi-2019.6.16.ebuild b/dev-python/certifi/certifi-2019.6.16.ebuild deleted file mode 100644 index f0899ccbb957..000000000000 --- a/dev-python/certifi/certifi-2019.6.16.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} 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 s390 sh 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/certifi-2019.9.11.ebuild b/dev-python/certifi/certifi-2019.9.11.ebuild deleted file mode 100644 index 217f48bd96ea..000000000000 --- a/dev-python/certifi/certifi-2019.9.11.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 ~sh ~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/certifi-2020.4.5.1.ebuild b/dev-python/certifi/certifi-2020.4.5.1.ebuild new file mode 100644 index 000000000000..7014988654a6 --- /dev/null +++ b/dev-python/certifi/certifi-2020.4.5.1.ebuild @@ -0,0 +1,43 @@ +# 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}"/${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 new file mode 100644 index 000000000000..692439a10eac --- /dev/null +++ b/dev-python/certifi/files/certifi-2020.4.5.1-use-system-cacerts.patch @@ -0,0 +1,30 @@ +From f07497e36ccc883626ae5cdfa7f81fcb3fc0d549 Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping +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 + diff --git a/dev-python/certifi/metadata.xml b/dev-python/certifi/metadata.xml index 85d50281c54b..2c9c847ecf97 100644 --- a/dev-python/certifi/metadata.xml +++ b/dev-python/certifi/metadata.xml @@ -5,6 +5,7 @@ python@gentoo.org Python + certifi -- cgit v1.2.3