1 |
commit: 95c694bf1aaaf36a73aa92a9b56e96764f6cdb86 |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 20 15:46:04 2018 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Mar 27 04:05:53 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c694bf |
7 |
|
8 |
app-crypt/acme-tiny: Drop old |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
app-crypt/acme-tiny/Manifest | 2 - |
13 |
app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild | 50 ------- |
14 |
app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild | 43 ------ |
15 |
.../files/acme-tiny-4.0.0-PR101-contactinfo.patch | 34 ----- |
16 |
.../files/acme-tiny-PR101-contactinfo.patch | 97 ------------- |
17 |
.../acme-tiny/files/acme-tiny-PR50-setup.py.patch | 150 --------------------- |
18 |
.../acme-tiny/files/acme-tiny-PR87-readmefix.patch | 23 ---- |
19 |
7 files changed, 399 deletions(-) |
20 |
|
21 |
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest |
22 |
index 3f8a4895242..4bc5473e28c 100644 |
23 |
--- a/app-crypt/acme-tiny/Manifest |
24 |
+++ b/app-crypt/acme-tiny/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST acme-tiny-0_p20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700 |
27 |
-DIST acme-tiny-4.0.0.tar.gz 11934 BLAKE2B 2303fcd4e14d75cb7b36426f9ffe7e5f989d886be16b322aea2f8b40937e8c1a850704869570911ff7365a9545f5e41006f4e655ba207db9a7105ec3d59c8c32 SHA512 45f3469fbfa8b57c5755595823a6d08fd977c29d948b618ab6bd9c4feba4910bdcc1540757ba78bcdcd7e01c6f7451f4e8aec951a0ae118ab6597a1714f30691 |
28 |
DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7 |
29 |
|
30 |
diff --git a/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild b/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild |
31 |
deleted file mode 100644 |
32 |
index 5dc8c71c35e..00000000000 |
33 |
--- a/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild |
34 |
+++ /dev/null |
35 |
@@ -1,50 +0,0 @@ |
36 |
-# Copyright 1999-2018 Gentoo Foundation |
37 |
-# Distributed under the terms of the GNU General Public License v2 |
38 |
- |
39 |
-EAPI=6 |
40 |
- |
41 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
42 |
-inherit distutils-r1 |
43 |
- |
44 |
-if [[ ${PV} == 9999 ]]; then |
45 |
- inherit git-r3 |
46 |
- EGIT_REPO_URI="https://github.com/diafygi/${PN}.git" |
47 |
- KEYWORDS="" |
48 |
-elif [[ ${PV} =~ 0_p* ]]; then |
49 |
- HASH="4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32" |
50 |
- SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz" |
51 |
- KEYWORDS="~amd64 ~x86" |
52 |
- S="${WORKDIR}/${PN}-${HASH}" |
53 |
-else |
54 |
- SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
55 |
- KEYWORDS="~amd64 ~x86" |
56 |
-fi |
57 |
- |
58 |
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol" |
59 |
-HOMEPAGE="https://github.com/diafygi/acme-tiny" |
60 |
- |
61 |
-LICENSE="MIT" |
62 |
-SLOT="0" |
63 |
- |
64 |
-IUSE="minimal" |
65 |
- |
66 |
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]" |
67 |
-RDEPEND="dev-libs/openssl:0" |
68 |
- |
69 |
-PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" ) |
70 |
- |
71 |
-pkg_setup() { |
72 |
- if [[ ${PV} != 9999 ]]; then |
73 |
- export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)" |
74 |
- fi |
75 |
-} |
76 |
- |
77 |
-src_prepare() { |
78 |
- if ! use minimal; then |
79 |
- PATCHES+=( |
80 |
- "${FILESDIR}/${PN}-PR87-readmefix.patch" |
81 |
- "${FILESDIR}/${PN}-PR101-contactinfo.patch" |
82 |
- ) |
83 |
- fi |
84 |
- distutils-r1_src_prepare |
85 |
-} |
86 |
|
87 |
diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild |
88 |
deleted file mode 100644 |
89 |
index c36ebd5cd3c..00000000000 |
90 |
--- a/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild |
91 |
+++ /dev/null |
92 |
@@ -1,43 +0,0 @@ |
93 |
-# Copyright 1999-2018 Gentoo Foundation |
94 |
-# Distributed under the terms of the GNU General Public License v2 |
95 |
- |
96 |
-EAPI=6 |
97 |
- |
98 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) |
99 |
-inherit distutils-r1 |
100 |
- |
101 |
-if [[ ${PV} == 9999 ]]; then |
102 |
- inherit git-r3 |
103 |
- EGIT_REPO_URI="https://github.com/diafygi/${PN}.git" |
104 |
- KEYWORDS="" |
105 |
-else |
106 |
- SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
107 |
- KEYWORDS="~amd64 ~x86" |
108 |
-fi |
109 |
- |
110 |
-DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol" |
111 |
-HOMEPAGE="https://github.com/diafygi/acme-tiny" |
112 |
- |
113 |
-LICENSE="MIT" |
114 |
-SLOT="0" |
115 |
- |
116 |
-IUSE="minimal" |
117 |
- |
118 |
-DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]" |
119 |
-RDEPEND="dev-libs/openssl:0" |
120 |
- |
121 |
-pkg_setup() { |
122 |
- if [[ ${PV} != 9999 ]]; then |
123 |
- export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" |
124 |
- fi |
125 |
-} |
126 |
- |
127 |
-src_prepare() { |
128 |
- if ! use minimal; then |
129 |
- local PATCHES=( |
130 |
- "${FILESDIR}/${PN}-PR87-readmefix.patch" |
131 |
- "${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch" |
132 |
- ) |
133 |
- fi |
134 |
- distutils-r1_src_prepare |
135 |
-} |
136 |
|
137 |
diff --git a/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch |
138 |
deleted file mode 100644 |
139 |
index 447ed5f5f9b..00000000000 |
140 |
--- a/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch |
141 |
+++ /dev/null |
142 |
@@ -1,34 +0,0 @@ |
143 |
---- a/acme_tiny.py 2018-03-16 02:37:41.989372265 -0400 |
144 |
-+++ b/acme_tiny.py 2018-03-16 02:53:28.365319918 -0400 |
145 |
-@@ -12,7 +12,7 @@ |
146 |
- LOGGER.addHandler(logging.StreamHandler()) |
147 |
- LOGGER.setLevel(logging.INFO) |
148 |
- |
149 |
--def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL): |
150 |
-+def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL): |
151 |
- directory, acct_headers, alg, jwk = None, None, None, None # global variables |
152 |
- |
153 |
- # helper functions - base64 encode for jose spec |
154 |
-@@ -107,6 +107,8 @@ |
155 |
- # create account and set the global key identifier |
156 |
- log.info("Registering account...") |
157 |
- reg_payload = {"termsOfServiceAgreed": True} |
158 |
-+ if account_email: |
159 |
-+ reg_payload["contact"] = ["mailto:"+account_email] |
160 |
- account, code, acct_headers = _send_signed_request(directory['newAccount'], reg_payload, "Error registering") |
161 |
- log.info("Registered!" if code == 201 else "Already registered!") |
162 |
- |
163 |
-@@ -185,10 +187,12 @@ |
164 |
- parser.add_argument("--disable-check", default=False, action="store_true", help="disable checking if the challenge file is hosted correctly before telling the CA") |
165 |
- parser.add_argument("--directory-url", default=DEFAULT_DIRECTORY_URL, help="certificate authority directory url, default is Let's Encrypt") |
166 |
- parser.add_argument("--ca", default=DEFAULT_CA, help="DEPRECATED! USE --directory-url INSTEAD!") |
167 |
-+ parser.add_argument("--account-email", help="contact e-mail address") |
168 |
- |
169 |
- args = parser.parse_args(argv) |
170 |
- LOGGER.setLevel(args.quiet or LOGGER.level) |
171 |
-- signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca, disable_check=args.disable_check, directory_url=args.directory_url) |
172 |
-+ signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, |
173 |
-+ args.account_email, log=LOGGER, CA=args.ca, disable_check=args.disable_check, directory_url=args.directory_url) |
174 |
- sys.stdout.write(signed_crt) |
175 |
- |
176 |
- if __name__ == "__main__": # pragma: no cover |
177 |
|
178 |
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch |
179 |
deleted file mode 100644 |
180 |
index 63727840d8e..00000000000 |
181 |
--- a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch |
182 |
+++ /dev/null |
183 |
@@ -1,97 +0,0 @@ |
184 |
-From 86083e6f79c6af99a59d8ee27c61f5d9b407f436 Mon Sep 17 00:00:00 2001 |
185 |
-From: Phiber2000 <phiber2000@×××.de> |
186 |
-Date: Thu, 10 Mar 2016 16:43:54 +0100 |
187 |
-Subject: [PATCH 1/3] added contact key in payload and email parameter |
188 |
- |
189 |
---- |
190 |
- acme_tiny.py | 12 ++++++++---- |
191 |
- 1 file changed, 8 insertions(+), 4 deletions(-) |
192 |
- |
193 |
-diff --git a/acme_tiny.py b/acme_tiny.py |
194 |
-index 34a1863..bd79321 100644 |
195 |
---- a/acme_tiny.py |
196 |
-+++ b/acme_tiny.py |
197 |
-@@ -12,7 +12,7 @@ |
198 |
- LOGGER.addHandler(logging.StreamHandler()) |
199 |
- LOGGER.setLevel(logging.INFO) |
200 |
- |
201 |
--def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA): |
202 |
-+def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA): |
203 |
- # helper function base64 encode for jose spec |
204 |
- def _b64(b): |
205 |
- return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "") |
206 |
-@@ -80,10 +80,13 @@ def _send_signed_request(url, payload): |
207 |
- |
208 |
- # get the certificate domains and expiration |
209 |
- log.info("Registering account...") |
210 |
-- code, result = _send_signed_request(CA + "/acme/new-reg", { |
211 |
-+ payload = { |
212 |
- "resource": "new-reg", |
213 |
- "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'], |
214 |
-- }) |
215 |
-+ } |
216 |
-+ if account_email: |
217 |
-+ payload["contact"] = ["mailto:"+account_email] |
218 |
-+ code, result = _send_signed_request(CA + "/acme/new-reg", payload) |
219 |
- if code == 201: |
220 |
- log.info("Registered!") |
221 |
- elif code == 409: |
222 |
-@@ -188,10 +191,11 @@ def main(argv): |
223 |
- parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory") |
224 |
- parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors") |
225 |
- parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt") |
226 |
-+ parser.add_argument("--account-email", help="contact e-mail address") |
227 |
- |
228 |
- args = parser.parse_args(argv) |
229 |
- LOGGER.setLevel(args.quiet or LOGGER.level) |
230 |
-- signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca) |
231 |
-+ signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, args.account_email, log=LOGGER, CA=args.ca) |
232 |
- sys.stdout.write(signed_crt) |
233 |
- |
234 |
- if __name__ == "__main__": # pragma: no cover |
235 |
- |
236 |
-From b128ae1289b106e1ddf20d3787a431d8ea949cf3 Mon Sep 17 00:00:00 2001 |
237 |
-From: Phiber2000 <phiber2000@×××.de> |
238 |
-Date: Thu, 10 Mar 2016 19:27:17 +0100 |
239 |
-Subject: [PATCH 2/3] code style correction |
240 |
- |
241 |
---- |
242 |
- acme_tiny.py | 2 +- |
243 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
244 |
- |
245 |
-diff --git a/acme_tiny.py b/acme_tiny.py |
246 |
-index bd79321..cea57ee 100644 |
247 |
---- a/acme_tiny.py |
248 |
-+++ b/acme_tiny.py |
249 |
-@@ -85,7 +85,7 @@ def _send_signed_request(url, payload): |
250 |
- "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'], |
251 |
- } |
252 |
- if account_email: |
253 |
-- payload["contact"] = ["mailto:"+account_email] |
254 |
-+ payload["contact"] = ["mailto:{0}".format(account_email)] |
255 |
- code, result = _send_signed_request(CA + "/acme/new-reg", payload) |
256 |
- if code == 201: |
257 |
- log.info("Registered!") |
258 |
- |
259 |
-From 90eac8d6f22e858168ead32f00f13e7c997b64fc Mon Sep 17 00:00:00 2001 |
260 |
-From: Phiber2000 <phiber2000@×××.de> |
261 |
-Date: Thu, 10 Mar 2016 19:33:21 +0100 |
262 |
-Subject: [PATCH 3/3] updated email argument helptext |
263 |
- |
264 |
---- |
265 |
- acme_tiny.py | 2 +- |
266 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
267 |
- |
268 |
-diff --git a/acme_tiny.py b/acme_tiny.py |
269 |
-index cea57ee..930cd43 100644 |
270 |
---- a/acme_tiny.py |
271 |
-+++ b/acme_tiny.py |
272 |
-@@ -191,7 +191,7 @@ def main(argv): |
273 |
- parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory") |
274 |
- parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors") |
275 |
- parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt") |
276 |
-- parser.add_argument("--account-email", help="contact e-mail address") |
277 |
-+ parser.add_argument("--account-email", help="set contact e-mail address, leave empty to keep current") |
278 |
- |
279 |
- args = parser.parse_args(argv) |
280 |
- LOGGER.setLevel(args.quiet or LOGGER.level) |
281 |
|
282 |
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch b/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch |
283 |
deleted file mode 100644 |
284 |
index c7e2c08a7c6..00000000000 |
285 |
--- a/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch |
286 |
+++ /dev/null |
287 |
@@ -1,150 +0,0 @@ |
288 |
-From 9bc3865d8c86392ca115ffb64a9389e92e00e861 Mon Sep 17 00:00:00 2001 |
289 |
-From: Jonas Haag <jonas@××××××.org> |
290 |
-Date: Tue, 29 Dec 2015 14:14:49 +0100 |
291 |
-Subject: [PATCH 1/3] Add setup.py |
292 |
- |
293 |
---- |
294 |
- acme_tiny.py | 2 +- |
295 |
- setup.py | 28 ++++++++++++++++++++++++++++ |
296 |
- tests/__init__.py | 1 + |
297 |
- tests/test_install.py | 24 ++++++++++++++++++++++++ |
298 |
- 4 files changed, 54 insertions(+), 1 deletion(-) |
299 |
- create mode 100644 setup.py |
300 |
- create mode 100644 tests/test_install.py |
301 |
- |
302 |
-diff --git a/acme_tiny.py b/acme_tiny.py |
303 |
-index f54db0c..ca9ad3d 100644 |
304 |
---- a/acme_tiny.py |
305 |
-+++ b/acme_tiny.py |
306 |
-@@ -165,7 +165,7 @@ def _send_signed_request(url, payload): |
307 |
- return """-----BEGIN CERTIFICATE-----\n{0}\n-----END CERTIFICATE-----\n""".format( |
308 |
- "\n".join(textwrap.wrap(base64.b64encode(result).decode('utf8'), 64))) |
309 |
- |
310 |
--def main(argv): |
311 |
-+def main(argv=None): |
312 |
- parser = argparse.ArgumentParser( |
313 |
- formatter_class=argparse.RawDescriptionHelpFormatter, |
314 |
- description=textwrap.dedent("""\ |
315 |
-diff --git a/setup.py b/setup.py |
316 |
-new file mode 100644 |
317 |
-index 0000000..9ed597e |
318 |
---- /dev/null |
319 |
-+++ b/setup.py |
320 |
-@@ -0,0 +1,28 @@ |
321 |
-+from setuptools import setup |
322 |
-+ |
323 |
-+setup( |
324 |
-+ name="acme-tiny", |
325 |
-+ version="1.0.0", |
326 |
-+ url="https://github.com/diafygi/acme-tiny", |
327 |
-+ author="Daniel Roesler", |
328 |
-+ author_email="diafygi@×××××.com", |
329 |
-+ description="A tiny script to issue and renew TLS certs from Let's Encrypt", |
330 |
-+ license="MIT", |
331 |
-+ py_modules=['acme_tiny'], |
332 |
-+ entry_points={'console_scripts': [ |
333 |
-+ 'acme-tiny = acme_tiny:main', |
334 |
-+ ]}, |
335 |
-+ classifiers = [ |
336 |
-+ 'Development Status :: 5 - Production/Stable', |
337 |
-+ 'Intended Audience :: System Administrators' |
338 |
-+ 'License :: OSI Approved :: MIT License', |
339 |
-+ 'Operating System :: OS Independent', |
340 |
-+ 'Programming Language :: Python', |
341 |
-+ 'Programming Language :: Python :: 2', |
342 |
-+ 'Programming Language :: Python :: 2.7', |
343 |
-+ 'Programming Language :: Python :: 3', |
344 |
-+ 'Programming Language :: Python :: 3.3', |
345 |
-+ 'Programming Language :: Python :: 3.4', |
346 |
-+ 'Programming Language :: Python :: 3.5', |
347 |
-+ ] |
348 |
-+) |
349 |
-diff --git a/tests/__init__.py b/tests/__init__.py |
350 |
-index ce89619..5ade34c 100644 |
351 |
---- a/tests/__init__.py |
352 |
-+++ b/tests/__init__.py |
353 |
-@@ -1 +1,2 @@ |
354 |
- from .test_module import TestModule |
355 |
-+from .test_install import TestInstall |
356 |
-diff --git a/tests/test_install.py b/tests/test_install.py |
357 |
-new file mode 100644 |
358 |
-index 0000000..005f36c |
359 |
---- /dev/null |
360 |
-+++ b/tests/test_install.py |
361 |
-@@ -0,0 +1,24 @@ |
362 |
-+import unittest |
363 |
-+import os |
364 |
-+import tempfile |
365 |
-+import shutil |
366 |
-+import subprocess |
367 |
-+ |
368 |
-+ |
369 |
-+class TestInstall(unittest.TestCase): |
370 |
-+ def setUp(self): |
371 |
-+ self.tempdir = tempfile.mkdtemp() |
372 |
-+ subprocess.check_call(["virtualenv", self.tempdir]) |
373 |
-+ |
374 |
-+ def tearDown(self): |
375 |
-+ shutil.rmtree(self.tempdir) |
376 |
-+ |
377 |
-+ def virtualenv_bin(self, cmd): |
378 |
-+ return os.path.join(self.tempdir, "bin", cmd) |
379 |
-+ |
380 |
-+ def test_install(self): |
381 |
-+ subprocess.check_call([self.virtualenv_bin("python"), "setup.py", "install"]) |
382 |
-+ |
383 |
-+ def test_cli(self): |
384 |
-+ self.test_install() |
385 |
-+ subprocess.check_call([self.virtualenv_bin("acme-tiny"), "-h"]) |
386 |
- |
387 |
-From cdf1bde83d6b640a8896722557386b6d9b6a9fbb Mon Sep 17 00:00:00 2001 |
388 |
-From: Rob Speed <speed.rob@×××××.com> |
389 |
-Date: Wed, 10 Feb 2016 21:53:24 -0500 |
390 |
-Subject: [PATCH 2/3] Added setuptools_scm for automatic versioning based on |
391 |
- tags. |
392 |
- |
393 |
---- |
394 |
- setup.py | 3 ++- |
395 |
- 1 file changed, 2 insertions(+), 1 deletion(-) |
396 |
- |
397 |
-diff --git a/setup.py b/setup.py |
398 |
-index 9ed597e..7ec7ef1 100644 |
399 |
---- a/setup.py |
400 |
-+++ b/setup.py |
401 |
-@@ -2,7 +2,7 @@ |
402 |
- |
403 |
- setup( |
404 |
- name="acme-tiny", |
405 |
-- version="1.0.0", |
406 |
-+ use_scm_version=True, |
407 |
- url="https://github.com/diafygi/acme-tiny", |
408 |
- author="Daniel Roesler", |
409 |
- author_email="diafygi@×××××.com", |
410 |
-@@ -12,6 +12,7 @@ |
411 |
- entry_points={'console_scripts': [ |
412 |
- 'acme-tiny = acme_tiny:main', |
413 |
- ]}, |
414 |
-+ setup_requires=['setuptools_scm'], |
415 |
- classifiers = [ |
416 |
- 'Development Status :: 5 - Production/Stable', |
417 |
- 'Intended Audience :: System Administrators' |
418 |
- |
419 |
-From edcaee1fa841d49a3fa488288faa8e6573269413 Mon Sep 17 00:00:00 2001 |
420 |
-From: Matthias Bach <marix@×××××.org> |
421 |
-Date: Mon, 22 Feb 2016 22:53:06 +0100 |
422 |
-Subject: [PATCH 3/3] Mark wheels of acme-tiny as universal |
423 |
- |
424 |
-Ensure that wheels created from the acme-tiny source are marked as universal. |
425 |
---- |
426 |
- setup.cfg | 2 ++ |
427 |
- 1 file changed, 2 insertions(+) |
428 |
- create mode 100644 setup.cfg |
429 |
- |
430 |
-diff --git a/setup.cfg b/setup.cfg |
431 |
-new file mode 100644 |
432 |
-index 0000000..434559d |
433 |
---- /dev/null |
434 |
-+++ b/setup.cfg |
435 |
-@@ -0,0 +1,2 @@ |
436 |
-+[wheel] |
437 |
-+universal=True |
438 |
|
439 |
diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch b/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch |
440 |
deleted file mode 100644 |
441 |
index 1f576d50c75..00000000000 |
442 |
--- a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch |
443 |
+++ /dev/null |
444 |
@@ -1,23 +0,0 @@ |
445 |
-From 85df9d1217341893ab6dbbe58fb7c878e15d832b Mon Sep 17 00:00:00 2001 |
446 |
-From: Jakub Wilk <jwilk@×××××.net> |
447 |
-Date: Wed, 24 Feb 2016 22:10:01 +0100 |
448 |
-Subject: [PATCH] renew_cert.sh: fix unusual shebang |
449 |
- |
450 |
-sh is normally lives in /bin, not in /usr/bin. |
451 |
---- |
452 |
- README.md | 2 +- |
453 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
454 |
- |
455 |
-diff --git a/README.md b/README.md |
456 |
-index dfa562c..5c83a67 100644 |
457 |
---- a/README.md |
458 |
-+++ b/README.md |
459 |
-@@ -171,7 +171,7 @@ for example script). |
460 |
- |
461 |
- Example of a `renew_cert.sh`: |
462 |
- ```sh |
463 |
--#!/usr/bin/sh |
464 |
-+#!/bin/sh |
465 |
- python /path/to/acme_tiny.py --account-key /path/to/account.key --csr /path/to/domain.csr --acme-dir /var/www/challenges/ > /tmp/signed.crt || exit |
466 |
- wget -O - https://letsencrypt.org/certs/lets-encrypt-x1-cross-signed.pem > intermediate.pem |
467 |
- cat /tmp/signed.crt intermediate.pem > /path/to/chained.pem |