py-acme py-certbot*: updated to 1.18.0

1.18.0

Added

New functions that Certbot plugins can use to interact with the user have been added to certbot.display.util. We plan to deprecate using IDisplay with zope in favor of these new functions in the future.
The Plugin, Authenticator and Installer classes are added to certbot.interfaces module as alternatives to Certbot's current zope based plugin interfaces. The API of these interfaces is identical, but they are based on Python's abc module instead of zope. Certbot will continue to detect plugins that implement either interface, but we plan to drop support for zope based interfaces in a future version of Certbot.
The class certbot.configuration.NamespaceConfig is added to the Certbot's public API.

Changed

When self-validating HTTP-01 challenges using acme.challenges.HTTP01Response.simple_verify, we now assume that the response is composed of only ASCII characters. Previously we were relying on the default behavior of the requests library which tries to guess the encoding of the response which was error prone.
acme: the .client.Client and .client.BackwardsCompatibleClientV2 classes are now deprecated in favor of .client.ClientV2.
The certbot.tests.patch_get_utility* functions have been deprecated. Plugins should now patch certbot.display.util themselves in their tests or use certbot.tests.util.patch_display_util as a temporary workaround.
In order to simplify the transition to Certbot's new plugin interfaces, the classes Plugin and Installer in certbot.plugins.common module and certbot.plugins.dns_common.DNSAuthenticator now implement Certbot's new plugin interfaces. The Certbot plugins based on these classes are now automatically detected as implementing these interfaces.
We added a dependency on chardet to our acme library so that it will be used over charset_normalizer in newer versions of requests.

Fixed

The Apache authenticator no longer crashes with "Unable to insert label" when encountering a completely empty vhost. This issue affected Certbot 1.17.0.
Users of the Certbot snap on Debian 9 (Stretch) should no longer encounter an "access denied" error when installing DNS plugins.

33 files changed, 139 insertions, 138 deletions

diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index 685602fcd0d..72888ddf449 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2021/02/09 10:06:41 adam Exp $
+# $NetBSD: Makefile,v 1.25 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -8,15 +8,14 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=a/acme/}
 COMMENT=	ACME protocol implementation in Python
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=17.3.0:../../security/py-OpenSSL
+DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-josepy>=1.1.0:../../security/py-josepy
-DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
-DEPENDS+=	${PYPKGPREFIX}-requests>2.10:../../devel/py-requests
+DEPENDS+=	${PYPKGPREFIX}-requests>=2.14.2:../../devel/py-requests
 DEPENDS+=	${PYPKGPREFIX}-requests-toolbelt>=0.3.0:../../devel/py-requests-toolbelt
 DEPENDS+=	${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
-DEPENDS+=	${PYPKGPREFIX}-six>=1.11.0:../../lang/py-six
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
 TEST_DEPENDS+=	${PYPKGPREFIX}-test-xdist-[0-9]*:../../devel/py-test-xdist
 
diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo
index cf63b17626c..3368c1f31a1 100644
--- a/security/py-acme/distinfo
+++ b/security/py-acme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:43 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (acme-1.17.0.tar.gz) = a1ff27c9a1c3338657284b6572367c513b42c041
-RMD160 (acme-1.17.0.tar.gz) = a9fc73a1ae6a4a8779b251a029a6347e28b432db
-SHA512 (acme-1.17.0.tar.gz) = f60fd0ef2af928f09c33bd40b65a0df9b197a63d50603432bafcfde9511a99228449795c6c042c7e18cbb9f9bab163f0db1b48747d13958fd66fa6fb1a6a1429
-Size (acme-1.17.0.tar.gz) = 90719 bytes
+SHA1 (acme-1.18.0.tar.gz) = 93cd56b2afe897031543709d6516c3b9134dcb34
+RMD160 (acme-1.18.0.tar.gz) = 5bcb141f089746df3219798acbda6be52b53c1df
+SHA512 (acme-1.18.0.tar.gz) = 067c6b3e970bd4b15d8d56d00ec646c06cdcfc9bd29928dc71eb59a52f058814d96fcf1e283080707445271c1cd7bed78451c44838738d53010f6d52a3a7fe83
+Size (acme-1.18.0.tar.gz) = 91080 bytes
diff --git a/security/py-certbot-apache/Makefile b/security/py-certbot-apache/Makefile
index 9a37b5288af..56062baf856 100644
--- a/security/py-certbot-apache/Makefile
+++ b/security/py-certbot-apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/02/09 10:06:42 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,10 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-apache/}
 
 COMMENT=	Apache plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
 DEPENDS+=	${PYPKGPREFIX}-augeas-[0-9]*:../../sysutils/py-augeas
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.6.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeComponent-[0-9]*:../../devel/py-ZopeComponent
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo
index fac7b03f6e8..c65c8a0d608 100644
--- a/security/py-certbot-apache/distinfo
+++ b/security/py-certbot-apache/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-apache-1.17.0.tar.gz) = 8366b6e97a4010d187d53a48cae185e321806b32
-RMD160 (certbot-apache-1.17.0.tar.gz) = 7cd6ce4ec5a384046a5f94e65838bbdf96d5e4e1
-SHA512 (certbot-apache-1.17.0.tar.gz) = 2ccee9f47ad0a873747442d5f06295366a67e4793e59c6b710d335dee1a074133e64b2eb8c8246c64d88a2cda0c26176b572a9a7f98cca0368d1047feb65f653
-Size (certbot-apache-1.17.0.tar.gz) = 221846 bytes
+SHA1 (certbot-apache-1.18.0.tar.gz) = e2128d72915e7376bb23b600ce16e1f894b96872
+RMD160 (certbot-apache-1.18.0.tar.gz) = 30507ae1abb3c8d5036b725c48f21729da8987dd
+SHA512 (certbot-apache-1.18.0.tar.gz) = f528d5a1a7fff44f685c3155b27bca20723e318817f3499e60a1eb66272e59a644234957325a46366d6f1e993bcb57dee0a8d5acf82cd99a5eaba17dd60f85bb
+Size (certbot-apache-1.18.0.tar.gz) = 221569 bytes
diff --git a/security/py-certbot-dns-digitalocean/Makefile b/security/py-certbot-dns-digitalocean/Makefile
index 7b9c881687a..3e5fd51f3cc 100644
--- a/security/py-certbot-dns-digitalocean/Makefile
+++ b/security/py-certbot-dns-digitalocean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/02/09 10:06:42 adam Exp $
+# $NetBSD: Makefile,v 1.5 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,8 +7,8 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-digitalocean/}
 
 COMMENT=	DigitalOcean DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-digitalocean>=1.11:../../net/py-digitalocean
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo
index de9f7ad0c81..23cc0728445 100644
--- a/security/py-certbot-dns-digitalocean/distinfo
+++ b/security/py-certbot-dns-digitalocean/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.18 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-dns-digitalocean-1.17.0.tar.gz) = 987ac6839e3ba82ba4feeece6bbb093f12c9480d
-RMD160 (certbot-dns-digitalocean-1.17.0.tar.gz) = d0c6ff9d7931b975dbe6fd4807c78fb13bf784d9
-SHA512 (certbot-dns-digitalocean-1.17.0.tar.gz) = 487fdb1f9b62380ee738a3285a71ad1ae192ac3338281fb73b29feb2cde291a68b56220dba26e90291dbcf3b0260d879954ce2913e7d92cf761ce97c410f04ad
-Size (certbot-dns-digitalocean-1.17.0.tar.gz) = 14076 bytes
+SHA1 (certbot-dns-digitalocean-1.18.0.tar.gz) = 7ee397128dafc2b7f22d8b6391c1a913e6d43a1a
+RMD160 (certbot-dns-digitalocean-1.18.0.tar.gz) = 9fcbc4a10dcad8fa9d4fd7b57f89d6817e9386ac
+SHA512 (certbot-dns-digitalocean-1.18.0.tar.gz) = 1840ee8fe934488ecdd23145b4a7140ddcd890ca240cbb5faead58c855b846064be46098540511fd1fe94203d2b68d24c30b712862abee594836895f85dd3ac8
+Size (certbot-dns-digitalocean-1.18.0.tar.gz) = 13973 bytes
diff --git a/security/py-certbot-dns-dnsimple/Makefile b/security/py-certbot-dns-dnsimple/Makefile
index 195f85982e2..9d185ec6758 100644
--- a/security/py-certbot-dns-dnsimple/Makefile
+++ b/security/py-certbot-dns-dnsimple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/02/09 10:06:42 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,8 +7,8 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-dnsimple/}
 
 COMMENT=	DNSimple DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo
index 8cdf49ad6cc..d1d3a00086c 100644
--- a/security/py-certbot-dns-dnsimple/distinfo
+++ b/security/py-certbot-dns-dnsimple/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-dns-dnsimple-1.17.0.tar.gz) = 860c038d5aa7a0afc0b7eec6a5cbb9e84771ea3e
-RMD160 (certbot-dns-dnsimple-1.17.0.tar.gz) = a604d184037ae4d61c7294b5955bb7a9f473c323
-SHA512 (certbot-dns-dnsimple-1.17.0.tar.gz) = 3d9e52fa248ba838f31811bad84bf3bd2a42dbe8e8a1621bcdc7f110c514ba5dab519494f74051ea149242a57cbf488f85d52928a07248aac1c2141eab9b6f1d
-Size (certbot-dns-dnsimple-1.17.0.tar.gz) = 12674 bytes
+SHA1 (certbot-dns-dnsimple-1.18.0.tar.gz) = 05050bc3fe245cbc0009a0d03041a8c33c36137e
+RMD160 (certbot-dns-dnsimple-1.18.0.tar.gz) = 6ff64381a455a9bb4830d6b64c6356183e14fcbc
+SHA512 (certbot-dns-dnsimple-1.18.0.tar.gz) = 7873cd577acb19d664352a8ad2c79a6924826e21bd8794e305ab2589c8e89da795490f63777aed34bb561ff4237ec80af9a7a9ede8da4e65b1ce671dcf409604
+Size (certbot-dns-dnsimple-1.18.0.tar.gz) = 12394 bytes
diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo
index 81cd9e4cbcc..db164450628 100644
--- a/security/py-certbot-dns-dnsmadeeasy/distinfo
+++ b/security/py-certbot-dns-dnsmadeeasy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-dns-dnsmadeeasy-1.17.0.tar.gz) = ce1d8d7c8cacda929af4bd6d1c1fd303087acceb
-RMD160 (certbot-dns-dnsmadeeasy-1.17.0.tar.gz) = 418c162de0be818881cc7da69d2e0d1243997ca2
-SHA512 (certbot-dns-dnsmadeeasy-1.17.0.tar.gz) = 30d2018d6d32bbdab74445d28078e06285c6f160b8cc94bc5526d079bbf1c6c367dde2b0f6f3c0ae946961e6f0755e33879ec1532e95330697e9c4a63e5cf73e
-Size (certbot-dns-dnsmadeeasy-1.17.0.tar.gz) = 12717 bytes
+SHA1 (certbot-dns-dnsmadeeasy-1.18.0.tar.gz) = 7f884050016b4a0f0e7ab83909f3c4a3760f187a
+RMD160 (certbot-dns-dnsmadeeasy-1.18.0.tar.gz) = 629bff3f6d39b2808416a88c06aa2f16c5e83a75
+SHA512 (certbot-dns-dnsmadeeasy-1.18.0.tar.gz) = 471ca3241b79bc309a558438425b7d08e43ddd3ee50a26e0bfe0680d74ed481eb2ddf8300acbc7a6e43037105c9585b5fa61082dc145e73357ce5f1584df9c40
+Size (certbot-dns-dnsmadeeasy-1.18.0.tar.gz) = 12597 bytes
diff --git a/security/py-certbot-dns-gehirn/Makefile b/security/py-certbot-dns-gehirn/Makefile
index 7a6af98df23..cf19926f206 100644
--- a/security/py-certbot-dns-gehirn/Makefile
+++ b/security/py-certbot-dns-gehirn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2021/06/14 12:15:39 adam Exp $
+# $NetBSD: Makefile,v 1.8 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-gehirn/}
 
 COMMENT=	Gehirn Infrastracture Service DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.1.0:../../net/py-lexicon
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo
index 0f4d96b921e..6005911f55a 100644
--- a/security/py-certbot-dns-gehirn/distinfo
+++ b/security/py-certbot-dns-gehirn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-dns-gehirn-1.17.0.tar.gz) = 4b92637248697b85170deea7adb48f96aaf7ee89
-RMD160 (certbot-dns-gehirn-1.17.0.tar.gz) = fe8e8c3fd60c70a16e1d06e992ed7881b052a6a0
-SHA512 (certbot-dns-gehirn-1.17.0.tar.gz) = ff6146ca6cde497bb9b0bb845000c8bc456e30d2bd73c2dff7f0f1d26f6f0894bee7d2f3219140d97545fdead20e1f541b2861e6066943e3f5558fef7fb6aa4e
-Size (certbot-dns-gehirn-1.17.0.tar.gz) = 12610 bytes
+SHA1 (certbot-dns-gehirn-1.18.0.tar.gz) = ec3759c3a377185aaaa254acd710860143f16847
+RMD160 (certbot-dns-gehirn-1.18.0.tar.gz) = cf76a57520b2e30f68f016630a1684b8f2479cf7
+SHA512 (certbot-dns-gehirn-1.18.0.tar.gz) = 928ab6513f072020ac9c53a5fc04700475adac0a55f9794eead58a81959af016b0b2149d67283da818902355fb70d41f22c47ce194d46891ad39e19a06c336aa
+Size (certbot-dns-gehirn-1.18.0.tar.gz) = 12495 bytes
diff --git a/security/py-certbot-dns-google/Makefile b/security/py-certbot-dns-google/Makefile
index dec3e5555a6..751acbedefa 100644
--- a/security/py-certbot-dns-google/Makefile
+++ b/security/py-certbot-dns-google/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/02/09 10:06:42 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,8 +7,8 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-google/}
 
 COMMENT=	Google Cloud DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-google-api-python-client>=1.5.5:../../www/py-google-api-python-client
 DEPENDS+=	${PYPKGPREFIX}-httplib2-[0-9]*:../../www/py-httplib2
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo
index 28e61197820..ad11027c6e8 100644
--- a/security/py-certbot-dns-google/distinfo
+++ b/security/py-certbot-dns-google/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-dns-google-1.17.0.tar.gz) = 259b28281830d182d3b3024ab9e0ea03bc87d403
-RMD160 (certbot-dns-google-1.17.0.tar.gz) = 64d28f74b6d2d65339ca474212ade2438e439ede
-SHA512 (certbot-dns-google-1.17.0.tar.gz) = e3d296b0cffae7cc6dc957da414a5f04dcfb0fca402895b29fa5ba8812b7fb9fe7b42d689a6d6e5234f4e540479a3eccb3ea8939f86976fb29a17d0cfc120e74
-Size (certbot-dns-google-1.17.0.tar.gz) = 23723 bytes
+SHA1 (certbot-dns-google-1.18.0.tar.gz) = 481c1e7496a842471ff51bcd166c958fb52f4e01
+RMD160 (certbot-dns-google-1.18.0.tar.gz) = ceda158804d3dc3cb68a300fd1cd6509edbf46e9
+SHA512 (certbot-dns-google-1.18.0.tar.gz) = db0b176904beeddaf8b0be54c296884c5f369b4b9cc17085880efc4ecbf0ae6f7b96462d10f1b5729c559c56410002b704c631c02acbc4a9ca92cfaa898a084b
+Size (certbot-dns-google-1.18.0.tar.gz) = 23620 bytes
diff --git a/security/py-certbot-dns-linode/Makefile b/security/py-certbot-dns-linode/Makefile
index 1e97cd1b251..221ab687f23 100644
--- a/security/py-certbot-dns-linode/Makefile
+++ b/security/py-certbot-dns-linode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/06/14 12:15:40 adam Exp $
+# $NetBSD: Makefile,v 1.9 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-linode/}
 
 COMMENT=	Linode DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.1.0:../../net/py-lexicon
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo
index 827bffe5649..09d2e227ed5 100644
--- a/security/py-certbot-dns-linode/distinfo
+++ b/security/py-certbot-dns-linode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.24 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.25 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-dns-linode-1.17.0.tar.gz) = 749cd39306315360fff234d02826bdbb2df5bcc3
-RMD160 (certbot-dns-linode-1.17.0.tar.gz) = f0d710279480af36541562abe0be94cc9f5b787f
-SHA512 (certbot-dns-linode-1.17.0.tar.gz) = 1dbaa9ff4f27dacb873a4a27b37aef4e6ccf7556325b6acc5318fc88f7d975c2a55bbb7c61af73c4328af066db6ec49763c859edd2d0351e5ba8c954180a93b2
-Size (certbot-dns-linode-1.17.0.tar.gz) = 13088 bytes
+SHA1 (certbot-dns-linode-1.18.0.tar.gz) = 59b3c54d58b74f2243ccf8c9e309a9cecb539890
+RMD160 (certbot-dns-linode-1.18.0.tar.gz) = 2006f7d912bd8ec9720d7cb6b6b4bca7787e7ed6
+SHA512 (certbot-dns-linode-1.18.0.tar.gz) = 294ddb0f868eec2a4bcbdb23e83f8e4f18806631fdf482097f361ef3915805d490e3aabebc7605f32c4bb767f15922aee6a095895536c01de719e4900814620c
+Size (certbot-dns-linode-1.18.0.tar.gz) = 12979 bytes
diff --git a/security/py-certbot-dns-luadns/Makefile b/security/py-certbot-dns-luadns/Makefile
index e5e6ae0790b..5468d033dee 100644
--- a/security/py-certbot-dns-luadns/Makefile
+++ b/security/py-certbot-dns-luadns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/06/14 12:15:40 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-luadns/}
 
 COMMENT=	LuaDNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.1.0:../../net/py-lexicon
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo
index aa89b121c06..2768991c32f 100644
--- a/security/py-certbot-dns-luadns/distinfo
+++ b/security/py-certbot-dns-luadns/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:44 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-dns-luadns-1.17.0.tar.gz) = 34e1b6ca8e0a2eec659a9a30c8e3eb55ef28837d
-RMD160 (certbot-dns-luadns-1.17.0.tar.gz) = 3d0773a70090e88dc550648510c263165a1d8f12
-SHA512 (certbot-dns-luadns-1.17.0.tar.gz) = d80d017d50d6985b2678be3cb5de2995c54bb20f937c930428951402cf78fb599f6baba4ae1ff38d6d028fb0b2d7fffcb012fa3c049f26687dc4f76c21b0ef8a
-Size (certbot-dns-luadns-1.17.0.tar.gz) = 12528 bytes
+SHA1 (certbot-dns-luadns-1.18.0.tar.gz) = 6c7e2009ba8528c5fbe43fb6436a1f923a55ef4e
+RMD160 (certbot-dns-luadns-1.18.0.tar.gz) = 213a5171016350c021f61ab399fb7b14e48a0afe
+SHA512 (certbot-dns-luadns-1.18.0.tar.gz) = 71b8378d2bc70f797e438a8b90450f0eee69c0d736d4aa8b81f7265740da45f17364bd0e929dc329c1fd43aa009c8118b6101121c586310c5ae727786e73e75b
+Size (certbot-dns-luadns-1.18.0.tar.gz) = 12428 bytes
diff --git a/security/py-certbot-dns-nsone/Makefile b/security/py-certbot-dns-nsone/Makefile
index 69f60a12869..57336abcaca 100644
--- a/security/py-certbot-dns-nsone/Makefile
+++ b/security/py-certbot-dns-nsone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/06/14 12:15:40 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-nsone/}
 
 COMMENT=	NS1 DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.1.0:../../net/py-lexicon
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo
index 757fbd26257..83f9f899eb1 100644
--- a/security/py-certbot-dns-nsone/distinfo
+++ b/security/py-certbot-dns-nsone/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:45 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-dns-nsone-1.17.0.tar.gz) = 3e1c6a09223ca8ff75b2720b2b93a2909b3813e9
-RMD160 (certbot-dns-nsone-1.17.0.tar.gz) = a40b39c20b5a519822fcd971a1d8fd81395c992f
-SHA512 (certbot-dns-nsone-1.17.0.tar.gz) = aadc78348fa1d673fe3d0c788d0d455ae558d292418e9aeb53493f65a71de586891182b0337b0c3e3e6063b8dc9a1db9d792afa8809b8836765607341c0c0500
-Size (certbot-dns-nsone-1.17.0.tar.gz) = 12574 bytes
+SHA1 (certbot-dns-nsone-1.18.0.tar.gz) = e4ddca74169a3285fe97718f5d00e04e04ad75ec
+RMD160 (certbot-dns-nsone-1.18.0.tar.gz) = 2de68656f7b435b4149dccb6c9327fbf2b43bb39
+SHA512 (certbot-dns-nsone-1.18.0.tar.gz) = 9a95410f15ea160f32176ca93efee8aa515019382627ad1f8e02283d1abcf8fb102a352630162e3128a7c2254b87a572c0759bfdc4f8c23c4c093a438f1a16d1
+Size (certbot-dns-nsone-1.18.0.tar.gz) = 12459 bytes
diff --git a/security/py-certbot-dns-ovh/Makefile b/security/py-certbot-dns-ovh/Makefile
index 3b27631b90d..c57f2ae5251 100644
--- a/security/py-certbot-dns-ovh/Makefile
+++ b/security/py-certbot-dns-ovh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/06/14 12:15:40 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-ovh/}
 
 COMMENT=	OVH DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.1.0:../../net/py-lexicon
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo
index 212c2b01676..47bf279651a 100644
--- a/security/py-certbot-dns-ovh/distinfo
+++ b/security/py-certbot-dns-ovh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:45 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-dns-ovh-1.17.0.tar.gz) = 665ade9fe08712474cf9ba5178e426463955d125
-RMD160 (certbot-dns-ovh-1.17.0.tar.gz) = 690ac021389f744014c30cb15f1da3dbd0eeedbe
-SHA512 (certbot-dns-ovh-1.17.0.tar.gz) = fefe91a7d131a3f5c15270c01fed72bafb0651eb58f7128f64836c6d7d195602c1ca99065d8ee83f95f12197768dbd0838af6fb4a7c2ac37bb8f32f2211724b7
-Size (certbot-dns-ovh-1.17.0.tar.gz) = 12890 bytes
+SHA1 (certbot-dns-ovh-1.18.0.tar.gz) = 56c0d407416676d749b04e9f06db8c8c5c3ee0a1
+RMD160 (certbot-dns-ovh-1.18.0.tar.gz) = b81c14b6f5aa2883e68ffc67af7611902f74241a
+SHA512 (certbot-dns-ovh-1.18.0.tar.gz) = 0d629647695fcf53fc06854bb9bc6e63af2af1ad992785eb8e3351b2ec677154fed34a0f2d1d25309d5d89515248b9c6fcfa6d00a5389d7090ac1649fe807c98
+Size (certbot-dns-ovh-1.18.0.tar.gz) = 12788 bytes
diff --git a/security/py-certbot-dns-rfc2136/Makefile b/security/py-certbot-dns-rfc2136/Makefile
index 93f1db59e29..f045b9f3d29 100644
--- a/security/py-certbot-dns-rfc2136/Makefile
+++ b/security/py-certbot-dns-rfc2136/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/02/09 10:06:43 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,8 +7,8 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-rfc2136/}
 
 COMMENT=	RFC 2136 DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-dns-[0-9]*:../../net/py-dns
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo
index 6eb128cb8a5..73feed7159a 100644
--- a/security/py-certbot-dns-rfc2136/distinfo
+++ b/security/py-certbot-dns-rfc2136/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:45 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-dns-rfc2136-1.17.0.tar.gz) = bc6ea587564ec8b076d291a98eb3cf770650b5a1
-RMD160 (certbot-dns-rfc2136-1.17.0.tar.gz) = 269ed77f77a90bd289b0e8c630b1260529c66815
-SHA512 (certbot-dns-rfc2136-1.17.0.tar.gz) = 31f1f1088dd57bce360fe9696d08d584a97816c0259a018e774cd2a54b40f17dfab39bedded5524beb367c07a6a01eb524a48d65dfa62b7599db4cbf12c93658
-Size (certbot-dns-rfc2136-1.17.0.tar.gz) = 15159 bytes
+SHA1 (certbot-dns-rfc2136-1.18.0.tar.gz) = 8542b82df39ad0f1408f9e604a705e66faafdda4
+RMD160 (certbot-dns-rfc2136-1.18.0.tar.gz) = 6d0a9308513ddee5c82a74289972cd12fc2d4f9a
+SHA512 (certbot-dns-rfc2136-1.18.0.tar.gz) = a9ca85a75ca2144180425360302c5a4feab339c36c7eabac67edfe739ec2bff9e65652f91e274e5f80799def1caaa1cb303d895ae2b2cd053b78d5c98a3e2494
+Size (certbot-dns-rfc2136-1.18.0.tar.gz) = 15082 bytes
diff --git a/security/py-certbot-dns-route53/Makefile b/security/py-certbot-dns-route53/Makefile
index ac26f44c4d4..3ab8b28a806 100644
--- a/security/py-certbot-dns-route53/Makefile
+++ b/security/py-certbot-dns-route53/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2021/02/09 10:06:43 adam Exp $
+# $NetBSD: Makefile,v 1.13 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-route53/}
 
 COMMENT=	Amazon Web Services Route 53 API plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.29.0:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
 DEPENDS+=	${PYPKGPREFIX}-boto3-[0-9]*:../../net/py-boto3
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo
index b58806c6184..8d45139008c 100644
--- a/security/py-certbot-dns-route53/distinfo
+++ b/security/py-certbot-dns-route53/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:45 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-dns-route53-1.17.0.tar.gz) = 248d4c3bc28d5e7f9b999cd693f32c331fe2fb81
-RMD160 (certbot-dns-route53-1.17.0.tar.gz) = a04efd44b39dac74f41b42a8d96b1e796f75b083
-SHA512 (certbot-dns-route53-1.17.0.tar.gz) = e00cdc2ff8057a1003bba7f8fc4c2212d43e21e8500116b12f39f63b634c969773b4cb1327325e0746b88ad9f4c9206d77aca9df51d567b06cc847d1640a1f7a
-Size (certbot-dns-route53-1.17.0.tar.gz) = 15010 bytes
+SHA1 (certbot-dns-route53-1.18.0.tar.gz) = d8cdb7eba71886cb9dd64394e4eab15a7c0e4c88
+RMD160 (certbot-dns-route53-1.18.0.tar.gz) = 790db87626c68b895d4fb3d049838bd7cf3f806f
+SHA512 (certbot-dns-route53-1.18.0.tar.gz) = d705ad50419f313cc724f48bd363e25cf5b411ccc0806d7aa9773fb6aa65ff3e7bfba1635aa7b3c40c531c7ec65f4295c6ef9d1bc3854a18a5717a1f8d80b9b3
+Size (certbot-dns-route53-1.18.0.tar.gz) = 14922 bytes
diff --git a/security/py-certbot-dns-sakuracloud/Makefile b/security/py-certbot-dns-sakuracloud/Makefile
index dbfa71b9354..9e2eec78f59 100644
--- a/security/py-certbot-dns-sakuracloud/Makefile
+++ b/security/py-certbot-dns-sakuracloud/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/06/14 12:15:40 adam Exp $
+# $NetBSD: Makefile,v 1.14 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,9 +7,9 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-dns-sakuracloud/}
 
 COMMENT=	Sakura Cloud DNS Authenticator plugin for Certbot
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=0.31.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.1.0:../../security/py-certbot
-DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.1.0:../../net/py-lexicon
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-lexicon>=3.2.1:../../net/py-lexicon
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
 
diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo
index dcc199436a7..5094cb57244 100644
--- a/security/py-certbot-dns-sakuracloud/distinfo
+++ b/security/py-certbot-dns-sakuracloud/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.29 2021/07/23 07:26:45 adam Exp $
+$NetBSD: distinfo,v 1.30 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-dns-sakuracloud-1.17.0.tar.gz) = f2eeed554463b4f04320504fc5bc0fdf40fdb65a
-RMD160 (certbot-dns-sakuracloud-1.17.0.tar.gz) = a368eae1c12c727e4bef56189e0851ad345b1795
-SHA512 (certbot-dns-sakuracloud-1.17.0.tar.gz) = 426155e911e616f13a9988c77fdeba1e99667078032138e37892650c1400b51cf73cd3683776f77014f3dd8a4e5c4fdea5221aa5113c82fcb0fe248b1ac0b758
-Size (certbot-dns-sakuracloud-1.17.0.tar.gz) = 12610 bytes
+SHA1 (certbot-dns-sakuracloud-1.18.0.tar.gz) = a003ae08b950b67ecb44a2c1a639fc4d4490ed4d
+RMD160 (certbot-dns-sakuracloud-1.18.0.tar.gz) = 610dfc9c915a6275e38bb7a405fd8230c44b188f
+SHA512 (certbot-dns-sakuracloud-1.18.0.tar.gz) = a19711eca1d6cc9f4bda544422331c379fc2b1d2b8a0d149be3ca6c6ec211f26d5825e0edb54637e932a5b8685cb878b2524c704f236fb9c6bf8594023757c77
+Size (certbot-dns-sakuracloud-1.18.0.tar.gz) = 12492 bytes
diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile
index fd87fa33ce7..ad71f37bcc2 100644
--- a/security/py-certbot-nginx/Makefile
+++ b/security/py-certbot-nginx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2021/02/09 10:06:43 adam Exp $
+# $NetBSD: Makefile,v 1.17 2021/08/05 10:52:01 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -8,8 +8,8 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-nginx/}
 COMMENT=	Nginx plugin for Certbot
 
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=17.3.0:../../security/py-OpenSSL
-DEPENDS+=	${PYPKGPREFIX}-acme>=1.4.0:../../security/py-acme
-DEPENDS+=	${PYPKGPREFIX}-certbot>=1.6.0:../../security/py-certbot
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-certbot>=${CERTBOT_VERSION}:../../security/py-certbot
 DEPENDS+=	${PYPKGPREFIX}-setuptools>=39.0.1:../../devel/py-setuptools
 DEPENDS+=	${PYPKGPREFIX}-pyparsing>=2.2.0:../../devel/py-pyparsing
 DEPENDS+=	${PYPKGPREFIX}-ZopeInterface-[0-9]*:../../devel/py-ZopeInterface
diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo
index a9108b474fe..2f9949ca028 100644
--- a/security/py-certbot-nginx/distinfo
+++ b/security/py-certbot-nginx/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2021/07/23 07:26:45 adam Exp $
+$NetBSD: distinfo,v 1.31 2021/08/05 10:52:01 adam Exp $
 
-SHA1 (certbot-nginx-1.17.0.tar.gz) = b2d09078b6b323ad6511f254ba0fa2402d0bb2c4
-RMD160 (certbot-nginx-1.17.0.tar.gz) = 1d8ea475067ce68e2755eed05046a55313f87597
-SHA512 (certbot-nginx-1.17.0.tar.gz) = 0d0b19ee8a0945eaa70badf917d8adbf213f8588844210a02b93e2e09ff0fad1289b9dbf0788e74e8086b6290c610ee2e850536731287a507a736a3d4dd9fe23
-Size (certbot-nginx-1.17.0.tar.gz) = 76288 bytes
+SHA1 (certbot-nginx-1.18.0.tar.gz) = 112adf05baebcff57728e9df341514eea6291657
+RMD160 (certbot-nginx-1.18.0.tar.gz) = 3d0e86eda1d5c626d784ed3cc989d55346c7f418
+SHA512 (certbot-nginx-1.18.0.tar.gz) = 935e682111456a7df6eff33f3cd3d0b20612f455db79ce559d79e9666aa78060eb5723376dbee5830dccb5362ac142947005d7fe52536f49130c3507a2dea895
+Size (certbot-nginx-1.18.0.tar.gz) = 76130 bytes
 SHA1 (patch-certbot__nginx___internal_constants.py) = a63042550f5eee5992579897bf4e9ea2cb7def20
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index f00bc6cbd1c..c10c317056b 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2021/02/09 10:06:41 adam Exp $
+# $NetBSD: Makefile,v 1.30 2021/08/05 10:52:00 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
@@ -7,7 +7,7 @@ MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot/}
 
 COMMENT=	Client for the Let's Encrypt CA
 
-DEPENDS+=	${PYPKGPREFIX}-acme>=1.8.0:../../security/py-acme
+DEPENDS+=	${PYPKGPREFIX}-acme>=${CERTBOT_VERSION}:../../security/py-acme
 DEPENDS+=	${PYPKGPREFIX}-configargparse>=0.9.3:../../devel/py-configargparse
 DEPENDS+=	${PYPKGPREFIX}-configobj>=5.0.6:../../devel/py-configobj
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=2.1.4:../../security/py-cryptography
diff --git a/security/py-certbot/Makefile.common b/security/py-certbot/Makefile.common
index caaab0d48b5..91382b96311 100644
--- a/security/py-certbot/Makefile.common
+++ b/security/py-certbot/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.56 2021/07/23 07:26:43 adam Exp $
+# $NetBSD: Makefile.common,v 1.57 2021/08/05 10:52:00 adam Exp $
 # used by security/py-acme/Makefile
 # used by security/py-certbot/Makefile
 # used by security/py-certbot-apache/Makefile
@@ -16,7 +16,7 @@
 # used by security/py-certbot-dns-sakuracloud/Makefile
 # used by security/py-certbot-nginx/Makefile
 
-CERTBOT_VERSION=	1.17.0
+CERTBOT_VERSION=	1.18.0
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES?=	security python
diff --git a/security/py-certbot/PLIST b/security/py-certbot/PLIST
index e57b689966d..7a6ecc9a4d3 100644
--- a/security/py-certbot/PLIST
+++ b/security/py-certbot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.29 2021/02/09 10:06:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.30 2021/08/05 10:52:00 adam Exp $
 bin/certbot-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -51,9 +51,6 @@ ${PYSITELIB}/certbot/_internal/cli/verb_help.pyo
 ${PYSITELIB}/certbot/_internal/client.py
 ${PYSITELIB}/certbot/_internal/client.pyc
 ${PYSITELIB}/certbot/_internal/client.pyo
-${PYSITELIB}/certbot/_internal/configuration.py
-${PYSITELIB}/certbot/_internal/configuration.pyc
-${PYSITELIB}/certbot/_internal/configuration.pyo
 ${PYSITELIB}/certbot/_internal/constants.py
 ${PYSITELIB}/certbot/_internal/constants.pyc
 ${PYSITELIB}/certbot/_internal/constants.pyo
@@ -66,6 +63,9 @@ ${PYSITELIB}/certbot/_internal/display/completer.pyo
 ${PYSITELIB}/certbot/_internal/display/dummy_readline.py
 ${PYSITELIB}/certbot/_internal/display/dummy_readline.pyc
 ${PYSITELIB}/certbot/_internal/display/dummy_readline.pyo
+${PYSITELIB}/certbot/_internal/display/obj.py
+${PYSITELIB}/certbot/_internal/display/obj.pyc
+${PYSITELIB}/certbot/_internal/display/obj.pyo
 ${PYSITELIB}/certbot/_internal/eff.py
 ${PYSITELIB}/certbot/_internal/eff.pyc
 ${PYSITELIB}/certbot/_internal/eff.pyo
@@ -138,6 +138,9 @@ ${PYSITELIB}/certbot/compat/misc.pyo
 ${PYSITELIB}/certbot/compat/os.py
 ${PYSITELIB}/certbot/compat/os.pyc
 ${PYSITELIB}/certbot/compat/os.pyo
+${PYSITELIB}/certbot/configuration.py
+${PYSITELIB}/certbot/configuration.pyc
+${PYSITELIB}/certbot/configuration.pyo
 ${PYSITELIB}/certbot/crypto_util.py
 ${PYSITELIB}/certbot/crypto_util.pyc
 ${PYSITELIB}/certbot/crypto_util.pyo
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index 5287dbe23e4..84a7ede9452 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.57 2021/07/23 07:26:43 adam Exp $
+$NetBSD: distinfo,v 1.58 2021/08/05 10:52:00 adam Exp $
 
-SHA1 (certbot-1.17.0.tar.gz) = c9050a6af1a07fe5940b2a73c8403cec2759dc27
-RMD160 (certbot-1.17.0.tar.gz) = b87fa6a996f60812dfe0dd22089f6d6c3af89bf3
-SHA512 (certbot-1.17.0.tar.gz) = 2ed77a33b066625acd4c0f430a9c37ae6e1d6ebedcc27b28827a93d6d44236693176f7bdda018078c60a3528e7e62cc0f01b12975a0c3243aa1752444e9bc90e
-Size (certbot-1.17.0.tar.gz) = 400362 bytes
+SHA1 (certbot-1.18.0.tar.gz) = f7dda825d5fa13faf09878a31e8d15d7f7b99658
+RMD160 (certbot-1.18.0.tar.gz) = 3ffb5469ac1754df39071f06ac76f6bf7a12f835
+SHA512 (certbot-1.18.0.tar.gz) = 26fc10fce67317676f3c1f8d6de2f9eb148c3302aa392665caa9f3d734d9c8c94f9ae9074127b49c06c79843df15832af402961fa8c7bfbf71dcf014623afdd6
+Size (certbot-1.18.0.tar.gz) = 405325 bytes