From 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 18 Mar 2018 04:54:42 +0000 Subject: gentoo resync : 18.03.2018 --- app-crypt/acme/Manifest | 3 +- app-crypt/acme/acme-0.22.0-r1.ebuild | 49 +++++++++++++++++++++++++ app-crypt/acme/acme-0.22.0.ebuild | 47 ------------------------ app-crypt/acme/files/0.22.0-fix-client.patch | 55 ++++++++++++++++++++++++++++ 4 files changed, 106 insertions(+), 48 deletions(-) create mode 100644 app-crypt/acme/acme-0.22.0-r1.ebuild delete mode 100644 app-crypt/acme/acme-0.22.0.ebuild create mode 100644 app-crypt/acme/files/0.22.0-fix-client.patch (limited to 'app-crypt/acme') diff --git a/app-crypt/acme/Manifest b/app-crypt/acme/Manifest index ededbe383d0d..8da46cc81bf7 100644 --- a/app-crypt/acme/Manifest +++ b/app-crypt/acme/Manifest @@ -1,8 +1,9 @@ +AUX 0.22.0-fix-client.patch 2178 BLAKE2B 5befa9f229c118fdd19758b7f3da05570ed685fdc7ceb733a15a0a64e6865ecd51f2dc792db402ca1c8dbd5f8ee586ba9bbf620c4c94b2b2b0545c8c3abc23ee SHA512 5fde6c834b96116a8c4c94d95d5e75ccde7b8345108862730834cfa265f6a58f4ed39a57de0961b9ca4904810313771c43a9a90809e3faa5d1c95105f34c6ea9 DIST certbot-0.20.0.tar.gz 1108139 BLAKE2B 6af07dd245912741592761bd11160c081e278e5f48b69747669aa6146d81cc7ad6f0d9c7b4bf31ad137d51bd378f670e5e5d7318efe7b3b5463d52515a5df257 SHA512 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546 DIST certbot-0.21.1.tar.gz 1105663 BLAKE2B 7c36ec0504a144a2325528079374d103f6214252c01ba0bcaf26378950fe5cd54010abe756d80b1c0c30740442a184417f0b2bd7ffea91edeb70c59dfee2349e SHA512 6f3ffba7dc06bcc2a6b9835906331753ee2715192e7a49562314480069f22e4a66bb26f04dc4bbdfb0ab40998220d0c9b77fb0351e042116b02996fb2da699d2 DIST certbot-0.22.0.tar.gz 1128134 BLAKE2B d4874bca6ac9f992d54b8fbab975bc020f448ed83896d0088c8ba0f1547fbc02a783038992408b9090fde4ad8386c81d85511094abcd42bc79b8883f05d4600c SHA512 406810e29a2637c420b9a8a3feb3a2ffb77bd740419cbcf46d10ab152a7252c765c058481b2a1f9a96cc426a9ae018bf90540fc0ebd54be1c8822c528cf1b605 EBUILD acme-0.20.0.ebuild 1196 BLAKE2B 6f3277f312a2d4178feb12874a72cf00c29f78bbf5a664cf3e3c6900a8945e871aba74cb291bc81ae4412c4fa2ccccf1b06d3241f6a8562d8b5afd042af7a39d SHA512 1ca1a31c541cbf073141b5b4afd0eb0080eb5543c96570497fd107832a72e8716d136f51eed1fe9021c228858ba6b1abf67ef2f268004cd3279ec9b402e64f99 EBUILD acme-0.21.1.ebuild 1203 BLAKE2B adec925e16fe937f47f95933a1588796f84715efee9cd8cea4a2277ea2e43eac4f113d549b2346c2a5acca554b9bece4cb0513ccc14418240f01b0d42d017c18 SHA512 c601fabfd4e11dfa180d0dc8364c4a23dc9b100a053a1f13cd77521e53f2d69f3f76565428ad599f91eb5ef7d06d78803f2a7620ed6ae780ae0419f31f47f422 -EBUILD acme-0.22.0.ebuild 1205 BLAKE2B 59bf7d798bdd550ae5981ed9bb9df3d4c8d64e93a4b7157a170cfff19f95ae8d98d257f664cb043bb9ea26e508e0831d3bbb3ad52050917fc91e356af7b2879e SHA512 eb44ba59c75ea4068fdde0ba3944a5c3b906fc225713da4dc96ae3b74167242ac974d3f753df2adef9c11e8ce99ac4837ae6fd469fb57d7152c8fe4fb5b9a964 +EBUILD acme-0.22.0-r1.ebuild 1256 BLAKE2B 7527d7a2fb97118aaebc16e2a83bc7b2232e9d9db1fe205d6657f2c458b637f367aaa403f948270dfd5fa9c57912ac08649421c4fa455941e7d0d316c990a06b SHA512 165a936127bb921f6dbf5f971cfd454e90bb36ca8a82b43ffebafa9e49c3462f10355749cd5264e1ebdef88d60a91ca379ea2bd8f6beefb274a899cb5ce5912f EBUILD acme-9999.ebuild 1205 BLAKE2B 8c9ee00ff6505c592a3c1ae4ab57e4abf9c6f49b5dd7737cc4a081645edd808f3bf3422a59fbda1597f31176d003e51aa784886ccd8cb5e5862c2823339f51ee SHA512 164272884c2301b9e2a5252ccff8c87678116bb8007527cd064af9147d536a266c5ed8910b711bd242f384298b903f620ad9cf9431c4e26ec65b7e34a8c20767 MISC metadata.xml 342 BLAKE2B 770c32b421519cd6bdf7e09a71a1ee679a7fdf18e03587f75097a766c51dc878000184759e3c69f0c19afe060dd5578ff91e481644086e138dbb728619895130 SHA512 bb057838d2a4161b1b5d545d32fb798bf52571fccaf3dfe7e1811ee4090813341222f7c27e21f36ea9353e9f48b401a4cda0f1937640ef052445e6b0eac9defb diff --git a/app-crypt/acme/acme-0.22.0-r1.ebuild b/app-crypt/acme/acme-0.22.0-r1.ebuild new file mode 100644 index 000000000000..dd86db57739c --- /dev/null +++ b/app-crypt/acme/acme-0.22.0-r1.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6}) + +if [[ ${PV} == 9999* ]]; then + EGIT_REPO_URI="https://github.com/certbot/certbot.git" + inherit git-r3 + S=${WORKDIR}/${P}/${PN} +else + SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + S=${WORKDIR}/certbot-${PV}/acme +fi + +inherit distutils-r1 + +DESCRIPTION="An implementation of the ACME protocol" +HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="test" + +RDEPEND=" + >=dev-python/cryptography-0.8[${PYTHON_USEDEP}] + >=dev-python/josepy-1.0.0[${PYTHON_USEDEP}] + dev-python/mock[${PYTHON_USEDEP}] + >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] + dev-python/pyrfc3339[${PYTHON_USEDEP}] + dev-python/pytz[${PYTHON_USEDEP}] + >=dev-python/requests-2.10[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] +" +DEPEND=" + test? ( + ${RDEPEND} + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/pytest-xdist[${PYTHON_USEDEP}] + ) + >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] +" + +PATCHES=( "${FILESDIR}/0.22.0-fix-client.patch" ) + +python_test() { + nosetests -w ${PN} || die +} diff --git a/app-crypt/acme/acme-0.22.0.ebuild b/app-crypt/acme/acme-0.22.0.ebuild deleted file mode 100644 index 610350856377..000000000000 --- a/app-crypt/acme/acme-0.22.0.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=(python{2_7,3_4,3_5,3_6}) - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="https://github.com/certbot/certbot.git" - inherit git-r3 - S=${WORKDIR}/${P}/${PN} -else - SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> certbot-${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc64 ~x86" - S=${WORKDIR}/certbot-${PV}/acme -fi - -inherit distutils-r1 - -DESCRIPTION="An implementation of the ACME protocol" -HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="test" - -RDEPEND=" - >=dev-python/cryptography-0.8[${PYTHON_USEDEP}] - >=dev-python/josepy-1.0.0[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - >=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}] - dev-python/pyrfc3339[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - >=dev-python/requests-2.10[${PYTHON_USEDEP}] - >=dev-python/six-1.9.0[${PYTHON_USEDEP}] -" -DEPEND=" - test? ( - ${RDEPEND} - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/pytest-xdist[${PYTHON_USEDEP}] - ) - >=dev-python/setuptools-1.0[${PYTHON_USEDEP}] -" - -python_test() { - nosetests -w ${PN} || die -} diff --git a/app-crypt/acme/files/0.22.0-fix-client.patch b/app-crypt/acme/files/0.22.0-fix-client.patch new file mode 100644 index 000000000000..589781b0a8d5 --- /dev/null +++ b/app-crypt/acme/files/0.22.0-fix-client.patch @@ -0,0 +1,55 @@ +From 0131c649d057a513a6bdc0b4b6eac7ea0bd9a9e8 Mon Sep 17 00:00:00 2001 +From: Brad Warren +Date: Fri, 16 Mar 2018 18:44:23 -0700 +Subject: [PATCH] Fix acme.client.Client.__init__ (#5747) (#5748) + +* fixes #5738 + +* add test to prevent regressions + +(cherry picked from commit ba6bdb50998bd55aeef7972a5c839560e02142f3) +--- + acme/acme/client.py | 5 +++-- + acme/acme/client_test.py | 10 ++++++++++ + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git acme/acme/client.py acme/acme/client.py +index 9e2478afe4..19615b087b 100644 +--- acme/acme/client.py ++++ acme/acme/client.py +@@ -259,11 +259,12 @@ def __init__(self, directory, key, alg=jose.RS256, verify_ssl=True, + """ + # pylint: disable=too-many-arguments + self.key = key +- self.net = ClientNetwork(key, alg=alg, verify_ssl=verify_ssl) if net is None else net ++ if net is None: ++ net = ClientNetwork(key, alg=alg, verify_ssl=verify_ssl) + + if isinstance(directory, six.string_types): + directory = messages.Directory.from_json( +- self.net.get(directory).json()) ++ net.get(directory).json()) + super(Client, self).__init__(directory=directory, + net=net, acme_version=1) + +diff --git acme/acme/client_test.py acme/acme/client_test.py +index 00b9e19dd0..be08c2919f 100644 +--- acme/acme/client_test.py ++++ acme/acme/client_test.py +@@ -299,6 +299,16 @@ def test_init_downloads_directory(self): + directory=uri, key=KEY, alg=jose.RS256, net=self.net) + self.net.get.assert_called_once_with(uri) + ++ @mock.patch('acme.client.ClientNetwork') ++ def test_init_without_net(self, mock_net): ++ mock_net.return_value = mock.sentinel.net ++ alg = jose.RS256 ++ from acme.client import Client ++ self.client = Client( ++ directory=self.directory, key=KEY, alg=alg) ++ mock_net.called_once_with(KEY, alg=alg, verify_ssl=True) ++ self.assertEqual(self.client.net, mock.sentinel.net) ++ + def test_register(self): + # "Instance of 'Field' has no to_json/update member" bug: + # pylint: disable=no-member -- cgit v1.2.3