diff options
| author | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-03-18 00:21:59 +0000 |
|---|---|---|
| committer | Danilo G. Baio <dbaio@FreeBSD.org> | 2020-03-18 00:21:59 +0000 |
| commit | c55f495230589b775460461ae6988e6042598ea1 (patch) | |
| tree | 949ad2a4df8f321809cd4a0a2e0d411052604df2 | |
| parent | science/agrum: Update 0.16.4 -> 0.17.1 (diff) | |
security/py-[acme|certbot]: Update to 1.3.0
Add patch to satisfy a 'test' error, our local patch to fix config
file path was reverted upstream, we need some action there.
Changelog: https://github.com/certbot/certbot/releases/tag/v1.3.0
PR: 244826
Approved by: koobs (python, maintainer)
23 files changed, 91 insertions, 57 deletions
diff --git a/security/py-acme/Makefile b/security/py-acme/Makefile index b3a1a5664bd2..4aebabaa0872 100644 --- a/security/py-acme/Makefile +++ b/security/py-acme/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=1.2.3:security/py-cryptography ${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>0:devel/py-six@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}six>=1.9.0:devel/py-six@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose@${PY_FLAVOR} diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo index db3fad93872e..da8dc5054125 100644 --- a/security/py-acme/distinfo +++ b/security/py-acme/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355018 -SHA256 (acme-1.2.0.tar.gz) = 0630c740d49bda945e97bd35fc8d6f02d082c8cb9e18f8fec0dbb3d395ac26ab -SIZE (acme-1.2.0.tar.gz) = 79192 +TIMESTAMP = 1584280498 +SHA256 (acme-1.3.0.tar.gz) = c0de9e1fbcb4a28509825a4d19ab5455910862b23fa338acebc7bbe7c0abd20d +SIZE (acme-1.3.0.tar.gz) = 78471 diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk index b5e1d63f1393..2a2abecbca94 100644 --- a/security/py-acme/version.mk +++ b/security/py-acme/version.mk @@ -1 +1 @@ -ACME_VERSION= 1.2.0 +ACME_VERSION= 1.3.0 diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index b71d3925ba2d..b61577a9baec 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355022 -SHA256 (certbot-apache-1.2.0.tar.gz) = b46e9def272103a68108e48bf7e410ea46801529b1ea6954f6506b14dd9df9b3 -SIZE (certbot-apache-1.2.0.tar.gz) = 192297 +TIMESTAMP = 1584280684 +SHA256 (certbot-apache-1.3.0.tar.gz) = 4a6bb818a7a70803127590a54bb25c1e79810761c9d4c92cf9f16a56b518bd52 +SIZE (certbot-apache-1.3.0.tar.gz) = 217789 diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index d334e7cc8b69..9a5e750d7861 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355024 -SHA256 (certbot-dns-cloudflare-1.2.0.tar.gz) = 9d75fb928728cbe9faadb9d64e2e2073d2cfc999d7308854205075739116bbac -SIZE (certbot-dns-cloudflare-1.2.0.tar.gz) = 14882 +TIMESTAMP = 1584280685 +SHA256 (certbot-dns-cloudflare-1.3.0.tar.gz) = b724b89fb6068f430d300b5581dd0407c5237ee1b3144bbdaebacdda8f9f2c09 +SIZE (certbot-dns-cloudflare-1.3.0.tar.gz) = 14609 diff --git a/security/py-certbot-dns-cloudxns/distinfo b/security/py-certbot-dns-cloudxns/distinfo index 1886c520abb6..7b6d926d4f0b 100644 --- a/security/py-certbot-dns-cloudxns/distinfo +++ b/security/py-certbot-dns-cloudxns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355026 -SHA256 (certbot-dns-cloudxns-1.2.0.tar.gz) = 7fefd374fa4ea6a8fc4e9faf9b63c27390f46fb5cdd0aaa28b40db9a9e696f72 -SIZE (certbot-dns-cloudxns-1.2.0.tar.gz) = 11699 +TIMESTAMP = 1584280686 +SHA256 (certbot-dns-cloudxns-1.3.0.tar.gz) = 56ea05da783fa7c5f0e11062137620422ba05883a47a1228c381ba735915c7cf +SIZE (certbot-dns-cloudxns-1.3.0.tar.gz) = 11765 diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index 6d214a92c40f..102b30987910 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355028 -SHA256 (certbot-dns-digitalocean-1.2.0.tar.gz) = 221139070a649e4b428964ff08f60bf8ee375a30effa7a4e88d9bb9529c89af5 -SIZE (certbot-dns-digitalocean-1.2.0.tar.gz) = 12952 +TIMESTAMP = 1584280687 +SHA256 (certbot-dns-digitalocean-1.3.0.tar.gz) = cab0cb6a82ec8108131a600b51af22630519d485f2c0da28e544516bd2b30111 +SIZE (certbot-dns-digitalocean-1.3.0.tar.gz) = 12970 diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index eed2fb7388bc..3c06626c5c2b 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355030 -SHA256 (certbot-dns-dnsimple-1.2.0.tar.gz) = 884a9414d82755121ee59deb30973f86de933746ae6cb61c40473eff8df3265f -SIZE (certbot-dns-dnsimple-1.2.0.tar.gz) = 11882 +TIMESTAMP = 1584280688 +SHA256 (certbot-dns-dnsimple-1.3.0.tar.gz) = ba8833c2c0c46a2f3505a1e42e6d2fc956d4137212d001b894ae2984747142e5 +SIZE (certbot-dns-dnsimple-1.3.0.tar.gz) = 11966 diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index 08f7a2046fe1..e0c6fc9b1f83 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355032 -SHA256 (certbot-dns-dnsmadeeasy-1.2.0.tar.gz) = c499d207580770cf02685e5caecf0c4bed928b4da6c18340401488d94ae2f0a0 -SIZE (certbot-dns-dnsmadeeasy-1.2.0.tar.gz) = 11725 +TIMESTAMP = 1584280689 +SHA256 (certbot-dns-dnsmadeeasy-1.3.0.tar.gz) = 15f109587cc0301cfb7d5ebc1c4a25c2c7af24243a56519413000018cfe63aa8 +SIZE (certbot-dns-dnsmadeeasy-1.3.0.tar.gz) = 11760 diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index 44657e6b05d1..0d1f8578720f 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355034 -SHA256 (certbot-dns-gehirn-1.2.0.tar.gz) = debb9796c51ea8da931be10ad8abba1957fa8132cc21b3f7cbf759ce7b295138 -SIZE (certbot-dns-gehirn-1.2.0.tar.gz) = 11742 +TIMESTAMP = 1584280690 +SHA256 (certbot-dns-gehirn-1.3.0.tar.gz) = 964fd5f105ba70485f275c3fa65435663182fa0a76be0f1b2333751a0a8fc7b2 +SIZE (certbot-dns-gehirn-1.3.0.tar.gz) = 11808 diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index 8da6212709f6..e33038ef8789 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355036 -SHA256 (certbot-dns-google-1.2.0.tar.gz) = 8390f2e60200fe21b9719d80f020696e7c4834380486d59fb101f46fe85f41ec -SIZE (certbot-dns-google-1.2.0.tar.gz) = 22376 +TIMESTAMP = 1584280691 +SHA256 (certbot-dns-google-1.3.0.tar.gz) = 3d7e3ff21a5e539e59dba05b318a14ee473e6926e0c924151ca30206e8ca4523 +SIZE (certbot-dns-google-1.3.0.tar.gz) = 22354 diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index 787d54b3dbd7..fd6861b32c37 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355038 -SHA256 (certbot-dns-linode-1.2.0.tar.gz) = 00cbedefa0abe7e49b40179e31bf72bc62ac8229d0bb8ff570d10dcc15b07378 -SIZE (certbot-dns-linode-1.2.0.tar.gz) = 12506 +TIMESTAMP = 1584280691 +SHA256 (certbot-dns-linode-1.3.0.tar.gz) = 1752d922730652829996463cd2d5f87af63cb2298fedc102b4c0df55299cd173 +SIZE (certbot-dns-linode-1.3.0.tar.gz) = 12354 diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index 092b2af602b8..889f2e1ccfba 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355040 -SHA256 (certbot-dns-luadns-1.2.0.tar.gz) = ed63153a34f9435337d37d29f21c810caa5b79d04c222c7ee5a9eed7528cca3b -SIZE (certbot-dns-luadns-1.2.0.tar.gz) = 11652 +TIMESTAMP = 1584280692 +SHA256 (certbot-dns-luadns-1.3.0.tar.gz) = 298c71e6977eaa72f5dc9714271f2c6cecd6004f8741a469f544c5dca78610d1 +SIZE (certbot-dns-luadns-1.3.0.tar.gz) = 11840 diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index 85feb16e68a9..57999eb4f3fd 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355042 -SHA256 (certbot-dns-nsone-1.2.0.tar.gz) = d94bd2ae08cb49fec45f7ac09a95089f326e20c98a769123846379939ac7fd21 -SIZE (certbot-dns-nsone-1.2.0.tar.gz) = 11664 +TIMESTAMP = 1584280693 +SHA256 (certbot-dns-nsone-1.3.0.tar.gz) = 43cf9c1a22aaf0099855b25acd0aea4a37befc66adafb08b9af04799032deabf +SIZE (certbot-dns-nsone-1.3.0.tar.gz) = 11700 diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index 635dfcb720cd..abbf58f8020d 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355044 -SHA256 (certbot-dns-ovh-1.2.0.tar.gz) = 865ebd73077b9e454b454c8a9012c75d22240c7ce5a25e2a151eb92c7891be9b -SIZE (certbot-dns-ovh-1.2.0.tar.gz) = 12112 +TIMESTAMP = 1584280694 +SHA256 (certbot-dns-ovh-1.3.0.tar.gz) = eba02419443a5365f55291c98d30e78745353a81afea8b2d6e5913dadd9be904 +SIZE (certbot-dns-ovh-1.3.0.tar.gz) = 11959 diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 3e36bdff3783..d3ae4b54e4e5 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355046 -SHA256 (certbot-dns-rfc2136-1.2.0.tar.gz) = 43e4293893c446cae2b213b3caae4d66c825ef8623bb64273dc43633eca0ff9e -SIZE (certbot-dns-rfc2136-1.2.0.tar.gz) = 14259 +TIMESTAMP = 1584280695 +SHA256 (certbot-dns-rfc2136-1.3.0.tar.gz) = 3415526d29cd4df6421b05b27ead1f53540312039a28c2977a97fc63e132a3a8 +SIZE (certbot-dns-rfc2136-1.3.0.tar.gz) = 14209 diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index bd8efdd81572..0640f239a3cd 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355048 -SHA256 (certbot-dns-route53-1.2.0.tar.gz) = 6f47e57a4b90cda327581345184ee713e16b10b802da3e220482d2b5b7820531 -SIZE (certbot-dns-route53-1.2.0.tar.gz) = 14592 +TIMESTAMP = 1584280696 +SHA256 (certbot-dns-route53-1.3.0.tar.gz) = 512657e173164543fa2a089e66ddc40d1270353f3e4b82ab8383dc9794aedc46 +SIZE (certbot-dns-route53-1.3.0.tar.gz) = 14865 diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index dd1b1ae74e04..31b4e238730e 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355050 -SHA256 (certbot-dns-sakuracloud-1.2.0.tar.gz) = 08f96d71a33c041035e54b7ea2e374f05a81c6493aa72d4ad79b5e6fea8e1d1f -SIZE (certbot-dns-sakuracloud-1.2.0.tar.gz) = 11600 +TIMESTAMP = 1584280697 +SHA256 (certbot-dns-sakuracloud-1.3.0.tar.gz) = f8caffeda33eb7bc27c2469da107db9644d9077c6fce22c69b44c07d0d8edcca +SIZE (certbot-dns-sakuracloud-1.3.0.tar.gz) = 11838 diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index 393e863da10e..8d98008f8519 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355052 -SHA256 (certbot-nginx-1.2.0.tar.gz) = 6fd7cf4f2545ad66e57000343227df9ccccaf04420e835e05cb3250fac1fa6db -SIZE (certbot-nginx-1.2.0.tar.gz) = 71386 +TIMESTAMP = 1584280698 +SHA256 (certbot-nginx-1.3.0.tar.gz) = 9aa0869c1250b7ea0a1eb1df6bdb5d0d6190d6ca0400da1033a8decc0df6f65b +SIZE (certbot-nginx-1.3.0.tar.gz) = 71274 diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index 56b381cf0d8e..3c7d9d2cb866 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -37,7 +37,9 @@ SUB_FILES= 500.certbot PLIST_FILES= etc/periodic/weekly/500.certbot post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ + ${WRKSRC}/certbot/compat/misc.py \ + ${WRKSRC}/tests/cli_test.py post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/weekly diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index c3423a11cf87..857ea780ce24 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1582355020 -SHA256 (certbot-1.2.0.tar.gz) = 95dcbae085f8e4eb18442fe7b12994b08964a9a6e8e352e556cdb4a8a625373c -SIZE (certbot-1.2.0.tar.gz) = 359006 +TIMESTAMP = 1584280683 +SHA256 (certbot-1.3.0.tar.gz) = bc2091cbbc2f432872ed69309046e79771d9c81cd441bde3e6a6553ecd04b1d8 +SIZE (certbot-1.3.0.tar.gz) = 362957 diff --git a/security/py-certbot/files/patch-certbot-compat-misc.py b/security/py-certbot/files/patch-certbot-compat-misc.py index 4f8d5d61946f..e9c60c47692c 100644 --- a/security/py-certbot/files/patch-certbot-compat-misc.py +++ b/security/py-certbot/files/patch-certbot-compat-misc.py @@ -1,5 +1,7 @@ # Incorrect config file path since update to 0.29.1 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=233909 +# https://github.com/certbot/certbot/pull/6702 +# https://github.com/certbot/certbot/pull/7056 # TODO: Upstream --- certbot/compat/misc.py.orig 2020-01-14 18:41:31 UTC diff --git a/security/py-certbot/files/patch-tests_cli__test.py b/security/py-certbot/files/patch-tests_cli__test.py new file mode 100644 index 000000000000..e3316a6b7984 --- /dev/null +++ b/security/py-certbot/files/patch-tests_cli__test.py @@ -0,0 +1,30 @@ +# See files/patch-certbot-compat-misc.py + +--- tests/cli_test.py.orig 2020-03-03 20:36:36 UTC ++++ tests/cli_test.py +@@ -1,6 +1,7 @@ + """Tests for certbot._internal.cli.""" + import argparse + import copy ++import sys + import tempfile + import unittest + +@@ -58,9 +59,14 @@ class FlagDefaultTest(unittest.TestCase): + + def test_default_directories(self): + if os.name != 'nt': +- self.assertEqual(cli.flag_default('config_dir'), '/etc/letsencrypt') +- self.assertEqual(cli.flag_default('work_dir'), '/var/lib/letsencrypt') +- self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt') ++ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): ++ self.assertEqual(cli.flag_default('config_dir'), '/usr/local/etc/letsencrypt') ++ self.assertEqual(cli.flag_default('work_dir'), '/var/db/letsencrypt') ++ self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt') ++ else: ++ self.assertEqual(cli.flag_default('config_dir'), '/etc/letsencrypt') ++ self.assertEqual(cli.flag_default('work_dir'), '/var/lib/letsencrypt') ++ self.assertEqual(cli.flag_default('logs_dir'), '/var/log/letsencrypt') + else: + self.assertEqual(cli.flag_default('config_dir'), 'C:\\Certbot') + self.assertEqual(cli.flag_default('work_dir'), 'C:\\Certbot\\lib') |