From ec12b876de23f719afe476d61b3820ec8aa13902 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Sun, 18 Feb 2018 19:40:56 +0100 Subject: app-crypt/wile: 1.0.0 --- app-crypt/wile/Manifest | 1 + app-crypt/wile/files/wile-1.0.0-josepy.patch | 80 ++++++++++++++++++++++++++++ app-crypt/wile/wile-1.0.0.ebuild | 33 ++++++++++++ 3 files changed, 114 insertions(+) create mode 100644 app-crypt/wile/files/wile-1.0.0-josepy.patch create mode 100644 app-crypt/wile/wile-1.0.0.ebuild diff --git a/app-crypt/wile/Manifest b/app-crypt/wile/Manifest index d12b487..3ec38f1 100644 --- a/app-crypt/wile/Manifest +++ b/app-crypt/wile/Manifest @@ -1,2 +1,3 @@ DIST wile-0.3.1.tar.gz 19822 SHA256 1c273f5365189cb304b483ca7b9c2fa07b6f7981c966e4c1d38a599e7279466a SHA512 02e85bba3d91a6292bcf10eb23aefe7f4e5600914063b9fc9166734f76a47a209b19a4deed25c97a9795e54e6100bb0031dc36420cbb5f6bdc43c82fec6a0f57 WHIRLPOOL 0f109aa15b252eb8cdc95bab35d0d39131762f5c23937e2246abf5dbe052121b63563ddfcbe526319e85805c4b37fa70179ab1bc7e020b004149307919f8b9ed DIST wile-0.3.2.tar.gz 21455 SHA256 f3fe11194828ed908efb92e2a119645c7d0c839d6c6d6bd476a7c264deb77758 SHA512 1fc024014ca458ed057b102022ee419566cb5abe322ea5176f54c87b1f520a90f9cb8778fb13644cdeb110d8f7aae052122067fcb3c58ae4ec4ac011562d44b7 WHIRLPOOL 0e30f82eaa541dcd98b6aeaeae9fba9b21db6aa11567fb70f4c93594a36cb548a932ef0301dacbbeb0094b2e9dd59d94a85f1222cc8207e0e93ea9dbd375844e +DIST wile-1.0.0.tar.gz 27839 SHA256 a14f6ae46ce1a12636b41be9a187346eef223e3178f8782fcd90d61f30b0fc1a SHA512 ab4840296619f0404922dcf28c91e047fca4ccb3f71ba22e4bca198139062bf8894f6c6111650adbc6e3c5cdf36c28bcf2881a41ea91f6740205374c4b5ba088 WHIRLPOOL 2555a07eaa08ad38974d2f0bc4e3162a44e5febaaac356f77b6e6a1105aa2841e5cb2fbbcf08c82feaef4827d60a5df4019b4ff11b1ccdc83ab0dc1a2b319577 diff --git a/app-crypt/wile/files/wile-1.0.0-josepy.patch b/app-crypt/wile/files/wile-1.0.0-josepy.patch new file mode 100644 index 0000000..04382c8 --- /dev/null +++ b/app-crypt/wile/files/wile-1.0.0-josepy.patch @@ -0,0 +1,80 @@ +From 4a7df693b83dbf8d1d3c5245ad9725e98d24b027 Mon Sep 17 00:00:00 2001 +From: Luka Matijevic +Date: Tue, 13 Feb 2018 13:50:55 +0100 +Subject: [PATCH 1/2] Fix JOSE dependency + +Starting with ACME version 0.21.0 implementation for JOSE was split out +of ACME library into a separate package named josepy. + +Added josepy as a dependency to setup.py and fixed code according to +this changes. + +https://pypi.python.org/pypi/josepy +https://github.com/certbot/josepy +--- + setup.py | 1 + + wile/__init__.py | 2 +- + wile/cert.py | 2 +- + 3 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 7a8dc8d..5ed1f03 100755 +--- a/setup.py ++++ b/setup.py +@@ -28,6 +28,7 @@ def read(filename): + 'cryptography', + 'setuptools_scm', # for run-time version-detect + 'paramiko', ++ 'josepy', + ], + tests_require=[ + 'backports.tempfile;python_version<"3.0"', +diff --git a/wile/__init__.py b/wile/__init__.py +index 944b320..1445d10 100644 +--- a/wile/__init__.py ++++ b/wile/__init__.py +@@ -4,7 +4,7 @@ + + import setuptools_scm + import click +-from acme import jose ++import josepy as jose + from cryptography.hazmat.primitives import serialization + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives.asymmetric import rsa +diff --git a/wile/cert.py b/wile/cert.py +index 4aba7c1..c9fc33b 100644 +--- a/wile/cert.py ++++ b/wile/cert.py +@@ -13,7 +13,7 @@ + from acme import challenges + from acme import messages + from acme import errors +-from acme.jose.util import ComparableX509 ++from josepy.util import ComparableX509 + + from . import reg + from . import argtypes + +From 62e18a5ef30cd1d88dc90ac5df99f9d66bea5eb1 Mon Sep 17 00:00:00 2001 +From: Luka Matijevic +Date: Wed, 14 Feb 2018 14:25:56 +0100 +Subject: [PATCH 2/2] Increased minimal acme version. + +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 5ed1f03..3ad2397 100755 +--- a/setup.py ++++ b/setup.py +@@ -22,7 +22,7 @@ def read(filename): + ], + install_requires=[ + 'six', +- 'acme >= 0.16.0', ++ 'acme >= 0.21.0', + 'click >= 6.0', + 'pyOpenSSL', + 'cryptography', diff --git a/app-crypt/wile/wile-1.0.0.ebuild b/app-crypt/wile/wile-1.0.0.ebuild new file mode 100644 index 0000000..05beb72 --- /dev/null +++ b/app-crypt/wile/wile-1.0.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +inherit distutils-r1 + +DESCRIPTION="Stripped down letsencrypt (ACME) client" +HOMEPAGE="https://github.com/costela/wile" +SRC_URI="https://github.com/costela/wile/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + " +RDEPEND=" + >=app-crypt/acme-0.21[${PYTHON_USEDEP}] + app-crypt/josepy[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/click[${PYTHON_USEDEP}] + dev-python/pyopenssl[${PYTHON_USEDEP}] + dev-python/cryptography[${PYTHON_USEDEP}] + dev-python/paramiko[${PYTHON_USEDEP}] + " + +DOCS=( README.md ) + +PATCHES=( "${FILESDIR}"/${P}-josepy.patch ) -- cgit v1.2.3-65-gdbad