py-acme,py-certbot*: updated to 0.31.0

0.31.0:

Added
Avoid reprocessing challenges that are already validated when a certificate is issued.
Support for initiating (but not solving end-to-end) TLS-ALPN-01 challenges with the acme module.

Changed
Certbot's official Docker images are now based on Alpine Linux 3.9 rather than 3.7. The new version comes with OpenSSL 1.1.1.
Lexicon-based DNS plugins are now fully compatible with Lexicon 3.x (support on 2.x branch is maintained).
Apache plugin now attempts to configure all VirtualHosts matching requested domain name instead of only a single one when answering the HTTP-01 challenge.

Fixed
Fixed accessing josepy contents through acme.jose when the full acme.jose path is used.
Clarify behavior for deleting certs as part of revocation.
Despite us having broken lockstep, we are continuing to release new versions of all Certbot components during releases for the time being, however, the only package with changes other than its version number was:

acme
certbot
certbot-apache
certbot-dns-cloudxns
certbot-dns-dnsimple
certbot-dns-dnsmadeeasy
certbot-dns-gehirn
certbot-dns-linode
certbot-dns-luadns
certbot-dns-nsone
certbot-dns-ovh
certbot-dns-sakuracloud
More details about these changes can be found on our GitHub repo.

5 files changed, 32 insertions, 48 deletions

diff --git a/security/py-certbot/ALTERNATIVES b/security/py-certbot/ALTERNATIVES
index 334db4802c4..0b408cda333 100644
--- a/security/py-certbot/ALTERNATIVES
+++ b/security/py-certbot/ALTERNATIVES
@@ -1 +1 @@
-bin/certbot @PREFIX@/bin/certbot@PYVERSSUFFIX@
+bin/certbot @PREFIX@/bin/certbot-@PYVERSSUFFIX@
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index 13c7dd45f30..d19cbfd8c32 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -1,32 +1,37 @@
-# $NetBSD: Makefile,v 1.9 2018/12/15 21:12:23 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/12 12:56:31 adam Exp $
 
+DISTNAME=	certbot-0.31.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-CATEGORIES=	security
+CATEGORIES=	security python
+MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot/}
 
-COMMENT=	Client for the Let's Encrypt CA
 MAINTAINER=	fhajny@NetBSD.org
+HOMEPAGE=	https://github.com/certbot/certbot
+COMMENT=	Client for the Let's Encrypt CA
 LICENSE=	apache-2.0
 
 EGG_NAME=	${DISTNAME}
 
-.include "Makefile.common"
-
-DEPENDS+=	${PYPKGPREFIX}-acme-${PKGVERSION_NOREV}{nb*,}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
 DEPENDS+=	${PYPKGPREFIX}-configargparse>=0.9.3:../../devel/py-configargparse
 DEPENDS+=	${PYPKGPREFIX}-configobj-[0-9]*:../../devel/py-configobj
-DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.2:../../security/py-cryptography
+DEPENDS+=	${PYPKGPREFIX}-cryptography>=1.2.3:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-josepy-[0-9]*:../../security/py-josepy
 DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 DEPENDS+=	${PYPKGPREFIX}-parsedatetime>=2.0:../../time/py-parsedatetime
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339
-DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
+DEPENDS+=	${PYPKGPREFIX}-setuptools-[0-9]*:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeComponent-[0-9]*:../../devel/py-ZopeComponent
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
-
 # Needed for the test target
 # https://github.com/certbot/certbot/issues/2956
-BUILD_DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
+TEST_DEPENDS+=	${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-cov-[0-9]*:../../devel/py-test-cov
+TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
+
+USE_LANGUAGES=	# none
 
 BUILD_DEFS+=		VARBASE
 
@@ -35,21 +40,23 @@ PKG_SYSCONFSUBDIR=	letsencrypt
 SUBST_CLASSES+=		path
 SUBST_STAGE.path=	pre-build
 SUBST_MESSAGE.path=	Fixing default paths
-SUBST_FILES.path+=	certbot/constants.py certbot/display/ops.py
-SUBST_FILES.path+=	certbot/plugins/*.py certbot/tests/*.py
+SUBST_FILES.path+=	certbot/cert_manager.py
+SUBST_FILES.path+=	certbot/cli.py
+SUBST_FILES.path+=	certbot/compat.py
+SUBST_FILES.path+=	certbot/tests/cli_test.py
 SUBST_SED.path+=	-e 's,/etc/letsencrypt,${PKG_SYSCONFDIR},g'
 SUBST_SED.path+=	-e 's,/var/lib/letsencrypt,${VARBASE}/letsencrypt,g'
 SUBST_SED.path+=	-e 's,/var/log/letsencrypt,${VARBASE}/letsencrypt/log,g'
 
 MAKE_DIRS+=		${VARBASE}/letsencrypt/log
 
-INSTALLATION_DIRS+=	share/examples/certbot
+INSTALLATION_DIRS+=	share/examples/certbot-${PYVERSSUFFIX}
 
 post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/certbot \
-		${DESTDIR}${PREFIX}/bin/certbot${PYVERSSUFFIX}
+	cd ${DESTDIR}${PREFIX}/bin && \
+		${MV} certbot certbot-${PYVERSSUFFIX} || ${TRUE}
 	${INSTALL_DATA} ${WRKSRC}/examples/cli.ini \
-		${DESTDIR}${PREFIX}/share/examples/certbot
+		${DESTDIR}${PREFIX}/share/examples/certbot-${PYVERSSUFFIX}
 
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-certbot/Makefile.common b/security/py-certbot/Makefile.common
deleted file mode 100644
index 74fd80c6546..00000000000
--- a/security/py-certbot/Makefile.common
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: Makefile.common,v 1.30 2019/01/15 12:07:25 triaxx Exp $
-#
-# used by security/py-acme/Makefile
-# used by security/py-certbot/Makefile
-# used by security/py-certbot-dns-ovh/Makefile
-# used by security/py-certbot-dns-rfc2136/Makefile
-# used by security/py-certbot-dns-route53/Makefile
-# used by security/py-certbot-dns-sakuracloud/Makefile
-# used by security/py-certbot-nginx/Makefile
-
-DISTNAME=	certbot-0.30.0
-MASTER_SITES=	${MASTER_SITE_GITHUB:=certbot/}
-
-HOMEPAGE=	https://letsencrypt.org/
-
-GITHUB_PROJECT=	certbot
-GITHUB_TAG=	v${PKGVERSION_NOREV}
-
-EXTRACT_USING=	bsdtar
-USE_TOOLS+=	bsdtar
-
-DISTINFO_FILE=	${PKGDIR}/../../security/py-certbot/distinfo
-#PATCHDIR=	${PKGDIR}/../../security/py-certbot/patches
diff --git a/security/py-certbot/PLIST b/security/py-certbot/PLIST
index c013ae4fe51..29872e9283b 100644
--- a/security/py-certbot/PLIST
+++ b/security/py-certbot/PLIST
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.14 2019/01/15 09:32:11 triaxx Exp $
-bin/certbot${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.15 2019/02/12 12:56:31 adam Exp $
+bin/certbot-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -310,4 +310,4 @@ ${PYSITELIB}/certbot/tests/util.py
 ${PYSITELIB}/certbot/tests/util_test.py
 ${PYSITELIB}/certbot/updater.py
 ${PYSITELIB}/certbot/util.py
-share/examples/certbot/cli.ini
+share/examples/certbot-${PYVERSSUFFIX}/cli.ini
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index 1b4f20640af..48f107056ce 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.28 2019/01/15 09:32:11 triaxx Exp $
+$NetBSD: distinfo,v 1.29 2019/02/12 12:56:31 adam Exp $
 
-SHA1 (certbot-0.30.0.tar.gz) = 12daf9b632484bb4b4a100587e74d6a410a55530
-RMD160 (certbot-0.30.0.tar.gz) = 0f69d0bfe6f13db9e06b285f303dd1c1cbad42b8
-SHA512 (certbot-0.30.0.tar.gz) = 85095dd75ce639fcf93d748e2d32a686aecfa9002ccb2c23bdd4e33f1c47268386a86befbcca8180acf48881888fad484f485ad03fc7acef21a308c4d5432ac5
-Size (certbot-0.30.0.tar.gz) = 1266974 bytes
+SHA1 (certbot-0.31.0.tar.gz) = 6569ce15dd6c89f5756d3c9016c58ff0937d3a99
+RMD160 (certbot-0.31.0.tar.gz) = c146744df32995135830bb4e8d3da0d94415cbfd
+SHA512 (certbot-0.31.0.tar.gz) = a9bc84b54a071b15acc9db2801745b0b275f60a6037140d2fb074f0fb03c66363e63fc9ebe7e2e9770c6bd7802d0994108e2c0edb07bd376f7dcfb31daac8491
+Size (certbot-0.31.0.tar.gz) = 336579 bytes