diff options
39 files changed, 64 insertions, 85 deletions
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile index 3665999f8a02..09f07576bd61 100644 --- a/security/py-acme/Makefile +++ b/security/py-acme/Makefile @@ -20,9 +20,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>=2.6.0:www/py-requests@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.3.0:www/py-requests-toolbelt@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}requests-toolbelt>=0.3.0:www/py-requests-toolbelt@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo index 3a8d5969b930..c6ee84855444 100644 --- a/security/py-acme/distinfo +++ b/security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974375 -SHA256 (acme-1.11.0.tar.gz) = 092eb09a074a935da4c10f66cb8634ffb2cc2d2cc1035d2998d608996efab924 -SIZE (acme-1.11.0.tar.gz) = 91313 +TIMESTAMP = 1615124930 +SHA256 (acme-1.13.0.tar.gz) = 6b4257dfd6a6d5f01e8cd4f0b10422c17836bed7c67e9c5b0a0ad6c7d651c088 +SIZE (acme-1.13.0.tar.gz) = 90210 diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk index 423df2107095..1f288f9b46d2 100644 --- a/security/py-acme/version.mk +++ b/security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 1.11.0 +ACME_VERSION= 1.13.0 diff --git a/security/py-certbot-apache/Makefile b/security/py-certbot-apache/Makefile index 67ed113380fe..d1a2d8f40391 100644 --- a/security/py-certbot-apache/Makefile +++ b/security/py-certbot-apache/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-augeas>0:textproc/py-python-augeas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index e27112d3d2be..e883f834478a 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974392 -SHA256 (certbot-apache-1.11.0.tar.gz) = 3ed001427ec0b49324f2b9af7170fa6e6e88948fa51c3678b07bf17f8138863d -SIZE (certbot-apache-1.11.0.tar.gz) = 221609 +TIMESTAMP = 1615124931 +SHA256 (certbot-apache-1.13.0.tar.gz) = 4b5a16e80c1418e2edc05fc2578f522fb24974b2c13eb747cdfeef69e5bd5ae1 +SIZE (certbot-apache-1.13.0.tar.gz) = 220736 diff --git a/security/py-certbot-dns-cloudflare/Makefile b/security/py-certbot-dns-cloudflare/Makefile index 3d977895f408..2680f1101e8f 100644 --- a/security/py-certbot-dns-cloudflare/Makefile +++ b/security/py-certbot-dns-cloudflare/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}cloudflare>=1.5.1:dns/py-cloudflare@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index ebd089d79e79..ea8d86426b4f 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974394 -SHA256 (certbot-dns-cloudflare-1.11.0.tar.gz) = d094f9d05465b57f6ed58a50b0668ba7d65c49e73e0c853f4027f4a6c6b2a8da -SIZE (certbot-dns-cloudflare-1.11.0.tar.gz) = 15611 +TIMESTAMP = 1615124932 +SHA256 (certbot-dns-cloudflare-1.13.0.tar.gz) = facbeecf88a7d97a9418a16fc9dffb9c99978d6ddfe1df0d729510100d9e3951 +SIZE (certbot-dns-cloudflare-1.13.0.tar.gz) = 15301 diff --git a/security/py-certbot-dns-cloudxns/Makefile b/security/py-certbot-dns-cloudxns/Makefile index 7b11a13f9cc6..62915cfb1839 100644 --- a/security/py-certbot-dns-cloudxns/Makefile +++ b/security/py-certbot-dns-cloudxns/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-cloudxns/distinfo b/security/py-certbot-dns-cloudxns/distinfo index 85ed6c234818..0f398dfc8077 100644 --- a/security/py-certbot-dns-cloudxns/distinfo +++ b/security/py-certbot-dns-cloudxns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974396 -SHA256 (certbot-dns-cloudxns-1.11.0.tar.gz) = c8e1ce87793d910f9a4c755331a16c5993c8142bf9d4c9bf3b71924f5233a864 -SIZE (certbot-dns-cloudxns-1.11.0.tar.gz) = 12792 +TIMESTAMP = 1615124933 +SHA256 (certbot-dns-cloudxns-1.13.0.tar.gz) = 47d948a9617726a7eb0a01ff0d92e44fbb6e9c37c7f6c7aecdddef7a1b5fa5f7 +SIZE (certbot-dns-cloudxns-1.13.0.tar.gz) = 12497 diff --git a/security/py-certbot-dns-digitalocean/Makefile b/security/py-certbot-dns-digitalocean/Makefile index 6062ad4457f4..d6e617a1982b 100644 --- a/security/py-certbot-dns-digitalocean/Makefile +++ b/security/py-certbot-dns-digitalocean/Makefile @@ -14,9 +14,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}python-digitalocean>=1.11:www/py-python-digitalocean@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index e692f1ae354b..6b3329b2d333 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974397 -SHA256 (certbot-dns-digitalocean-1.11.0.tar.gz) = 23f189c3c2a4e72bd271e1d4cb021cbe24cf7be0cf2be8d8f0efc780942127ed -SIZE (certbot-dns-digitalocean-1.11.0.tar.gz) = 14078 +TIMESTAMP = 1615124934 +SHA256 (certbot-dns-digitalocean-1.13.0.tar.gz) = 091bd8cca246cfd9a5199f3ff9900f6edde8d6cb55609eef602477548763c0a3 +SIZE (certbot-dns-digitalocean-1.13.0.tar.gz) = 13784 diff --git a/security/py-certbot-dns-dnsimple/Makefile b/security/py-certbot-dns-dnsimple/Makefile index cee6d4935be3..00af2ae47d09 100644 --- a/security/py-certbot-dns-dnsimple/Makefile +++ b/security/py-certbot-dns-dnsimple/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=3.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index 0f1bc6986307..0a155667d531 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974399 -SHA256 (certbot-dns-dnsimple-1.11.0.tar.gz) = 491d2ede681a9074766df0ffb3681f01a420a4652d871b7999a92da0ef7a4085 -SIZE (certbot-dns-dnsimple-1.11.0.tar.gz) = 12871 +TIMESTAMP = 1615124935 +SHA256 (certbot-dns-dnsimple-1.13.0.tar.gz) = 9f81d8c8c685233f61f445c7d462da5e675894a329a73f3fd5e3ccec4ab4a6a6 +SIZE (certbot-dns-dnsimple-1.13.0.tar.gz) = 12549 diff --git a/security/py-certbot-dns-dnsmadeeasy/Makefile b/security/py-certbot-dns-dnsmadeeasy/Makefile index dfee0f8e0d14..740209c264e1 100644 --- a/security/py-certbot-dns-dnsmadeeasy/Makefile +++ b/security/py-certbot-dns-dnsmadeeasy/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index 41f9aa8412b3..4d3bbb96a5a6 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974401 -SHA256 (certbot-dns-dnsmadeeasy-1.11.0.tar.gz) = 3a8b745833a0a2c84a4fc1c9d9120d5e2ccef5de2dc831fa093f0f9d3f7fb056 -SIZE (certbot-dns-dnsmadeeasy-1.11.0.tar.gz) = 12898 +TIMESTAMP = 1615124936 +SHA256 (certbot-dns-dnsmadeeasy-1.13.0.tar.gz) = 21e6bec07d2bc8eab76d16930276764d60a1ce50df1c82ae219b0f79f6e23adc +SIZE (certbot-dns-dnsmadeeasy-1.13.0.tar.gz) = 12607 diff --git a/security/py-certbot-dns-gehirn/Makefile b/security/py-certbot-dns-gehirn/Makefile index a01b2f1843a8..0289ef4d6597 100644 --- a/security/py-certbot-dns-gehirn/Makefile +++ b/security/py-certbot-dns-gehirn/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.1.22:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index 4903d2a4934c..c4851a2f8a2b 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974403 -SHA256 (certbot-dns-gehirn-1.11.0.tar.gz) = 8d9f5fd778a7c154e5c1361656949d84fe5e29b63ca5fa9fb691646afded1f02 -SIZE (certbot-dns-gehirn-1.11.0.tar.gz) = 12744 +TIMESTAMP = 1615124936 +SHA256 (certbot-dns-gehirn-1.13.0.tar.gz) = 9d8c334e36bf55637cc41cf0f83b35f72eef036eb18f9317dc7d1cdd651943d6 +SIZE (certbot-dns-gehirn-1.13.0.tar.gz) = 12453 diff --git a/security/py-certbot-dns-google/Makefile b/security/py-certbot-dns-google/Makefile index 6d48f72af5f7..b01c830d92d8 100644 --- a/security/py-certbot-dns-google/Makefile +++ b/security/py-certbot-dns-google/Makefile @@ -16,7 +16,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}google-api-python-client>=1.5.5:www/py-google-api-python-client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}httplib2>0:www/py-httplib2@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}oauth2client>=4.0:security/py-oauth2client@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index ed1f767374d8..06de2f1f66ae 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974404 -SHA256 (certbot-dns-google-1.11.0.tar.gz) = c96833ac293cf1e1320b1b1f9bae37b55c9813b7ee96335914f9fccbe36e87ee -SIZE (certbot-dns-google-1.11.0.tar.gz) = 24270 +TIMESTAMP = 1615124937 +SHA256 (certbot-dns-google-1.13.0.tar.gz) = d610f54f2597fdb251a9f483cbe8e0c6669654d2e1b34289f98f2e0410a596b8 +SIZE (certbot-dns-google-1.13.0.tar.gz) = 23934 diff --git a/security/py-certbot-dns-linode/Makefile b/security/py-certbot-dns-linode/Makefile index a765ef7179b5..b00a5dd1812f 100644 --- a/security/py-certbot-dns-linode/Makefile +++ b/security/py-certbot-dns-linode/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.3:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index deb838725d95..a00b6f7554be 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974406 -SHA256 (certbot-dns-linode-1.11.0.tar.gz) = 11691ee7d6a15babc78a40187c238fd253bd5ae6ce8b25c94aee62200e1af1b8 -SIZE (certbot-dns-linode-1.11.0.tar.gz) = 13214 +TIMESTAMP = 1615124938 +SHA256 (certbot-dns-linode-1.13.0.tar.gz) = 172a26716abb2ff8fd52d61e11b7ee33dcdda69d06b43ea4f3bd62768c13af36 +SIZE (certbot-dns-linode-1.13.0.tar.gz) = 12935 diff --git a/security/py-certbot-dns-luadns/Makefile b/security/py-certbot-dns-luadns/Makefile index 270bf20b538a..b7c310b83aeb 100644 --- a/security/py-certbot-dns-luadns/Makefile +++ b/security/py-certbot-dns-luadns/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index d470e0cef3b2..b21d31a14a4a 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974408 -SHA256 (certbot-dns-luadns-1.11.0.tar.gz) = a31bcce5ee87b985f92724743c9903ef1979f75bedcf4499c256aa107e0fedc1 -SIZE (certbot-dns-luadns-1.11.0.tar.gz) = 12726 +TIMESTAMP = 1615124938 +SHA256 (certbot-dns-luadns-1.13.0.tar.gz) = f9ece7b3bfc05323663be19f008232c4ad2f1265818c7b16a3ea9bb3a73938ce +SIZE (certbot-dns-luadns-1.13.0.tar.gz) = 12439 diff --git a/security/py-certbot-dns-nsone/Makefile b/security/py-certbot-dns-nsone/Makefile index 6370e3cb50ea..58b529e1e35c 100644 --- a/security/py-certbot-dns-nsone/Makefile +++ b/security/py-certbot-dns-nsone/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.2.1:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index 99fadd408832..1ba469842f31 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974409 -SHA256 (certbot-dns-nsone-1.11.0.tar.gz) = 197a117b9dc4b5518fa3c286cc9e9ef4a9124e6f706abc366ec36578be7df449 -SIZE (certbot-dns-nsone-1.11.0.tar.gz) = 12757 +TIMESTAMP = 1615124939 +SHA256 (certbot-dns-nsone-1.13.0.tar.gz) = 206b449819e064522337f7bcb4c9c8c0e1d90a95548ad24e6aea31c42d1ce711 +SIZE (certbot-dns-nsone-1.13.0.tar.gz) = 12467 diff --git a/security/py-certbot-dns-ovh/Makefile b/security/py-certbot-dns-ovh/Makefile index b72296b11af5..d48f067f66e7 100644 --- a/security/py-certbot-dns-ovh/Makefile +++ b/security/py-certbot-dns-ovh/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.7.14:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index eb769346c51f..1cb647da261c 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974411 -SHA256 (certbot-dns-ovh-1.11.0.tar.gz) = b82f16072946590612da2d9e5ce06d5d0361ef093c57bf01e18b4f36cc4ef1c2 -SIZE (certbot-dns-ovh-1.11.0.tar.gz) = 13069 +TIMESTAMP = 1615124940 +SHA256 (certbot-dns-ovh-1.13.0.tar.gz) = e4767f3b51225ce6223332225cd6e6491407d194d300302f73d8744446fe9e3a +SIZE (certbot-dns-ovh-1.13.0.tar.gz) = 12790 diff --git a/security/py-certbot-dns-rfc2136/Makefile b/security/py-certbot-dns-rfc2136/Makefile index 23de46f6cee5..bd939f51b7bf 100644 --- a/security/py-certbot-dns-rfc2136/Makefile +++ b/security/py-certbot-dns-rfc2136/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dnspython>0:dns/py-dnspython@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 71c0ba0bb2f4..500ed528863b 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974413 -SHA256 (certbot-dns-rfc2136-1.11.0.tar.gz) = 37652aa6c1f5095b4957735052ea0b6d2767d6c68d487e8c44d30a92e91f9168 -SIZE (certbot-dns-rfc2136-1.11.0.tar.gz) = 15588 +TIMESTAMP = 1615124941 +SHA256 (certbot-dns-rfc2136-1.13.0.tar.gz) = 9ba30819f90ecf22982e0892a28fe0c63e6a3f830cef0f474a79e7bfd1046229 +SIZE (certbot-dns-rfc2136-1.13.0.tar.gz) = 15018 diff --git a/security/py-certbot-dns-route53/Makefile b/security/py-certbot-dns-route53/Makefile index ef45e8f77a33..5582758e0672 100644 --- a/security/py-certbot-dns-route53/Makefile +++ b/security/py-certbot-dns-route53/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index 0306f1f2bb44..79ed444e3d7f 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974414 -SHA256 (certbot-dns-route53-1.11.0.tar.gz) = b53ca685a2ca23cbb5f2031f6d5341c20858e976e188d4610c5ddd34c9974442 -SIZE (certbot-dns-route53-1.11.0.tar.gz) = 15685 +TIMESTAMP = 1615124942 +SHA256 (certbot-dns-route53-1.13.0.tar.gz) = a69c2bbdb97b4c67c86cada8d5939602aea4b3c514671885e5e87272809b40e9 +SIZE (certbot-dns-route53-1.13.0.tar.gz) = 14971 diff --git a/security/py-certbot-dns-sakuracloud/Makefile b/security/py-certbot-dns-sakuracloud/Makefile index ed299d9749d7..adaee6b9c354 100644 --- a/security/py-certbot-dns-sakuracloud/Makefile +++ b/security/py-certbot-dns-sakuracloud/Makefile @@ -15,7 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dns-lexicon>=2.1.23:dns/py-dns-lexicon@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index 2c9e8b8a378a..475925437e36 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974416 -SHA256 (certbot-dns-sakuracloud-1.11.0.tar.gz) = e064d9d5e7d052c61cd9caebbb717a7728344abd1ba9c2599e6b15fb7cbb1612 -SIZE (certbot-dns-sakuracloud-1.11.0.tar.gz) = 12730 +TIMESTAMP = 1615124943 +SHA256 (certbot-dns-sakuracloud-1.13.0.tar.gz) = b5689f7c4f4375c6afa864f1d17cf873373c981034aaf7adcac118b850e34991 +SIZE (certbot-dns-sakuracloud-1.13.0.tar.gz) = 12453 diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile index 5b842a204def..3baa3bfbd5fa 100644 --- a/security/py-certbot-nginx/Makefile +++ b/security/py-certbot-nginx/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}certbot>=${ACME_VERSION},1:security/py-certbot@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyparsing>=1.5.5:devel/py-pyparsing@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index ca06f737ab9b..a4c96e411f93 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974418 -SHA256 (certbot-nginx-1.11.0.tar.gz) = 9afe611f99a78b8898941b8ad7bdcf7f3c2b6e0fce27125268f7c713e64b34ee -SIZE (certbot-nginx-1.11.0.tar.gz) = 76335 +TIMESTAMP = 1615124944 +SHA256 (certbot-nginx-1.13.0.tar.gz) = 9e972cc19c0fa9e5b7863da0423b156fbfb5623fd30b558fd2fd6d21c24c0b08 +SIZE (certbot-nginx-1.13.0.tar.gz) = 76011 diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index 3b7af0d4c85e..f167b38a2483 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -24,10 +24,8 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P ${PYTHON_PKGNAMEPREFIX}openssl>0:security/py-openssl@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrfc3339>0:devel/py-pyrfc3339@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytz>0:devel/py-pytz@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}zope.component>0:devel/py-zope.component@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}zope.interface>0:devel/py-zope.interface@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} USES= python:3.6+ diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index d39a7bbc103b..85d38ce38b2b 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1609974390 -SHA256 (certbot-1.11.0.tar.gz) = 6b0ce04e55379aff0a47f873fa05c084538ad0f4a9b79f33108dbb0a7a668b43 -SIZE (certbot-1.11.0.tar.gz) = 391257 +TIMESTAMP = 1615124931 +SHA256 (certbot-1.13.0.tar.gz) = 64cf41b57df7667d9d849fcaa9031a4f151788246733d1f4c3f37a5aa5e2f458 +SIZE (certbot-1.13.0.tar.gz) = 393163 diff --git a/security/py-certbot/files/patch-certbot-compat-misc.py b/security/py-certbot/files/patch-certbot-compat-misc.py index e9c60c47692c..c104a34cf796 100644 --- a/security/py-certbot/files/patch-certbot-compat-misc.py +++ b/security/py-certbot/files/patch-certbot-compat-misc.py @@ -4,9 +4,9 @@ # https://github.com/certbot/certbot/pull/7056 # TODO: Upstream ---- certbot/compat/misc.py.orig 2020-01-14 18:41:31 UTC +--- certbot/compat/misc.py.orig 2021-03-02 21:37:04 UTC +++ certbot/compat/misc.py -@@ -74,6 +74,11 @@ LINUX_DEFAULT_FOLDERS = { +@@ -79,6 +79,11 @@ LINUX_DEFAULT_FOLDERS = { 'work': '/var/lib/letsencrypt', 'logs': '/var/log/letsencrypt', } @@ -18,7 +18,7 @@ def get_default_folder(folder_type): -@@ -88,8 +93,13 @@ def get_default_folder(folder_type): +@@ -93,8 +98,13 @@ def get_default_folder(folder_type): """ if os.name != 'nt': diff --git a/security/py-certbot/files/patch-tests_cli__test.py b/security/py-certbot/files/patch-tests_cli__test.py index e3316a6b7984..f285dc6c2054 100644 --- a/security/py-certbot/files/patch-tests_cli__test.py +++ b/security/py-certbot/files/patch-tests_cli__test.py @@ -1,16 +1,16 @@ # See files/patch-certbot-compat-misc.py ---- tests/cli_test.py.orig 2020-03-03 20:36:36 UTC +--- tests/cli_test.py.orig 2021-03-02 21:37:04 UTC +++ tests/cli_test.py @@ -1,6 +1,7 @@ """Tests for certbot._internal.cli.""" import argparse import copy +import sys + from importlib import reload as reload_module + import io import tempfile - import unittest - -@@ -58,9 +59,14 @@ class FlagDefaultTest(unittest.TestCase): +@@ -62,9 +63,14 @@ class FlagDefaultTest(unittest.TestCase): def test_default_directories(self): if os.name != 'nt': |