Update security/py-{acme,certbot} to 0.21.0.

### Added

- Support for the HTTP-01 challenge type was added to our Apache and Nginx
  plugins.
- IPv6 support was added to the Nginx plugin.
- Support for automatically creating server blocks based on the default server
  block was added to the Nginx plugin.
- The flags --delete-after-revoke and --no-delete-after-revoke were added
  allowing users to control whether the revoke subcommand also deletes the
  certificates it is revoking.

### Changed

- We deprecated support for Python 2.6 and Python 3.3 in Certbot and its ACME
  library.
- We split our implementation of JOSE (Javascript Object Signing and
  Encryption) out of our ACME library and into a separate package named josepy.
- We updated the ciphersuites used in Apache to the new values recommended by
  Mozilla

### Fixed

- An issue with our Apache plugin on Gentoo due to differences in their
  apache2ctl command have been resolved.

6 files changed, 11 insertions, 72 deletions

diff --git a/security/py-acme/ALTERNATIVES b/security/py-acme/ALTERNATIVES
deleted file mode 100644
index f78bf7850cd..00000000000
--- a/security/py-acme/ALTERNATIVES
+++ /dev/null
@@ -1 +0,0 @@
-bin/jws @PREFIX@/bin/jws@PYVERSSUFFIX@
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index c322eabdda4..25be9511a91 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2017/12/09 16:39:03 fhajny Exp $
+# $NetBSD: Makefile,v 1.9 2018/01/22 13:37:25 fhajny Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/certbot/acme/}
 CATEGORIES=	security
@@ -9,6 +9,7 @@ LICENSE=	apache-2.0
 
 .include "../../security/py-certbot/Makefile.common"
 
+DEPENDS+=	${PYPKGPREFIX}-josepy>=1.0.0:../../security/py-josepy
 DEPENDS+=	${PYPKGPREFIX}-cryptography>=0.8:../../security/py-cryptography
 DEPENDS+=	${PYPKGPREFIX}-OpenSSL>=0.15:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-mock-[0-9]*:../../devel/py-mock
@@ -19,14 +20,7 @@ DEPENDS+=	${PYPKGPREFIX}-six>1.9.0:../../lang/py-six
 
 EGG_NAME=	${DISTNAME:S/certbot/acme/}
 
-# TEST_DEPENDS
-BUILD_DEPENDS+=	${PYPKGPREFIX}-pbr-[0-9]*:../../devel/py-pbr
-
 PYSETUPSUBDIR=	acme
 
-post-install:
-	${MV} ${DESTDIR}${PREFIX}/bin/jws \
-		${DESTDIR}${PREFIX}/bin/jws${PYVERSSUFFIX}
-
 .include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/py-acme/PLIST b/security/py-acme/PLIST
index 54d23816984..42ef1bdeef0 100644
--- a/security/py-acme/PLIST
+++ b/security/py-acme/PLIST
@@ -1,9 +1,7 @@
-@comment $NetBSD: PLIST,v 1.6 2017/08/03 22:12:17 fhajny Exp $
-bin/jws${PYVERSSUFFIX}
+@comment $NetBSD: PLIST,v 1.7 2018/01/22 13:37:25 fhajny Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
-${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
 ${PYSITELIB}/${EGG_INFODIR}/requires.txt
 ${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/acme/__init__.py
@@ -57,57 +55,6 @@ ${PYSITELIB}/acme/errors.py
 ${PYSITELIB}/acme/errors_test.py
 ${PYSITELIB}/acme/fields.py
 ${PYSITELIB}/acme/fields_test.py
-${PYSITELIB}/acme/jose/__init__.py
-${PYSITELIB}/acme/jose/__init__.pyo
-${PYSITELIB}/acme/jose/__init__.pyc
-${PYSITELIB}/acme/jose/b64.pyo
-${PYSITELIB}/acme/jose/b64.pyc
-${PYSITELIB}/acme/jose/b64_test.pyo
-${PYSITELIB}/acme/jose/b64_test.pyc
-${PYSITELIB}/acme/jose/errors.pyo
-${PYSITELIB}/acme/jose/errors.pyc
-${PYSITELIB}/acme/jose/errors_test.pyo
-${PYSITELIB}/acme/jose/errors_test.pyc
-${PYSITELIB}/acme/jose/interfaces.pyo
-${PYSITELIB}/acme/jose/interfaces.pyc
-${PYSITELIB}/acme/jose/interfaces_test.pyo
-${PYSITELIB}/acme/jose/interfaces_test.pyc
-${PYSITELIB}/acme/jose/json_util.pyo
-${PYSITELIB}/acme/jose/json_util.pyc
-${PYSITELIB}/acme/jose/json_util_test.pyo
-${PYSITELIB}/acme/jose/json_util_test.pyc
-${PYSITELIB}/acme/jose/jwa.pyo
-${PYSITELIB}/acme/jose/jwa.pyc
-${PYSITELIB}/acme/jose/jwa_test.pyo
-${PYSITELIB}/acme/jose/jwa_test.pyc
-${PYSITELIB}/acme/jose/jwk.pyo
-${PYSITELIB}/acme/jose/jwk.pyc
-${PYSITELIB}/acme/jose/jwk_test.pyo
-${PYSITELIB}/acme/jose/jwk_test.pyc
-${PYSITELIB}/acme/jose/jws.pyo
-${PYSITELIB}/acme/jose/jws.pyc
-${PYSITELIB}/acme/jose/jws_test.pyo
-${PYSITELIB}/acme/jose/jws_test.pyc
-${PYSITELIB}/acme/jose/util.pyo
-${PYSITELIB}/acme/jose/util.pyc
-${PYSITELIB}/acme/jose/util_test.pyo
-${PYSITELIB}/acme/jose/util_test.pyc
-${PYSITELIB}/acme/jose/b64.py
-${PYSITELIB}/acme/jose/b64_test.py
-${PYSITELIB}/acme/jose/errors.py
-${PYSITELIB}/acme/jose/errors_test.py
-${PYSITELIB}/acme/jose/interfaces.py
-${PYSITELIB}/acme/jose/interfaces_test.py
-${PYSITELIB}/acme/jose/json_util.py
-${PYSITELIB}/acme/jose/json_util_test.py
-${PYSITELIB}/acme/jose/jwa.py
-${PYSITELIB}/acme/jose/jwa_test.py
-${PYSITELIB}/acme/jose/jwk.py
-${PYSITELIB}/acme/jose/jwk_test.py
-${PYSITELIB}/acme/jose/jws.py
-${PYSITELIB}/acme/jose/jws_test.py
-${PYSITELIB}/acme/jose/util.py
-${PYSITELIB}/acme/jose/util_test.py
 ${PYSITELIB}/acme/jws.py
 ${PYSITELIB}/acme/jws_test.py
 ${PYSITELIB}/acme/messages.py
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index f63553c3b10..8b0bc780ba3 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2017/12/09 16:39:03 fhajny Exp $
+# $NetBSD: Makefile,v 1.7 2018/01/22 13:37:25 fhajny Exp $
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	security
@@ -16,7 +16,6 @@ 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}-mock-[0-9]*:../../devel/py-mock
-DEPENDS+=	${PYPKGPREFIX}-OpenSSL-[0-9]*:../../security/py-OpenSSL
 DEPENDS+=	${PYPKGPREFIX}-parsedatetime>=2.0:../../time/py-parsedatetime
 DEPENDS+=	${PYPKGPREFIX}-pytz-[0-9]*:../../time/py-pytz
 DEPENDS+=	${PYPKGPREFIX}-rfc3339-[0-9]*:../../time/py-rfc3339
diff --git a/security/py-certbot/Makefile.common b/security/py-certbot/Makefile.common
index 1583217b53f..dffc03c699f 100644
--- a/security/py-certbot/Makefile.common
+++ b/security/py-certbot/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.18 2017/12/09 16:39:03 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.19 2018/01/22 13:37:25 fhajny Exp $
 #
 # used by security/py-acme/Makefile
 # used by security/py-certbot/Makefile
 
-DISTNAME=	certbot-0.20.0
+DISTNAME=	certbot-0.21.0
 MASTER_SITES=	${MASTER_SITE_GITHUB:=certbot/}
 
 HOMEPAGE=	https://letsencrypt.org/
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index bbbb578b5d7..fc0d051b962 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.18 2017/12/09 16:39:03 fhajny Exp $
+$NetBSD: distinfo,v 1.19 2018/01/22 13:37:25 fhajny Exp $
 
-SHA1 (certbot-0.20.0.tar.gz) = dc61e4acdf47941997f8904e0288a219136fac6c
-RMD160 (certbot-0.20.0.tar.gz) = b4b776d559c6ac0d36fbed606d1d52c829462b39
-SHA512 (certbot-0.20.0.tar.gz) = 92c128bc955a576a1eb568d39b3a5568f9bd841acefaa455d716ce5036312d0ad67b3dcfcf960b15abdd39c1f34f82ffe2ebca0722628c5c804fc5472a6c0546
-Size (certbot-0.20.0.tar.gz) = 1108139 bytes
+SHA1 (certbot-0.21.0.tar.gz) = 8fe8a60bb4b131984e8df072d7816cd14ef8c3c5
+RMD160 (certbot-0.21.0.tar.gz) = 6d74b83b5211fc2fd7cb96136b80db4ddee6ba7c
+SHA512 (certbot-0.21.0.tar.gz) = 87d1f2b5153f8fc6a5cf1ee3e6ba084464d2094ef0ae8955d4ac3c75de759cd62c54465186a21b4d4205193f410cbfcb93f4af4f29bfdb21f7cc881a38c4340f
+Size (certbot-0.21.0.tar.gz) = 1105665 bytes