diff options
Diffstat (limited to 'security/py-certbot')
| -rw-r--r-- | security/py-certbot/Makefile | 4 | ||||
| -rw-r--r-- | security/py-certbot/distinfo | 6 | ||||
| -rw-r--r-- | security/py-certbot/files/patch-certbot-compat-misc.py | 2 | ||||
| -rw-r--r-- | security/py-certbot/files/patch-tests_cli__test.py | 30 |
4 files changed, 38 insertions, 4 deletions
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') |