security/py-{acme,certbot}: update to 0.15.0

Common:

- Update PORTVERSION and distinfo checksum (0.15.0)
- Update RUN/TEST dependencies
- Remove unnecessary patches (applied upstream)

Changes: https://github.com/certbot/certbot/blob/master/CHANGELOG.md#0150---2017-06-08

Reviewed by:	koobs
Approved by:	koobs (maintainer, py-certbot)
Differential Revision:	https://reviews.freebsd.org/D10612

8 files changed, 14 insertions, 129 deletions

diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile
index 4dae2f2..b94f381 100644
--- a/security/py-acme/Makefile
+++ b/security/py-acme/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	acme
-PORTVERSION=	0.13.0
-PORTREVISION=	2
+PORTVERSION=	0.15.0
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
@@ -16,19 +15,13 @@ LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0.8:security/py-cryptography \
-		${PYTHON_PKGNAMEPREFIX}ndg_httpsclient>0:net/py-ndg_httpsclient \
-		${PYTHON_PKGNAMEPREFIX}pyasn1>0:devel/py-pyasn1 \
-		${PYTHON_PKGNAMEPREFIX}dnspython>=1.12:dns/py-dnspython \
-		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna \
 		${PYTHON_PKGNAMEPREFIX}openssl>=0.13:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
-		${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests \
+		${PYTHON_PKGNAMEPREFIX}requests>=2.10:www/py-requests \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
-		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}werkzeug>0:www/py-werkzeug
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}funcsigs>0:devel/py-funcsigs \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock \
 		${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
 
 USES=		python
diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo
index d36516c..2420648 100644
--- a/security/py-acme/distinfo
+++ b/security/py-acme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491648474
-SHA256 (acme-0.13.0.tar.gz) = 7489b3e20d02da0a389aedb82408ffb6b76294e41d833db85591b9f779539815
-SIZE (acme-0.13.0.tar.gz) = 90794
+TIMESTAMP = 1498041540
+SHA256 (acme-0.15.0.tar.gz) = 9fadd63322a1eb95f58e6cda8ca2095c750e828ae470bc6e3925ef618c7cfc87
+SIZE (acme-0.15.0.tar.gz) = 93083
diff --git a/security/py-acme/files/patch-setup.py b/security/py-acme/files/patch-setup.py
deleted file mode 100644
index 1730527..0000000
--- a/security/py-acme/files/patch-setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.py.orig	2017-04-30 10:29:55 UTC
-+++ setup.py
-@@ -8,7 +8,6 @@ version = '0.13.0'
- 
- # Please update tox.ini when modifying dependency version requirements
- install_requires = [
--    'argparse',
-     # load_pem_private/public_key (>=0.6)
-     # rsa_recover_prime_factors (>=0.8)
-     'cryptography>=0.8',
-@@ -28,6 +27,10 @@ install_requires = [
-     'six',
- ]
- 
-+# env markers cause problems with older pip and setuptools
-+if sys.version_info < (2, 7):
-+    install_requires.append('argparse')
-+
- dev_extras = [
-     'nose',
-     'tox',
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index 91a0c84..c2515bf 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	certbot
-PORTVERSION=	0.13.0
-PORTREVISION=	2
+PORTVERSION=	0.15.0
 PORTEPOCH=	1
 CATEGORIES=	security python
 MASTER_SITES=	CHEESESHOP
@@ -18,18 +17,16 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}acme==${PKGVERSION}:security/py-acme \
 		${PYTHON_PKGNAMEPREFIX}configargparse>=0.9.3:devel/py-configargparse \
 		${PYTHON_PKGNAMEPREFIX}configobj>0:devel/py-configobj \
-		${PYTHON_PKGNAMEPREFIX}cryptography>=0.7:security/py-cryptography \
+		${PYTHON_PKGNAMEPREFIX}cryptography>=1.2:security/py-cryptography \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=1.3:devel/py-parsedatetime \
-		${PYTHON_PKGNAMEPREFIX}psutil>=2.2.1:sysutils/py-psutil \
 		${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl \
 		${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339 \
-		${PYTHON_PKGNAMEPREFIX}python2-pythondialog>=3.2.2r1:devel/py-python2-pythondialog \
 		${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=1.0:devel/${PYTHON_PKGNAMEPREFIX}setuptools \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
 		${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component \
-		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface \
-		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
+		${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
 USES=		python:-2.7
 USE_PYTHON=	autoplist distutils
diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo
index 59a2a7a..4bc6887 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1491648489
-SHA256 (certbot-0.13.0.tar.gz) = f63ad7747edaca2fb7d60c28882e44d2f48ff1cca9b9c7c251ad47e2189c00f3
-SIZE (certbot-0.13.0.tar.gz) = 241627
+TIMESTAMP = 1498041767
+SHA256 (certbot-0.15.0.tar.gz) = b8c4043b2b8df39660d4ce4a2a6eca590f98ece0e1b97eba53ab95f3bbac3beb
+SIZE (certbot-0.15.0.tar.gz) = 268504
diff --git a/security/py-certbot/files/patch-certbot_tests_util__test.py b/security/py-certbot/files/patch-certbot_tests_util__test.py
deleted file mode 100644
index 22f8eb2..0000000
--- a/security/py-certbot/files/patch-certbot_tests_util__test.py
+++ /dev/null
@@ -1,40 +0,0 @@
-From 42d07d756df0cf96c9d20b44e772858391d48384 Mon Sep 17 00:00:00 2001
-From: Ryan Pineo <ry@tsl.io>
-Date: Fri, 12 May 2017 15:45:54 -0400
-Subject: [PATCH] support version 0.12.0 of configargparse
-
-fixes #4648
-
---- certbot/tests/util_test.py.orig	2017-05-16 07:27:15 UTC
-+++ certbot/tests/util_test.py
-@@ -5,6 +5,7 @@ import os
- import stat
- import unittest
- 
-+import configargparse
- import mock
- import six
- 
-@@ -333,6 +334,22 @@ class AddDeprecatedArgumentTest(unittest
-                 pass
-         self.assertTrue("--old-option" not in stdout.getvalue())
- 
-+    def test_when_configargparse(self):
-+        '''In configargparse version < 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a set.'''
-+        orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
-+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = set()
-+        self._call("--old-option", 1)
-+        self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
-+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
-+
-+    def test_when_configargparse_tuple(self):
-+        '''In configargparse version >= 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE is a tuple.'''
-+        orig = configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE
-+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = tuple()
-+        self._call("--old-option", 1)
-+        self.assertEqual(len(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE), 1)
-+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE = orig
-+
- 
- class EnforceLeValidity(unittest.TestCase):
-     """Test enforce_le_validity."""
diff --git a/security/py-certbot/files/patch-certbot_util.py b/security/py-certbot/files/patch-certbot_util.py
deleted file mode 100644
index c06f799..0000000
--- a/security/py-certbot/files/patch-certbot_util.py
+++ /dev/null
@@ -1,23 +0,0 @@
-From 42d07d756df0cf96c9d20b44e772858391d48384 Mon Sep 17 00:00:00 2001
-From: Ryan Pineo <ry@tsl.io>
-Date: Fri, 12 May 2017 15:45:54 -0400
-Subject: [PATCH] support version 0.12.0 of configargparse
-
-fixes #4648
-
---- certbot/util.py.orig	2017-05-16 07:21:46 UTC
-+++ certbot/util.py
-@@ -437,7 +437,12 @@ def add_deprecated_argument(add_argument
-             sys.stderr.write(
-                 "Use of {0} is deprecated.\n".format(option_string))
- 
--    configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)
-+    # In version 0.12.0 ACTION_TYPES_THAT_DONT_NEED_A_VALUE was changed from a set
-+    # to a tuple.
-+    if isinstance(configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE, set):
-+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE.add(ShowWarning)
-+    else:
-+        configargparse.ACTION_TYPES_THAT_DONT_NEED_A_VALUE += (ShowWarning,)
-     add_argument(argument_name, action=ShowWarning,
-                  help=argparse.SUPPRESS, nargs=nargs)
- 
diff --git a/security/py-certbot/files/patch-setup.py b/security/py-certbot/files/patch-setup.py
deleted file mode 100644
index 3f0c35d..0000000
--- a/security/py-certbot/files/patch-setup.py
+++ /dev/null
@@ -1,21 +0,0 @@
---- setup.py.orig	2017-04-30 10:33:38 UTC
-+++ setup.py
-@@ -36,7 +36,6 @@ version = meta['version']
- # https://github.com/pypa/pip/issues/988 for more info.
- install_requires = [
-     'acme=={0}'.format(version),
--    'argparse',
-     # We technically need ConfigArgParse 0.10.0 for Python 2.6 support, but
-     # saying so here causes a runtime error against our temporary fork of 0.9.3
-     # in which we added 2.6 support (see #2243), so we relax the requirement.
-@@ -56,6 +55,10 @@ install_requires = [
-     'zope.interface',
- ]
- 
-+# env markers cause problems with older pip and setuptools
-+if sys.version_info < (2, 7):
-+    install_requires.append('argparse')
-+
- dev_extras = [
-     # Pin astroid==1.3.5, pylint==1.4.2 as a workaround for #289
-     'astroid==1.3.5',