py-acme,py-certbot: updated to 1.6.0

1.6.0

Added

Certbot snaps are now available for the arm64 and armhf architectures.
Add minimal code to run Nginx plugin on NetBSD.
Make Certbot snap find externally snapped plugins
Function certbot.compat.filesystem.umask is a drop-in replacement for os.umask implementing umask for both UNIX and Windows systems.
Support for alternative certificate chains in the acme module.
Added --preferred-chain <issuer CN>. If a CA offers multiple certificate chains, it may be used to indicate to Certbot which chain should be preferred.
e.g. --preferred-chain "DST Root CA X3"

Changed

Allow session tickets to be disabled in Apache when mod_ssl is statically linked.
Generalize UI warning message on renewal rate limits
Certbot behaves similarly on Windows to on UNIX systems regarding umask, and the umask 022 is applied by default: all files/directories are not writable by anyone other than the user running Certbot and the system/admin users.
Read acmev1 Let's Encrypt server URL from renewal config as acmev2 URL to prepare for impending acmev1 deprecation.

Fixed

Cloudflare API Tokens may now be restricted to individual zones.
Don't use StrictVersion, but LooseVersion to check version requirements with setuptools, to fix some packaging issues with libraries respecting PEP404 for version string, with doesn't match StrictVersion requirements.
Certbot output doesn't refer to SSL Labs due to confusing scoring behavior.
Fix paths when calling to programs outside of the Certbot Snap, fixing the apache and nginx plugins on, e.g., CentOS 7.

21 files changed, 106 insertions, 111 deletions

diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo
index a24743181d8..be7c40cd697 100644
--- a/security/py-acme/distinfo
+++ b/security/py-acme/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/08 15:53:29 adam Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:21 adam Exp $
 
-SHA1 (acme-1.5.0.tar.gz) = 5ffcf40724065215b10b6f2d3e5c1a9524c7a42f
-RMD160 (acme-1.5.0.tar.gz) = 9380d82d5e0dbdbd27286fdff7ff950ee8f19537
-SHA512 (acme-1.5.0.tar.gz) = 4fcaf400a47066536492751cbd99fb7ac207d2c49b0b6cc747a791cfd618bc4123c18fcce1c9088a3d678600f588c6cd520f9af3186c3803b36a43fa38c333f4
-Size (acme-1.5.0.tar.gz) = 87605 bytes
+SHA1 (acme-1.6.0.tar.gz) = 7eb76ce4ae7134b676f7808e06699a252809e09e
+RMD160 (acme-1.6.0.tar.gz) = 49f402eade4ca6fceb4e88c02f04814d9ea71a4d
+SHA512 (acme-1.6.0.tar.gz) = 29280a99e9e3fb31adda8947dbb2b87fde663f7082b88373d7ba3955dd4c173a56833cda6d58c0466738398f831d51feace1fe9e5ebbb8bbc1cc0a134039d376
+Size (acme-1.6.0.tar.gz) = 88227 bytes
diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo
index 3cc4d1ff2fe..04b2b5ceca6 100644
--- a/security/py-certbot-apache/distinfo
+++ b/security/py-certbot-apache/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:36 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-apache-1.5.0.tar.gz) = da58e4cb61b4788c8c212eefa7e744542ebebbe8
-RMD160 (certbot-apache-1.5.0.tar.gz) = 6dfc684b5c622d2e7f44674236bf0f6c15d95062
-SHA512 (certbot-apache-1.5.0.tar.gz) = 45cbbd97b5af978961bc415e7bafb73425428bf67fc2f6d3e511b8ddbf0ff8c979b768b31c554058384f5f1805a3b63fde8ee07e027c50056f4a201be4954fcd
-Size (certbot-apache-1.5.0.tar.gz) = 214702 bytes
+SHA1 (certbot-apache-1.6.0.tar.gz) = e80136bb9e914bad2643c2f0e18f4a7c56a45eec
+RMD160 (certbot-apache-1.6.0.tar.gz) = a6bd645924a70a3b476326e51375c6f5ef39f55b
+SHA512 (certbot-apache-1.6.0.tar.gz) = cb5a09eacc91c218154307645f1de4c80bf5cf5aa139a46dca25a07d6eee237c2fd5eddda1841082d148d4c428a49967b00ee97d303616ea06d468b40fff7012
+Size (certbot-apache-1.6.0.tar.gz) = 214971 bytes
diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo
index 38abc6bf782..7c0defb8ba6 100644
--- a/security/py-certbot-dns-digitalocean/distinfo
+++ b/security/py-certbot-dns-digitalocean/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2020/06/09 12:47:36 mef Exp $
+$NetBSD: distinfo,v 1.6 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-digitalocean-1.5.0.tar.gz) = a99707010d60b60d30eb72724a3a1a06cef77522
-RMD160 (certbot-dns-digitalocean-1.5.0.tar.gz) = 7fd200b96cab648fadd97c46b492ebf05df13036
-SHA512 (certbot-dns-digitalocean-1.5.0.tar.gz) = 430365ddb25e0f2b768d75744c19617edf189559b647814cc6639b6b64baddaef2659788e15327244ca39f814317879f8d66ad77bb638e52f5842d0bdfdb1d7d
-Size (certbot-dns-digitalocean-1.5.0.tar.gz) = 13237 bytes
+SHA1 (certbot-dns-digitalocean-1.6.0.tar.gz) = 80cd8563b0ac67fcea0c1205477a01ca8c3bc9c2
+RMD160 (certbot-dns-digitalocean-1.6.0.tar.gz) = 47123d0b48125aa56ff74dc3cc83fc00869e5798
+SHA512 (certbot-dns-digitalocean-1.6.0.tar.gz) = 2b6daf0b2c99adcc1bf5f249cdf89bf27d999fa1d21c0dc68e02720dec26e65a1a64bf1bd6c9be30c1a252e73e9a58d10e805413e830a70faf5aa94f22ad4f1c
+Size (certbot-dns-digitalocean-1.6.0.tar.gz) = 13306 bytes
diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo
index 53313836705..5e2d790871d 100644
--- a/security/py-certbot-dns-dnsimple/distinfo
+++ b/security/py-certbot-dns-dnsimple/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/06/09 12:47:36 mef Exp $
+$NetBSD: distinfo,v 1.13 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-dnsimple-1.5.0.tar.gz) = 7a335475d39fdc539ce3d3cdab3bcfa6aa1d4ee2
-RMD160 (certbot-dns-dnsimple-1.5.0.tar.gz) = b9b35078adff014d5c48c09b53d7ac5a605e9989
-SHA512 (certbot-dns-dnsimple-1.5.0.tar.gz) = 8e2bf6b5a79779444586447031d65251138314d2ff387d69ddde86f01cf540edb7156bbdce267502fd65936f9330d7a762e6d178111b15313fc074f0da475bf1
-Size (certbot-dns-dnsimple-1.5.0.tar.gz) = 11961 bytes
+SHA1 (certbot-dns-dnsimple-1.6.0.tar.gz) = ca7aaf757ce9dd6ffba9b95f1d279c6f39cea7c2
+RMD160 (certbot-dns-dnsimple-1.6.0.tar.gz) = 61b2b3255de0cfe0f0a9019ef26a06452d137374
+SHA512 (certbot-dns-dnsimple-1.6.0.tar.gz) = da61d623a8944f3aacac2ba2148385faeeb89fb498c186c9440f068a633ccaf9e3b0d5d4900ec477cd5f511f335280874beec12de69693043c00a0b81e08e123
+Size (certbot-dns-dnsimple-1.6.0.tar.gz) = 12028 bytes
diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo
index 71d50c0e107..9f7ef2a5b21 100644
--- a/security/py-certbot-dns-dnsmadeeasy/distinfo
+++ b/security/py-certbot-dns-dnsmadeeasy/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/06/09 12:47:36 mef Exp $
+$NetBSD: distinfo,v 1.13 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-dnsmadeeasy-1.5.0.tar.gz) = 5c073fda7ccb79a784d929e8a676232b159d28c9
-RMD160 (certbot-dns-dnsmadeeasy-1.5.0.tar.gz) = 81beaaa98211d2f0ca5e51839b2e15778df51c49
-SHA512 (certbot-dns-dnsmadeeasy-1.5.0.tar.gz) = 2d2929cd7ed0d91a016543c299e33a89f02dedbdd940e5e58b26d68af839d6003d85c94e48a9e125f814b3930a8944085b609e22b605f592959278677619bc4a
-Size (certbot-dns-dnsmadeeasy-1.5.0.tar.gz) = 11995 bytes
+SHA1 (certbot-dns-dnsmadeeasy-1.6.0.tar.gz) = 5317261f1a06cf8cb51d7c82ccd0aef24f4a2536
+RMD160 (certbot-dns-dnsmadeeasy-1.6.0.tar.gz) = c7f2a8d60d104a4ab5df9a8dca89d4d803495790
+SHA512 (certbot-dns-dnsmadeeasy-1.6.0.tar.gz) = fc7520024edf1fc0ba341025d530fbe2b8ae7b28f320f6c2479bd4128c7e87c8529125b49ecd689e266493098efc209c98d28515b0d3a859ca85b6b45d904725
+Size (certbot-dns-dnsmadeeasy-1.6.0.tar.gz) = 12069 bytes
diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo
index ef0867fff23..1d670d63fc7 100644
--- a/security/py-certbot-dns-gehirn/distinfo
+++ b/security/py-certbot-dns-gehirn/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/06/09 12:47:36 mef Exp $
+$NetBSD: distinfo,v 1.13 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-gehirn-1.5.0.tar.gz) = 6d94910e59ef0ea974d4343d17219a16dd40df9b
-RMD160 (certbot-dns-gehirn-1.5.0.tar.gz) = f0bbfa41131db1ee1bddd4d37b1c8987b44b96c3
-SHA512 (certbot-dns-gehirn-1.5.0.tar.gz) = afa3a87fb6014c92e7bb1a92ff0067b41aa33925d89afa2ffd38bce85a5153f074e8d88be66b384e9b3ceaf1f31b09fb72496bb33e50acc79982ad9948621281
-Size (certbot-dns-gehirn-1.5.0.tar.gz) = 11854 bytes
+SHA1 (certbot-dns-gehirn-1.6.0.tar.gz) = ffea36aafacf272d4150b74aa173b6bf10e1f963
+RMD160 (certbot-dns-gehirn-1.6.0.tar.gz) = 09463c9fc2f833fb7c04dc8e5ef5d9c364d9cf01
+SHA512 (certbot-dns-gehirn-1.6.0.tar.gz) = 64a3c279680428110c3bbea6b53a6397275dfc3c4443d4b41b0cb4d1b4d14eda5e1e63255c2aae7e80a5f37506679ea7e29abb92bcd89585672611259c23d1ad
+Size (certbot-dns-gehirn-1.6.0.tar.gz) = 11932 bytes
diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo
index c8cc37a0812..a04b9ff9461 100644
--- a/security/py-certbot-dns-google/distinfo
+++ b/security/py-certbot-dns-google/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/06/09 12:47:36 mef Exp $
+$NetBSD: distinfo,v 1.13 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-google-1.5.0.tar.gz) = a9c92eb22bf03d81c04069526636ca0960bb2242
-RMD160 (certbot-dns-google-1.5.0.tar.gz) = d295cf1dbb190f0148813f90def0b02a58abc4fc
-SHA512 (certbot-dns-google-1.5.0.tar.gz) = 8adce5f70a1739f65c50281698a30dae973480c90d85a132bdab4fbae91b653e0ac34760b1bfd3222e1ea3ed7ee28c8c2b96874ea2fd722801d2ca869b12144f
-Size (certbot-dns-google-1.5.0.tar.gz) = 22248 bytes
+SHA1 (certbot-dns-google-1.6.0.tar.gz) = 5bc1a56f177fefd33d7695f479a3e76c8d243983
+RMD160 (certbot-dns-google-1.6.0.tar.gz) = 8efd0b0cb8b29c1f68e6ae77acc95aa6bdceac1f
+SHA512 (certbot-dns-google-1.6.0.tar.gz) = 2b02d65f427ce8ec2ddbf505c61dff98359a3ea125fd5f9423981e261d220012a539bf29a6e233f63e0a9c4877377e144c56fdedfc1351cb163f59ae3a93b0b8
+Size (certbot-dns-google-1.6.0.tar.gz) = 22315 bytes
diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo
index 1d6ced6f932..999bbf3b0f6 100644
--- a/security/py-certbot-dns-linode/distinfo
+++ b/security/py-certbot-dns-linode/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.13 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-linode-1.5.0.tar.gz) = 3291ba1f969a6cb751ea9115fd9c6304ab88d837
-RMD160 (certbot-dns-linode-1.5.0.tar.gz) = 94655b5d8ddc21c8f508b01bdc9f4e2c2af658d7
-SHA512 (certbot-dns-linode-1.5.0.tar.gz) = 5f29437f7d5cd22112ac1c357115e426a8d0e7ff554a587bbb17e10a9cd8a959063bbe01db34b0ea85ec99e9141a97076ee5c50a000736e623668f144206b008
-Size (certbot-dns-linode-1.5.0.tar.gz) = 12450 bytes
+SHA1 (certbot-dns-linode-1.6.0.tar.gz) = 484b8057e8767ba7bbdd692a73e0dc18bd545147
+RMD160 (certbot-dns-linode-1.6.0.tar.gz) = 7f068ffa0a29380b683f44adea0700fdc6f6061d
+SHA512 (certbot-dns-linode-1.6.0.tar.gz) = 06550e7d2c7d8367f4b93020a433d3bc25c84d18bb678019cca43ff66af3830b2fec5f5f997db560e2a555d582d061b2456e2faf1cb333a979bd7725538b1aaf
+Size (certbot-dns-linode-1.6.0.tar.gz) = 12522 bytes
diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo
index d180c132746..2f7d242a2b6 100644
--- a/security/py-certbot-dns-luadns/distinfo
+++ b/security/py-certbot-dns-luadns/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-luadns-1.5.0.tar.gz) = 52cd947f1131d7df52d4e9e2eac3c401c82a0b42
-RMD160 (certbot-dns-luadns-1.5.0.tar.gz) = 9ee7b45cf72b004a4fdbd0fdcc5110435d87fb31
-SHA512 (certbot-dns-luadns-1.5.0.tar.gz) = addfd8a1405d7c04527a4b8cb46bd89cc96d9a37b2d5ffad89066a236ec8b949a358a480ac2f5a40307eaa20b830be71d3ae21312c7a41aa0c86d5c35a657271
-Size (certbot-dns-luadns-1.5.0.tar.gz) = 11835 bytes
+SHA1 (certbot-dns-luadns-1.6.0.tar.gz) = 67e0d61af45f475902253d1a1da1757acab4b1fb
+RMD160 (certbot-dns-luadns-1.6.0.tar.gz) = 6ac87951e49afb854df3803550c0d9d4f42cffe3
+SHA512 (certbot-dns-luadns-1.6.0.tar.gz) = ba8bde7aea04202d7eb837c95420e17eb71ed0b68bccdb0825f9ed24470bdb8de7fe24736fa572ed31a95d16a760b90eee2940626a272e60927e5984f127ef8b
+Size (certbot-dns-luadns-1.6.0.tar.gz) = 11916 bytes
diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo
index 867d3a0e491..2fbcbabd833 100644
--- a/security/py-certbot-dns-nsone/distinfo
+++ b/security/py-certbot-dns-nsone/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:22 adam Exp $
 
-SHA1 (certbot-dns-nsone-1.5.0.tar.gz) = f22749cb6d2f85758371e5136e360dcd28d6c2cc
-RMD160 (certbot-dns-nsone-1.5.0.tar.gz) = ef871678d5d46356d13cc3e9a33d0723787e4caa
-SHA512 (certbot-dns-nsone-1.5.0.tar.gz) = 86e17fdafbac8405ad31827ff6f7353438295ee1c02f8e4cda546f6e8d588608e3fa6e520ed9aaba1481f59ef9d9f03cc3129343cdff3d94045f78ff83f7a28a
-Size (certbot-dns-nsone-1.5.0.tar.gz) = 11861 bytes
+SHA1 (certbot-dns-nsone-1.6.0.tar.gz) = 5cf829aba662ae72c3fc019404184819903f81de
+RMD160 (certbot-dns-nsone-1.6.0.tar.gz) = 66b6bb8f396f211ec6e7c400059fc0e7462a96ad
+SHA512 (certbot-dns-nsone-1.6.0.tar.gz) = 56ac99b07a0682f04a0711461d625273bd3e35f2be17026031c7c42b07bd3a550b4981e08fc2c70fc4455870cff1fe539b08606f994ef15c1d8dfb367f107584
+Size (certbot-dns-nsone-1.6.0.tar.gz) = 11932 bytes
diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo
index 90f8b482512..f564e27db2b 100644
--- a/security/py-certbot-dns-ovh/distinfo
+++ b/security/py-certbot-dns-ovh/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:23 adam Exp $
 
-SHA1 (certbot-dns-ovh-1.5.0.tar.gz) = ac5c8c9eb71b88ee38b1b511d40b5c90510006ab
-RMD160 (certbot-dns-ovh-1.5.0.tar.gz) = 779e3cdb9b85a8cef7438596811c78868d5920bd
-SHA512 (certbot-dns-ovh-1.5.0.tar.gz) = 7a9db2d64f962ed91f9f9b56d2306c556f7f9a36e75c2d706175848f6cdc55530eec3137026a4ed3ea2483ba88e3aaddae6138bea29fcd95f054cc09e4dd6d02
-Size (certbot-dns-ovh-1.5.0.tar.gz) = 12206 bytes
+SHA1 (certbot-dns-ovh-1.6.0.tar.gz) = 357e9eefdfd691f63b3f4bf4e8474f5b812f596e
+RMD160 (certbot-dns-ovh-1.6.0.tar.gz) = 38dead1c830e5c73ce6eaa12e13a9d1f9c7a023f
+SHA512 (certbot-dns-ovh-1.6.0.tar.gz) = 212666716a4731fddd66581327e41a988ed1a73cedab606bf37427d0b3a93e841c012934e5faf60c172593642a7a995a755fda430bc7fbb4f449c7c8ab17b363
+Size (certbot-dns-ovh-1.6.0.tar.gz) = 12277 bytes
diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo
index 3b3871027b9..192636d86b0 100644
--- a/security/py-certbot-dns-rfc2136/distinfo
+++ b/security/py-certbot-dns-rfc2136/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:23 adam Exp $
 
-SHA1 (certbot-dns-rfc2136-1.5.0.tar.gz) = 8065cd72722b5312ce6375fff8a30d1f3cb56113
-RMD160 (certbot-dns-rfc2136-1.5.0.tar.gz) = e950e7d2625c3939ac7f79b6cd2eaca71f92d483
-SHA512 (certbot-dns-rfc2136-1.5.0.tar.gz) = 64b34d0369f3847ad3c2b1d4a6c6114c8a6557c46a880a27b90808b0fc6afea9071eefcbf98cddfe6ff8795e1a81e682fe0284be1f07aca1656645b338021bcd
-Size (certbot-dns-rfc2136-1.5.0.tar.gz) = 14323 bytes
+SHA1 (certbot-dns-rfc2136-1.6.0.tar.gz) = 9df29e50cb59b584d6e93cdf526eff12eb6f4b08
+RMD160 (certbot-dns-rfc2136-1.6.0.tar.gz) = 943e776a9c720f8560fa688d4511cfb87a18de48
+SHA512 (certbot-dns-rfc2136-1.6.0.tar.gz) = d44c399384c175b4771f66aac04faac834e43309f525185decd0e03e40777be0e8a0db63d842781ea65b4b3af037f72ee1ef625e908939e19beede7255a9c510
+Size (certbot-dns-rfc2136-1.6.0.tar.gz) = 14395 bytes
diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo
index 098d09ac093..5ee5022e089 100644
--- a/security/py-certbot-dns-route53/distinfo
+++ b/security/py-certbot-dns-route53/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:23 adam Exp $
 
-SHA1 (certbot-dns-route53-1.5.0.tar.gz) = 2aa750d5692c782c077205fb2c9b5c2391c49fb7
-RMD160 (certbot-dns-route53-1.5.0.tar.gz) = f95129e97c847801ff7f50b48d8b41c1861a9d0c
-SHA512 (certbot-dns-route53-1.5.0.tar.gz) = f3395e26443d61fafb6606412a09ee8140b7eec18370bb25a664c1b1f3b20bf85fe3d06645781ce72bca614ae5a1e00fe5c71238d0a3af717b62125e596ef494
-Size (certbot-dns-route53-1.5.0.tar.gz) = 14804 bytes
+SHA1 (certbot-dns-route53-1.6.0.tar.gz) = ad65d9c43d80a0d776a4924d7421ccc480f9ebe4
+RMD160 (certbot-dns-route53-1.6.0.tar.gz) = 5a942c1a23783dc6cd786145d9f0ab55e864e3d6
+SHA512 (certbot-dns-route53-1.6.0.tar.gz) = 5ca2e52ab988e39473d4f8ca0b57d0c67232fed9b09e9f5bf876be60e7225229bfaaaf2767ae5c1bf15e113f2b32ab85349c5898f8391a816e75ddb5f265f654
+Size (certbot-dns-route53-1.6.0.tar.gz) = 14944 bytes
diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo
index c9d06ef4d1f..a49f2a98c5f 100644
--- a/security/py-certbot-dns-sakuracloud/distinfo
+++ b/security/py-certbot-dns-sakuracloud/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.17 2020/06/09 12:47:37 mef Exp $
+$NetBSD: distinfo,v 1.18 2020/07/10 10:24:23 adam Exp $
 
-SHA1 (certbot-dns-sakuracloud-1.5.0.tar.gz) = 130bdca6db7b90c2fd916232c1b0ae456064eb1c
-RMD160 (certbot-dns-sakuracloud-1.5.0.tar.gz) = ea352931c74ed16341512ac1bdd5e2df6856f443
-SHA512 (certbot-dns-sakuracloud-1.5.0.tar.gz) = 473a55aa9253ac189445eff43c4e0b7669f66d25b5dc258a9dd9c5591084f19f32e97593e1e33235042bb93ceab04c8391931ccbda9b6f484281868f00b7c11d
-Size (certbot-dns-sakuracloud-1.5.0.tar.gz) = 11861 bytes
+SHA1 (certbot-dns-sakuracloud-1.6.0.tar.gz) = 3e6e779e1c815e4f85487e6ff38d8a2c908ea947
+RMD160 (certbot-dns-sakuracloud-1.6.0.tar.gz) = 58d07f0c67e7ffc534e7ec1566e2747b9ac1f363
+SHA512 (certbot-dns-sakuracloud-1.6.0.tar.gz) = 45e474622948dfffb27d45f5d2d246cdfeb6ce16b6d83dc7fb026d311a24f593ac9f45c36795e9520e77e477d09aa2da733a1ad6048f294f1bdc0fdb7af47302
+Size (certbot-dns-sakuracloud-1.6.0.tar.gz) = 11934 bytes
diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile
index f2a616b7ead..1f72674b7c1 100644
--- a/security/py-certbot-nginx/Makefile
+++ b/security/py-certbot-nginx/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2020/06/21 08:00:03 plunky Exp $
+# $NetBSD: Makefile,v 1.13 2020/07/10 10:24:23 adam Exp $
 
 .include "../../security/py-certbot/Makefile.common"
 
 DISTNAME=	certbot-nginx-${CERTBOT_VERSION}
-PKGREVISION=	1
 MASTER_SITES=	${MASTER_SITE_PYPI:=c/certbot-nginx/}
 
 COMMENT=	Nginx plugin for Certbot
diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo
index 4c65c5ed75e..e6c60135e0a 100644
--- a/security/py-certbot-nginx/distinfo
+++ b/security/py-certbot-nginx/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.18 2020/06/21 08:00:03 plunky Exp $
+$NetBSD: distinfo,v 1.19 2020/07/10 10:24:23 adam Exp $
 
-SHA1 (certbot-nginx-1.5.0.tar.gz) = 6e92ce5ab68a6650810e36e85291f1bc6554ab90
-RMD160 (certbot-nginx-1.5.0.tar.gz) = c2f7f325f897a38e2e83ea58290c9178603bc6da
-SHA512 (certbot-nginx-1.5.0.tar.gz) = 034cd3b9be3bd6e4e15ec4e01335814013049d48932a55f99045ebee757ccfbc19d1513abdc6f0a9ec4d1ed985d5113368f9720d8a1e4fc0ff2548a346170a9e
-Size (certbot-nginx-1.5.0.tar.gz) = 73824 bytes
-SHA1 (patch-certbot__nginx___internal_constants.py) = b6e61f8785ffa2f6e0de0052105e2996bd93075c
+SHA1 (certbot-nginx-1.6.0.tar.gz) = cc35460faed314a6b195a2cae89ded892c083ee8
+RMD160 (certbot-nginx-1.6.0.tar.gz) = 5149861303f8d828ad4d4e18677fce56bc755965
+SHA512 (certbot-nginx-1.6.0.tar.gz) = 131b60b9da0d2248c9fbdb787d5fe70abe409c09bc9f8ae1d576f1127401761a9f3ca3f7dd0b38894fc48757057f8b89ffa678744a1fecb73040c1d525df2507
+Size (certbot-nginx-1.6.0.tar.gz) = 73891 bytes
+SHA1 (patch-certbot__nginx___internal_constants.py) = 806cd815f7db2654e8334d1f6cdf7b8e5c0cee4f
diff --git a/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py b/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py
index 0e6d3996806..6d1cf0ed6d8 100644
--- a/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py
+++ b/security/py-certbot-nginx/patches/patch-certbot__nginx___internal_constants.py
@@ -1,17 +1,27 @@
-$NetBSD: patch-certbot__nginx___internal_constants.py,v 1.1 2020/06/21 08:00:03 plunky Exp $
+$NetBSD: patch-certbot__nginx___internal_constants.py,v 1.2 2020/07/10 10:24:23 adam Exp $
 
 Look for nginx.conf in PKG_SYSCONFDIR
 
---- certbot_nginx/_internal/constants.py.orig	2020-02-04 21:46:57.000000000 +0000
+--- certbot_nginx/_internal/constants.py.orig	2020-07-07 17:13:20.000000000 +0000
 +++ certbot_nginx/_internal/constants.py
-@@ -1,8 +1,8 @@
+@@ -1,19 +1,8 @@
  """nginx plugin constants."""
  import platform
  
 -FREEBSD_DARWIN_SERVER_ROOT = "/usr/local/etc/nginx"
 -LINUX_SERVER_ROOT = "/etc/nginx"
-+FREEBSD_DARWIN_SERVER_ROOT = "@PKG_SYSCONFDIR@/nginx"
-+LINUX_SERVER_ROOT = "@PKG_SYSCONFDIR@/nginx"
- 
- if platform.system() in ('FreeBSD', 'Darwin'):
-     server_root_tmp = FREEBSD_DARWIN_SERVER_ROOT
+-PKGSRC_SERVER_ROOT = "/usr/pkg/etc/nginx"
+-
+-if platform.system() in ('FreeBSD', 'Darwin'):
+-    server_root_tmp = FREEBSD_DARWIN_SERVER_ROOT
+-elif platform.system() in ('NetBSD',):
+-    server_root_tmp = PKGSRC_SERVER_ROOT
+-else:
+-    server_root_tmp = LINUX_SERVER_ROOT
+-
+ CLI_DEFAULTS = dict(
+-    server_root=server_root_tmp,
++    server_root="@PKG_SYSCONFDIR@/nginx",
+     ctl="nginx",
+ )
+ """CLI defaults."""
diff --git a/security/py-certbot/MESSAGE b/security/py-certbot/MESSAGE
deleted file mode 100644
index 0aa85dc969f..00000000000
--- a/security/py-certbot/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.1 2016/05/25 18:18:16 fhajny Exp $
-
-This package installs the standalone certbot (letsencrypt) client.
-The following modes of obtaining certificates will work:
-
-  certbot --standalone -d <domain_name> certonly
-
-    Spawns a temporary daemon on port 80 or 443, the web server (if
-    any) will need to be shut down for the operation to succeed.
-
-  certbot --webroot -d <domain_name> -w <web_root> certonly
-
-    Doesn't spawn daemons, authenticates using temporary files
-    put in the document root directory.
-
-===========================================================================
diff --git a/security/py-certbot/Makefile.common b/security/py-certbot/Makefile.common
index 4d485de60ee..bd9a14bcd21 100644
--- a/security/py-certbot/Makefile.common
+++ b/security/py-certbot/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.44 2020/06/08 15:53:29 adam Exp $
+# $NetBSD: Makefile.common,v 1.45 2020/07/10 10:24:21 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.5.0
+CERTBOT_VERSION=	1.6.0
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES?=	security python
diff --git a/security/py-certbot/PLIST b/security/py-certbot/PLIST
index 2ab862a9aa4..f8f78adbd93 100644
--- a/security/py-certbot/PLIST
+++ b/security/py-certbot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.25 2020/05/07 10:53:44 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/07/10 10:24:21 adam Exp $
 bin/certbot-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -207,6 +207,9 @@ ${PYSITELIB}/certbot/tests/testdata/cert_2048.pem
 ${PYSITELIB}/certbot/tests/testdata/cert_512.pem
 ${PYSITELIB}/certbot/tests/testdata/cert_512_bad.pem
 ${PYSITELIB}/certbot/tests/testdata/cert_fullchain_2048.pem
+${PYSITELIB}/certbot/tests/testdata/cert_intermediate_1.pem
+${PYSITELIB}/certbot/tests/testdata/cert_intermediate_2.pem
+${PYSITELIB}/certbot/tests/testdata/cert_leaf.pem
 ${PYSITELIB}/certbot/tests/testdata/cli.ini
 ${PYSITELIB}/certbot/tests/testdata/csr-6sans_512.conf
 ${PYSITELIB}/certbot/tests/testdata/csr-6sans_512.pem
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index ef4a24cebeb..a252ca38fea 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.45 2020/06/08 15:53:29 adam Exp $
+$NetBSD: distinfo,v 1.46 2020/07/10 10:24:21 adam Exp $
 
-SHA1 (certbot-1.5.0.tar.gz) = 06689bfe2909bbcb8334949bae7aa7fcb0de75b5
-RMD160 (certbot-1.5.0.tar.gz) = 868e47d1d3ea9b6b7b15d2a2661073df69fc3248
-SHA512 (certbot-1.5.0.tar.gz) = 00cdb734771c7a274f75359928d1ce3fff03c4e9b6dfcce06f6b4ace5c3fd2980a1823c601f90147ab08018ecf5ee7d2a064bd1127ee0f300c5c1db894723c06
-Size (certbot-1.5.0.tar.gz) = 364819 bytes
+SHA1 (certbot-1.6.0.tar.gz) = a984d202e0717a30d285f92363a5b366b1a5706e
+RMD160 (certbot-1.6.0.tar.gz) = 340206479b21a69ca0e481fbf54031d027740e0d
+SHA512 (certbot-1.6.0.tar.gz) = 1b41381dd098746d5dc94b38f9c8473279282f810c97b9491277b6e25be98019144d498080c0759797efa0cb38a9004582819f6b6fac26f8a95da17dfb780a4e
+Size (certbot-1.6.0.tar.gz) = 371909 bytes