From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36C431382C5 for ; Mon, 26 Feb 2018 21:01:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5AEA0E0A68; Mon, 26 Feb 2018 21:01:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28620E0A68 for ; Mon, 26 Feb 2018 21:01:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 93363335C0A for ; Mon, 26 Feb 2018 21:01:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6DC461D8 for ; Mon, 26 Feb 2018 21:01:04 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1519678645.c2f9d35351adc0d54d70b664a7136b0a03427d3f.sping@gentoo> Subject: [gentoo-commits] proj/betagarden:master commit in: app-crypt/wile/, app-crypt/wile/files/ X-VCS-Repository: proj/betagarden X-VCS-Files: app-crypt/wile/files/wile-0.3.1-setup.patch app-crypt/wile/files/wile-1.0.0-fix-webroot.patch app-crypt/wile/files/wile-1.0.0-josepy.patch app-crypt/wile/wile-0.3.1.ebuild app-crypt/wile/wile-0.3.2.ebuild app-crypt/wile/wile-1.0.0-r1.ebuild app-crypt/wile/wile-1.0.1.ebuild X-VCS-Directories: app-crypt/wile/ app-crypt/wile/files/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: c2f9d35351adc0d54d70b664a7136b0a03427d3f X-VCS-Branch: master Date: Mon, 26 Feb 2018 21:01:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 507808e9-a2e5-4eee-925e-3e4b70cc2ef0 X-Archives-Hash: bc9ca9fb16db9eea0d0ff79d8b8fafbe commit: c2f9d35351adc0d54d70b664a7136b0a03427d3f Author: Sebastian Pipping gentoo org> AuthorDate: Mon Feb 26 20:57:25 2018 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Mon Feb 26 20:57:25 2018 +0000 URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=c2f9d353 app-crypt/wile: 1.0.1, remove old app-crypt/wile/files/wile-0.3.1-setup.patch | 46 ------------- app-crypt/wile/files/wile-1.0.0-fix-webroot.patch | 39 ----------- app-crypt/wile/files/wile-1.0.0-josepy.patch | 80 ---------------------- app-crypt/wile/wile-0.3.1.ebuild | 31 --------- app-crypt/wile/wile-0.3.2.ebuild | 29 -------- .../{wile-1.0.0-r1.ebuild => wile-1.0.1.ebuild} | 4 -- 6 files changed, 229 deletions(-) diff --git a/app-crypt/wile/files/wile-0.3.1-setup.patch b/app-crypt/wile/files/wile-0.3.1-setup.patch deleted file mode 100644 index 76072b4..0000000 --- a/app-crypt/wile/files/wile-0.3.1-setup.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 120fbe77e695c39744e4e620e24aa57585f5ee57 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Fri, 24 Feb 2017 19:56:34 +0100 -Subject: [PATCH] Fix "./setup.py build" for when there is no .git around - ---- - setup.py | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/setup.py b/setup.py -index 3ed03c2..cfce972 100755 ---- a/setup.py -+++ b/setup.py -@@ -1,15 +1,14 @@ - #!/usr/bin/python - import os -+import sys - from setuptools import setup - - - def read(filename): - return open(os.path.join(os.path.dirname(__file__), filename)).read() - --setup( -+config = dict( - name="wile", -- use_scm_version=True, -- setup_requires=['setuptools_scm'], - author="Leo Antunes", - author_email="leo@costela.net", - description=("A stripped down Let's Encrypt (ACME) client"), -@@ -42,3 +41,11 @@ setup( - 'Topic :: Utilities', - ], - ) -+ -+if 'sdist' in sys.argv: -+ config.update(dict( -+ use_scm_version=True, -+ setup_requires=['setuptools_scm'], -+ )) -+ -+setup(**config) --- -2.11.1 - diff --git a/app-crypt/wile/files/wile-1.0.0-fix-webroot.patch b/app-crypt/wile/files/wile-1.0.0-fix-webroot.patch deleted file mode 100644 index 39c9d30..0000000 --- a/app-crypt/wile/files/wile-1.0.0-fix-webroot.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f6d355f14363ed3ce6bf44d4d9ab3140bc0ec247 Mon Sep 17 00:00:00 2001 -From: Sebastian Pipping -Date: Mon, 19 Feb 2018 20:21:24 +0100 -Subject: [PATCH] Fix storing of webroot validation for local folders (issue - #32) - -Function os.open was used with the signature of __builtin__.open. -So string mode "wb" ended up as the flags parameter to os.open, -resulting in "TypeError: an integer is required". ---- - wile/cert.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wile/cert.py b/wile/cert.py -index c9fc33b..f8b85aa 100644 ---- a/wile/cert.py -+++ b/wile/cert.py -@@ -262,6 +262,7 @@ def _store_webroot_validation(ctx, webroot, ssh_private_key, challb, val): - raise - - chall_mod = os -+ chall_open = open - else: - sftp = sftp_helper.cachedSFTPfactory(user=webroot.remote_user, host=webroot.remote_host, - port=webroot.remote_port, private_key=ssh_private_key) -@@ -269,8 +270,9 @@ def _store_webroot_validation(ctx, webroot, ssh_private_key, challb, val): - sftp.makedirs(os.path.join(webroot.path, challb.URI_ROOT_PATH)) - - chall_mod = sftp -+ chall_open = chall_mod.open - -- with chall_mod.open(chall_path, 'wb') as outf: -+ with chall_open(chall_path, 'wb') as outf: - logger.info('storing validation to %s', os.path.basename(chall_path)) - outf.write(b(val)) - # TODO: this may cause a race-condition with paramiko teardown code. --- -2.16.1 - diff --git a/app-crypt/wile/files/wile-1.0.0-josepy.patch b/app-crypt/wile/files/wile-1.0.0-josepy.patch deleted file mode 100644 index 04382c8..0000000 --- a/app-crypt/wile/files/wile-1.0.0-josepy.patch +++ /dev/null @@ -1,80 +0,0 @@ -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-0.3.1.ebuild b/app-crypt/wile/wile-0.3.1.ebuild deleted file mode 100644 index e70d9a3..0000000 --- a/app-crypt/wile/wile-0.3.1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2017 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/six[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - " -RDEPEND="${DEPEND} - >=app-crypt/acme-0.6[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] - " - -DOCS=( README.md ) - -PATCHES=( "${FILESDIR}"/${P}-setup.patch ) diff --git a/app-crypt/wile/wile-0.3.2.ebuild b/app-crypt/wile/wile-0.3.2.ebuild deleted file mode 100644 index ac538f6..0000000 --- a/app-crypt/wile/wile-0.3.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2017 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/six[${PYTHON_USEDEP}] - dev-python/click[${PYTHON_USEDEP}] - dev-python/pyopenssl[${PYTHON_USEDEP}] - dev-python/cryptography[${PYTHON_USEDEP}] - " -RDEPEND="${DEPEND} - >=app-crypt/acme-0.6[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] - " - -DOCS=( README.md ) diff --git a/app-crypt/wile/wile-1.0.0-r1.ebuild b/app-crypt/wile/wile-1.0.1.ebuild similarity index 90% rename from app-crypt/wile/wile-1.0.0-r1.ebuild rename to app-crypt/wile/wile-1.0.1.ebuild index aabfe2c..f0c0752 100644 --- a/app-crypt/wile/wile-1.0.0-r1.ebuild +++ b/app-crypt/wile/wile-1.0.1.ebuild @@ -30,7 +30,3 @@ RDEPEND=" DOCS=( README.md ) -PATCHES=( - "${FILESDIR}"/${P}-josepy.patch - "${FILESDIR}"/${P}-fix-webroot.patch -)