Page MenuHomeFreeBSD
Files F111126897

D10612.id29906.diff
No OneTemporary
Actions

D10612.id29906.diff
View Options

Index: security/py-acme/Makefile
===================================================================
--- security/py-acme/Makefile
+++ 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,20 +15,14 @@
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}mock>0:devel/py-mock \
${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}nose>0:devel/py-nose
+ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six
+TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose
USES= python
USE_PYTHON= autoplist distutils
Index: security/py-acme/distinfo
===================================================================
--- security/py-acme/distinfo
+++ 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
Index: security/py-acme/files/patch-setup.py
===================================================================
--- security/py-acme/files/patch-setup.py
+++ security/py-acme/files/patch-setup.py
@@ -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',
Index: security/py-certbot/Makefile
===================================================================
--- security/py-certbot/Makefile
+++ 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,12 +17,10 @@
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 \
Index: security/py-certbot/distinfo
===================================================================
--- security/py-certbot/distinfo
+++ 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
Index: security/py-certbot/files/patch-certbot_tests_util__test.py
===================================================================
--- security/py-certbot/files/patch-certbot_tests_util__test.py
+++ security/py-certbot/files/patch-certbot_tests_util__test.py
@@ -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."""
Index: security/py-certbot/files/patch-certbot_util.py
===================================================================
--- security/py-certbot/files/patch-certbot_util.py
+++ security/py-certbot/files/patch-certbot_util.py
@@ -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)
-
Index: security/py-certbot/files/patch-setup.py
===================================================================
--- security/py-certbot/files/patch-setup.py
+++ security/py-certbot/files/patch-setup.py
@@ -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',

File Metadata

Mime Type
text/plain
Expires
Fri, Feb 28, 7:14 PM (11 h, 44 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16889930
Default Alt Text
D10612.id29906.diff (8 KB)

Event Timeline