diff options
| -rw-r--r-- | app-crypt/acme-tiny/Manifest | 2 | ||||
| -rw-r--r-- | app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild | 50 | ||||
| -rw-r--r-- | app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild | 43 | ||||
| -rw-r--r-- | app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch | 34 | ||||
| -rw-r--r-- | app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch | 97 | ||||
| -rw-r--r-- | app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch | 150 | ||||
| -rw-r--r-- | app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch | 23 |
7 files changed, 0 insertions, 399 deletions
diff --git a/app-crypt/acme-tiny/Manifest b/app-crypt/acme-tiny/Manifest index 3f8a48952427..4bc5473e28cd 100644 --- a/app-crypt/acme-tiny/Manifest +++ b/app-crypt/acme-tiny/Manifest @@ -1,3 +1 @@ -DIST acme-tiny-0_p20170917.tar.gz 10516 BLAKE2B e9d4ae170579cd5379dbb4d900d051bc1789ac994eb491aafb9952cd004b3e3feed20ef505f88587035f3f16163e7965a1b3883caaaa8c2327fca6be0240a17f SHA512 0bfb0d064f21f9d89e3c5863f33c7326c02948a42e2c8dc11c7b5baaf5e0dfcaeba0ad461b2ad12e292cc14f64b44f331f11b56dda6592a4663baf0714048700 -DIST acme-tiny-4.0.0.tar.gz 11934 BLAKE2B 2303fcd4e14d75cb7b36426f9ffe7e5f989d886be16b322aea2f8b40937e8c1a850704869570911ff7365a9545f5e41006f4e655ba207db9a7105ec3d59c8c32 SHA512 45f3469fbfa8b57c5755595823a6d08fd977c29d948b618ab6bd9c4feba4910bdcc1540757ba78bcdcd7e01c6f7451f4e8aec951a0ae118ab6597a1714f30691 DIST acme-tiny-4.0.3.tar.gz 12662 BLAKE2B 6a17d0597731a5c8c1b260fa47396cb5bf8a223f44c8e498532b6e90a2ded35c5fcae058a8682e59ab060c1eeb27e09c8db8588e1d72cfd75b65f867d3e94f9a SHA512 bd37d4f878f2851c8e88acb78699b855cfd306928e2d70ef1d35dc9883d44dae3c7622e2114b1d5c4e0c5865b61ad3958a776467ab45eaedb0cf612530ca5dc7 diff --git a/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild b/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild deleted file mode 100644 index 5dc8c71c35e5..000000000000 --- a/app-crypt/acme-tiny/acme-tiny-0_p20170917.ebuild +++ /dev/null @@ -1,50 +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} ) -inherit distutils-r1 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/diafygi/${PN}.git" - KEYWORDS="" -elif [[ ${PV} =~ 0_p* ]]; then - HASH="4ed13950c0a9cf61f1ca81ff1874cde1cf48ab32" - SRC_URI="https://github.com/diafygi/${PN}/archive/${HASH}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${PN}-${HASH}" -else - SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol" -HOMEPAGE="https://github.com/diafygi/acme-tiny" - -LICENSE="MIT" -SLOT="0" - -IUSE="minimal" - -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]" -RDEPEND="dev-libs/openssl:0" - -PATCHES=( "${FILESDIR}/${PN}-PR50-setup.py.patch" ) - -pkg_setup() { - if [[ ${PV} != 9999 ]]; then - export SETUPTOOLS_SCM_PRETEND_VERSION="0.1.dev79+n${HASH:0:7}.d$(date +%Y%m%d)" - fi -} - -src_prepare() { - if ! use minimal; then - PATCHES+=( - "${FILESDIR}/${PN}-PR87-readmefix.patch" - "${FILESDIR}/${PN}-PR101-contactinfo.patch" - ) - fi - distutils-r1_src_prepare -} diff --git a/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild b/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild deleted file mode 100644 index c36ebd5cd3c8..000000000000 --- a/app-crypt/acme-tiny/acme-tiny-4.0.0.ebuild +++ /dev/null @@ -1,43 +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} ) -inherit distutils-r1 - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/diafygi/${PN}.git" - KEYWORDS="" -else - SRC_URI="https://github.com/diafygi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="A tiny, auditable script for Let's Encrypt's ACME Protocol" -HOMEPAGE="https://github.com/diafygi/acme-tiny" - -LICENSE="MIT" -SLOT="0" - -IUSE="minimal" - -DEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]" -RDEPEND="dev-libs/openssl:0" - -pkg_setup() { - if [[ ${PV} != 9999 ]]; then - export SETUPTOOLS_SCM_PRETEND_VERSION="${PV}" - fi -} - -src_prepare() { - if ! use minimal; then - local PATCHES=( - "${FILESDIR}/${PN}-PR87-readmefix.patch" - "${FILESDIR}/${PN}-4.0.0-PR101-contactinfo.patch" - ) - fi - distutils-r1_src_prepare -} 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 deleted file mode 100644 index 447ed5f5f9b5..000000000000 --- a/app-crypt/acme-tiny/files/acme-tiny-4.0.0-PR101-contactinfo.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/acme_tiny.py 2018-03-16 02:37:41.989372265 -0400 -+++ b/acme_tiny.py 2018-03-16 02:53:28.365319918 -0400 -@@ -12,7 +12,7 @@ - LOGGER.addHandler(logging.StreamHandler()) - LOGGER.setLevel(logging.INFO) - --def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL): -+def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA, disable_check=False, directory_url=DEFAULT_DIRECTORY_URL): - directory, acct_headers, alg, jwk = None, None, None, None # global variables - - # helper functions - base64 encode for jose spec -@@ -107,6 +107,8 @@ - # create account and set the global key identifier - log.info("Registering account...") - reg_payload = {"termsOfServiceAgreed": True} -+ if account_email: -+ reg_payload["contact"] = ["mailto:"+account_email] - account, code, acct_headers = _send_signed_request(directory['newAccount'], reg_payload, "Error registering") - log.info("Registered!" if code == 201 else "Already registered!") - -@@ -185,10 +187,12 @@ - parser.add_argument("--disable-check", default=False, action="store_true", help="disable checking if the challenge file is hosted correctly before telling the CA") - parser.add_argument("--directory-url", default=DEFAULT_DIRECTORY_URL, help="certificate authority directory url, default is Let's Encrypt") - parser.add_argument("--ca", default=DEFAULT_CA, help="DEPRECATED! USE --directory-url INSTEAD!") -+ parser.add_argument("--account-email", help="contact e-mail address") - - args = parser.parse_args(argv) - LOGGER.setLevel(args.quiet or LOGGER.level) -- 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) -+ signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, -+ args.account_email, log=LOGGER, CA=args.ca, disable_check=args.disable_check, directory_url=args.directory_url) - sys.stdout.write(signed_crt) - - if __name__ == "__main__": # pragma: no cover diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch b/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch deleted file mode 100644 index 63727840d8e3..000000000000 --- a/app-crypt/acme-tiny/files/acme-tiny-PR101-contactinfo.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 86083e6f79c6af99a59d8ee27c61f5d9b407f436 Mon Sep 17 00:00:00 2001 -From: Phiber2000 <phiber2000@gmx.de> -Date: Thu, 10 Mar 2016 16:43:54 +0100 -Subject: [PATCH 1/3] added contact key in payload and email parameter - ---- - acme_tiny.py | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/acme_tiny.py b/acme_tiny.py -index 34a1863..bd79321 100644 ---- a/acme_tiny.py -+++ b/acme_tiny.py -@@ -12,7 +12,7 @@ - LOGGER.addHandler(logging.StreamHandler()) - LOGGER.setLevel(logging.INFO) - --def get_crt(account_key, csr, acme_dir, log=LOGGER, CA=DEFAULT_CA): -+def get_crt(account_key, csr, acme_dir, account_email, log=LOGGER, CA=DEFAULT_CA): - # helper function base64 encode for jose spec - def _b64(b): - return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "") -@@ -80,10 +80,13 @@ def _send_signed_request(url, payload): - - # get the certificate domains and expiration - log.info("Registering account...") -- code, result = _send_signed_request(CA + "/acme/new-reg", { -+ payload = { - "resource": "new-reg", - "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'], -- }) -+ } -+ if account_email: -+ payload["contact"] = ["mailto:"+account_email] -+ code, result = _send_signed_request(CA + "/acme/new-reg", payload) - if code == 201: - log.info("Registered!") - elif code == 409: -@@ -188,10 +191,11 @@ def main(argv): - parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory") - parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors") - parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt") -+ parser.add_argument("--account-email", help="contact e-mail address") - - args = parser.parse_args(argv) - LOGGER.setLevel(args.quiet or LOGGER.level) -- signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, log=LOGGER, CA=args.ca) -+ signed_crt = get_crt(args.account_key, args.csr, args.acme_dir, args.account_email, log=LOGGER, CA=args.ca) - sys.stdout.write(signed_crt) - - if __name__ == "__main__": # pragma: no cover - -From b128ae1289b106e1ddf20d3787a431d8ea949cf3 Mon Sep 17 00:00:00 2001 -From: Phiber2000 <phiber2000@gmx.de> -Date: Thu, 10 Mar 2016 19:27:17 +0100 -Subject: [PATCH 2/3] code style correction - ---- - acme_tiny.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/acme_tiny.py b/acme_tiny.py -index bd79321..cea57ee 100644 ---- a/acme_tiny.py -+++ b/acme_tiny.py -@@ -85,7 +85,7 @@ def _send_signed_request(url, payload): - "agreement": json.loads(urlopen(CA + "/directory").read().decode('utf8'))['meta']['terms-of-service'], - } - if account_email: -- payload["contact"] = ["mailto:"+account_email] -+ payload["contact"] = ["mailto:{0}".format(account_email)] - code, result = _send_signed_request(CA + "/acme/new-reg", payload) - if code == 201: - log.info("Registered!") - -From 90eac8d6f22e858168ead32f00f13e7c997b64fc Mon Sep 17 00:00:00 2001 -From: Phiber2000 <phiber2000@gmx.de> -Date: Thu, 10 Mar 2016 19:33:21 +0100 -Subject: [PATCH 3/3] updated email argument helptext - ---- - acme_tiny.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/acme_tiny.py b/acme_tiny.py -index cea57ee..930cd43 100644 ---- a/acme_tiny.py -+++ b/acme_tiny.py -@@ -191,7 +191,7 @@ def main(argv): - parser.add_argument("--acme-dir", required=True, help="path to the .well-known/acme-challenge/ directory") - parser.add_argument("--quiet", action="store_const", const=logging.ERROR, help="suppress output except for errors") - parser.add_argument("--ca", default=DEFAULT_CA, help="certificate authority, default is Let's Encrypt") -- parser.add_argument("--account-email", help="contact e-mail address") -+ parser.add_argument("--account-email", help="set contact e-mail address, leave empty to keep current") - - args = parser.parse_args(argv) - LOGGER.setLevel(args.quiet or LOGGER.level) 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 deleted file mode 100644 index c7e2c08a7c6e..000000000000 --- a/app-crypt/acme-tiny/files/acme-tiny-PR50-setup.py.patch +++ /dev/null @@ -1,150 +0,0 @@ -From 9bc3865d8c86392ca115ffb64a9389e92e00e861 Mon Sep 17 00:00:00 2001 -From: Jonas Haag <jonas@lophus.org> -Date: Tue, 29 Dec 2015 14:14:49 +0100 -Subject: [PATCH 1/3] Add setup.py - ---- - acme_tiny.py | 2 +- - setup.py | 28 ++++++++++++++++++++++++++++ - tests/__init__.py | 1 + - tests/test_install.py | 24 ++++++++++++++++++++++++ - 4 files changed, 54 insertions(+), 1 deletion(-) - create mode 100644 setup.py - create mode 100644 tests/test_install.py - -diff --git a/acme_tiny.py b/acme_tiny.py -index f54db0c..ca9ad3d 100644 ---- a/acme_tiny.py -+++ b/acme_tiny.py -@@ -165,7 +165,7 @@ def _send_signed_request(url, payload): - return """-----BEGIN CERTIFICATE-----\n{0}\n-----END CERTIFICATE-----\n""".format( - "\n".join(textwrap.wrap(base64.b64encode(result).decode('utf8'), 64))) - --def main(argv): -+def main(argv=None): - parser = argparse.ArgumentParser( - formatter_class=argparse.RawDescriptionHelpFormatter, - description=textwrap.dedent("""\ -diff --git a/setup.py b/setup.py -new file mode 100644 -index 0000000..9ed597e ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,28 @@ -+from setuptools import setup -+ -+setup( -+ name="acme-tiny", -+ version="1.0.0", -+ url="https://github.com/diafygi/acme-tiny", -+ author="Daniel Roesler", -+ author_email="diafygi@gmail.com", -+ description="A tiny script to issue and renew TLS certs from Let's Encrypt", -+ license="MIT", -+ py_modules=['acme_tiny'], -+ entry_points={'console_scripts': [ -+ 'acme-tiny = acme_tiny:main', -+ ]}, -+ classifiers = [ -+ 'Development Status :: 5 - Production/Stable', -+ 'Intended Audience :: System Administrators' -+ 'License :: OSI Approved :: MIT License', -+ 'Operating System :: OS Independent', -+ 'Programming Language :: Python', -+ 'Programming Language :: Python :: 2', -+ 'Programming Language :: Python :: 2.7', -+ 'Programming Language :: Python :: 3', -+ 'Programming Language :: Python :: 3.3', -+ 'Programming Language :: Python :: 3.4', -+ 'Programming Language :: Python :: 3.5', -+ ] -+) -diff --git a/tests/__init__.py b/tests/__init__.py -index ce89619..5ade34c 100644 ---- a/tests/__init__.py -+++ b/tests/__init__.py -@@ -1 +1,2 @@ - from .test_module import TestModule -+from .test_install import TestInstall -diff --git a/tests/test_install.py b/tests/test_install.py -new file mode 100644 -index 0000000..005f36c ---- /dev/null -+++ b/tests/test_install.py -@@ -0,0 +1,24 @@ -+import unittest -+import os -+import tempfile -+import shutil -+import subprocess -+ -+ -+class TestInstall(unittest.TestCase): -+ def setUp(self): -+ self.tempdir = tempfile.mkdtemp() -+ subprocess.check_call(["virtualenv", self.tempdir]) -+ -+ def tearDown(self): -+ shutil.rmtree(self.tempdir) -+ -+ def virtualenv_bin(self, cmd): -+ return os.path.join(self.tempdir, "bin", cmd) -+ -+ def test_install(self): -+ subprocess.check_call([self.virtualenv_bin("python"), "setup.py", "install"]) -+ -+ def test_cli(self): -+ self.test_install() -+ subprocess.check_call([self.virtualenv_bin("acme-tiny"), "-h"]) - -From cdf1bde83d6b640a8896722557386b6d9b6a9fbb Mon Sep 17 00:00:00 2001 -From: Rob Speed <speed.rob@gmail.com> -Date: Wed, 10 Feb 2016 21:53:24 -0500 -Subject: [PATCH 2/3] Added setuptools_scm for automatic versioning based on - tags. - ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 9ed597e..7ec7ef1 100644 ---- a/setup.py -+++ b/setup.py -@@ -2,7 +2,7 @@ - - setup( - name="acme-tiny", -- version="1.0.0", -+ use_scm_version=True, - url="https://github.com/diafygi/acme-tiny", - author="Daniel Roesler", - author_email="diafygi@gmail.com", -@@ -12,6 +12,7 @@ - entry_points={'console_scripts': [ - 'acme-tiny = acme_tiny:main', - ]}, -+ setup_requires=['setuptools_scm'], - classifiers = [ - 'Development Status :: 5 - Production/Stable', - 'Intended Audience :: System Administrators' - -From edcaee1fa841d49a3fa488288faa8e6573269413 Mon Sep 17 00:00:00 2001 -From: Matthias Bach <marix@marix.org> -Date: Mon, 22 Feb 2016 22:53:06 +0100 -Subject: [PATCH 3/3] Mark wheels of acme-tiny as universal - -Ensure that wheels created from the acme-tiny source are marked as universal. ---- - setup.cfg | 2 ++ - 1 file changed, 2 insertions(+) - create mode 100644 setup.cfg - -diff --git a/setup.cfg b/setup.cfg -new file mode 100644 -index 0000000..434559d ---- /dev/null -+++ b/setup.cfg -@@ -0,0 +1,2 @@ -+[wheel] -+universal=True diff --git a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch b/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch deleted file mode 100644 index 1f576d50c755..000000000000 --- a/app-crypt/acme-tiny/files/acme-tiny-PR87-readmefix.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 85df9d1217341893ab6dbbe58fb7c878e15d832b Mon Sep 17 00:00:00 2001 -From: Jakub Wilk <jwilk@jwilk.net> -Date: Wed, 24 Feb 2016 22:10:01 +0100 -Subject: [PATCH] renew_cert.sh: fix unusual shebang - -sh is normally lives in /bin, not in /usr/bin. ---- - README.md | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/README.md b/README.md -index dfa562c..5c83a67 100644 ---- a/README.md -+++ b/README.md -@@ -171,7 +171,7 @@ for example script). - - Example of a `renew_cert.sh`: - ```sh --#!/usr/bin/sh -+#!/bin/sh - 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 - wget -O - https://letsencrypt.org/certs/lets-encrypt-x1-cross-signed.pem > intermediate.pem - cat /tmp/signed.crt intermediate.pem > /path/to/chained.pem |