update certbot

crypto/certbot/Makefile

@@ -10,8 +10,7 @@ MASTER_SITES=	CHEESESHOP
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Let's Encrypt client #'
 
-ACME_VERSION=	0.26.1
-
+ACME_VERSION=	1.0.0
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION}:python/py-acme@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:python/py-configargparse@${PY_FLAVOR} \
@@ -39,9 +38,7 @@ USE_PYTHON=	autoplist distutils
 NO_ARCH=	yes
 
 post-patch:
-	${REINPLACE_CMD} \
-		-e 's|/etc/|${LOCALBASE}/etc/|' \
-		-e 's|/var/lib|/var/db|' \
-		${WRKSRC}/${PORTNAME}/constants.py
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py
+
 
 .include <bsd.port.mk>

crypto/certbot/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1532431460
-SHA256 (certbot-0.26.1.tar.gz) = 4983513d63f7f36e24a07873ca2d6ea1c0101aa6cb1cd825cda02ed520f6ca66
-SIZE (certbot-0.26.1.tar.gz) = 311419
+TIMESTAMP = 1578553469
+SHA256 (certbot-1.0.0.tar.gz) = 86b82d31db19fffffb0d6b218951e2121ef514e3ff659aa042deaf92a33e302a
+SIZE (certbot-1.0.0.tar.gz) = 357926

crypto/certbot/files/patch-certbot-compat-misc.py

@@ -0,0 +1,34 @@
+# Incorrect config file path since update to 0.29.1
+# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233909
+# TODO: Upstream
+
+--- certbot/compat/misc.py.orig	2019-04-04 22:02:08 UTC
++++ certbot/compat/misc.py
+@@ -129,6 +129,11 @@ LINUX_DEFAULT_FOLDERS = {
+     'work': '/var/lib/letsencrypt',
+     'logs': '/var/log/letsencrypt',
+ }
++FREEBSD_DEFAULT_FOLDERS = {
++    'config': '/usr/local/etc/letsencrypt',
++    'work': '/var/db/letsencrypt',
++    'logs': '/var/log/letsencrypt',
++}
+ 
+ 
+ def get_default_folder(folder_type):
+@@ -142,8 +147,13 @@ def get_default_folder(folder_type):
+ 
+     """
+     if os.name != 'nt':
+-        # Linux specific
+-        return LINUX_DEFAULT_FOLDERS[folder_type]
++        # Unix-like
++        if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'):
++            # FreeBSD specific
++            return FREEBSD_DEFAULT_FOLDERS[folder_type]
++        else:
++            # Linux specific
++            return LINUX_DEFAULT_FOLDERS[folder_type]
+     # Windows specific
+     return WINDOWS_DEFAULT_FOLDERS[folder_type]
+ 

crypto/certbot/files/patch-setup.py

@@ -1,15 +1,15 @@
---- setup.py.orig	2018-03-08 22:20:34 UTC
+--- setup.py.orig	2019-05-07 19:17:33 UTC
 +++ setup.py
-@@ -44,7 +44,6 @@ install_requires = [
-     'configobj',
-     'cryptography>=1.2',  # load_pem_x509_certificate
-     'josepy',
+@@ -43,7 +43,6 @@ install_requires = [
+     # 1.1.0+ is required to avoid the warnings described at
+     # https://github.com/certbot/josepy/issues/13.
+     'josepy>=1.1.0',
 -    'mock',
      'parsedatetime>=1.3',  # Calendar.parseDT
      'pyrfc3339',
      'pytz',
-@@ -58,6 +57,7 @@ dev_extras = [
-     'astroid==1.3.5',
+@@ -56,6 +55,7 @@ dev_extras = [
+     'astroid==1.6.5',
      'coverage',
      'ipdb',
 +    'mock',