1 |
commit: ec12b876de23f719afe476d61b3820ec8aa13902 |
2 |
Author: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Feb 18 18:40:56 2018 +0000 |
4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Feb 18 18:40:56 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=ec12b876 |
7 |
|
8 |
app-crypt/wile: 1.0.0 |
9 |
|
10 |
app-crypt/wile/files/wile-1.0.0-josepy.patch | 80 ++++++++++++++++++++++++++++ |
11 |
app-crypt/wile/wile-1.0.0.ebuild | 33 ++++++++++++ |
12 |
2 files changed, 113 insertions(+) |
13 |
|
14 |
diff --git a/app-crypt/wile/files/wile-1.0.0-josepy.patch b/app-crypt/wile/files/wile-1.0.0-josepy.patch |
15 |
new file mode 100644 |
16 |
index 0000000..04382c8 |
17 |
--- /dev/null |
18 |
+++ b/app-crypt/wile/files/wile-1.0.0-josepy.patch |
19 |
@@ -0,0 +1,80 @@ |
20 |
+From 4a7df693b83dbf8d1d3c5245ad9725e98d24b027 Mon Sep 17 00:00:00 2001 |
21 |
+From: Luka Matijevic <lumatijev@×××××.com> |
22 |
+Date: Tue, 13 Feb 2018 13:50:55 +0100 |
23 |
+Subject: [PATCH 1/2] Fix JOSE dependency |
24 |
+ |
25 |
+Starting with ACME version 0.21.0 implementation for JOSE was split out |
26 |
+of ACME library into a separate package named josepy. |
27 |
+ |
28 |
+Added josepy as a dependency to setup.py and fixed code according to |
29 |
+this changes. |
30 |
+ |
31 |
+https://pypi.python.org/pypi/josepy |
32 |
+https://github.com/certbot/josepy |
33 |
+--- |
34 |
+ setup.py | 1 + |
35 |
+ wile/__init__.py | 2 +- |
36 |
+ wile/cert.py | 2 +- |
37 |
+ 3 files changed, 3 insertions(+), 2 deletions(-) |
38 |
+ |
39 |
+diff --git a/setup.py b/setup.py |
40 |
+index 7a8dc8d..5ed1f03 100755 |
41 |
+--- a/setup.py |
42 |
++++ b/setup.py |
43 |
+@@ -28,6 +28,7 @@ def read(filename): |
44 |
+ 'cryptography', |
45 |
+ 'setuptools_scm', # for run-time version-detect |
46 |
+ 'paramiko', |
47 |
++ 'josepy', |
48 |
+ ], |
49 |
+ tests_require=[ |
50 |
+ 'backports.tempfile;python_version<"3.0"', |
51 |
+diff --git a/wile/__init__.py b/wile/__init__.py |
52 |
+index 944b320..1445d10 100644 |
53 |
+--- a/wile/__init__.py |
54 |
++++ b/wile/__init__.py |
55 |
+@@ -4,7 +4,7 @@ |
56 |
+ |
57 |
+ import setuptools_scm |
58 |
+ import click |
59 |
+-from acme import jose |
60 |
++import josepy as jose |
61 |
+ from cryptography.hazmat.primitives import serialization |
62 |
+ from cryptography.hazmat.backends import default_backend |
63 |
+ from cryptography.hazmat.primitives.asymmetric import rsa |
64 |
+diff --git a/wile/cert.py b/wile/cert.py |
65 |
+index 4aba7c1..c9fc33b 100644 |
66 |
+--- a/wile/cert.py |
67 |
++++ b/wile/cert.py |
68 |
+@@ -13,7 +13,7 @@ |
69 |
+ from acme import challenges |
70 |
+ from acme import messages |
71 |
+ from acme import errors |
72 |
+-from acme.jose.util import ComparableX509 |
73 |
++from josepy.util import ComparableX509 |
74 |
+ |
75 |
+ from . import reg |
76 |
+ from . import argtypes |
77 |
+ |
78 |
+From 62e18a5ef30cd1d88dc90ac5df99f9d66bea5eb1 Mon Sep 17 00:00:00 2001 |
79 |
+From: Luka Matijevic <lumatijev@×××××.com> |
80 |
+Date: Wed, 14 Feb 2018 14:25:56 +0100 |
81 |
+Subject: [PATCH 2/2] Increased minimal acme version. |
82 |
+ |
83 |
+--- |
84 |
+ setup.py | 2 +- |
85 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
86 |
+ |
87 |
+diff --git a/setup.py b/setup.py |
88 |
+index 5ed1f03..3ad2397 100755 |
89 |
+--- a/setup.py |
90 |
++++ b/setup.py |
91 |
+@@ -22,7 +22,7 @@ def read(filename): |
92 |
+ ], |
93 |
+ install_requires=[ |
94 |
+ 'six', |
95 |
+- 'acme >= 0.16.0', |
96 |
++ 'acme >= 0.21.0', |
97 |
+ 'click >= 6.0', |
98 |
+ 'pyOpenSSL', |
99 |
+ 'cryptography', |
100 |
|
101 |
diff --git a/app-crypt/wile/wile-1.0.0.ebuild b/app-crypt/wile/wile-1.0.0.ebuild |
102 |
new file mode 100644 |
103 |
index 0000000..05beb72 |
104 |
--- /dev/null |
105 |
+++ b/app-crypt/wile/wile-1.0.0.ebuild |
106 |
@@ -0,0 +1,33 @@ |
107 |
+# Copyright 1999-2018 Gentoo Foundation |
108 |
+# Distributed under the terms of the GNU General Public License v2 |
109 |
+ |
110 |
+EAPI=6 |
111 |
+ |
112 |
+PYTHON_COMPAT=( python2_7 ) |
113 |
+inherit distutils-r1 |
114 |
+ |
115 |
+DESCRIPTION="Stripped down letsencrypt (ACME) client" |
116 |
+HOMEPAGE="https://github.com/costela/wile" |
117 |
+SRC_URI="https://github.com/costela/wile/archive/${PV}.tar.gz -> ${P}.tar.gz" |
118 |
+ |
119 |
+LICENSE="GPL-3" |
120 |
+SLOT="0" |
121 |
+KEYWORDS="~amd64 ~x86" |
122 |
+IUSE="" |
123 |
+ |
124 |
+DEPEND=" |
125 |
+ dev-python/setuptools_scm[${PYTHON_USEDEP}] |
126 |
+ " |
127 |
+RDEPEND=" |
128 |
+ >=app-crypt/acme-0.21[${PYTHON_USEDEP}] |
129 |
+ app-crypt/josepy[${PYTHON_USEDEP}] |
130 |
+ dev-python/six[${PYTHON_USEDEP}] |
131 |
+ dev-python/click[${PYTHON_USEDEP}] |
132 |
+ dev-python/pyopenssl[${PYTHON_USEDEP}] |
133 |
+ dev-python/cryptography[${PYTHON_USEDEP}] |
134 |
+ dev-python/paramiko[${PYTHON_USEDEP}] |
135 |
+ " |
136 |
+ |
137 |
+DOCS=( README.md ) |
138 |
+ |
139 |
+PATCHES=( "${FILESDIR}"/${P}-josepy.patch ) |