diff options
Diffstat (limited to '')
24 files changed, 119 insertions, 120 deletions
diff --git a/security/py-certbot-apache/Makefile b/security/py-certbot-apache/Makefile index cb57a26b075e..e847903f2aa3 100644 --- a/security/py-certbot-apache/Makefile +++ b/security/py-certbot-apache/Makefile @@ -28,8 +28,8 @@ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes post-patch: - @${REINPLACE_CMD} -e 's|apache2ctl|apachectl|' ${WRKSRC}/certbot_apache/_internal/configurator.py - @${REINPLACE_CMD} -e 's|/etc/apache2|${LOCALBASE}/etc/apache24|' ${WRKSRC}/certbot_apache/_internal/configurator.py + @${REINPLACE_CMD} -e 's|apache2ctl|apachectl|' ${WRKSRC}/src/certbot_apache/_internal/configurator.py + @${REINPLACE_CMD} -e 's|/etc/apache2|${LOCALBASE}/etc/apache24|' ${WRKSRC}/src/certbot_apache/_internal/configurator.py .include "${.CURDIR}/../py-acme/version.mk" .include <bsd.port.mk> diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo index 0e68734f0cac..d0f564e53439 100644 --- a/security/py-certbot-apache/distinfo +++ b/security/py-certbot-apache/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167597 -SHA256 (certbot_apache-4.0.0.tar.gz) = 507f9a336bd95c25548f449d8307eead6f875186a13049de173d6833371910a2 -SIZE (certbot_apache-4.0.0.tar.gz) = 183105 +TIMESTAMP = 1754427672 +SHA256 (certbot_apache-4.2.0.tar.gz) = b1588a5d278cb1182c0a18d182f5d3994701e784f28da5546fcd8bab54fcf411 +SIZE (certbot_apache-4.2.0.tar.gz) = 183639 diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo index 59543aa2a2d4..ef5631bdde11 100644 --- a/security/py-certbot-dns-cloudflare/distinfo +++ b/security/py-certbot-dns-cloudflare/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167597 -SHA256 (certbot_dns_cloudflare-4.0.0.tar.gz) = 3cc9752b1fbca8e16de8ccd23675d345505a529737855398db655b3413e711f8 -SIZE (certbot_dns_cloudflare-4.0.0.tar.gz) = 16391 +TIMESTAMP = 1754427673 +SHA256 (certbot_dns_cloudflare-4.2.0.tar.gz) = 010b9c9d8f33988c4e87c40155b57ffc16157c14e4f92f9f839bed0423bd04d3 +SIZE (certbot_dns_cloudflare-4.2.0.tar.gz) = 16210 diff --git a/security/py-certbot-dns-cloudflare/files/patch-cloudflare b/security/py-certbot-dns-cloudflare/files/patch-cloudflare index a4acaa5b416a..a7cac35737b0 100644 --- a/security/py-certbot-dns-cloudflare/files/patch-cloudflare +++ b/security/py-certbot-dns-cloudflare/files/patch-cloudflare @@ -1,5 +1,5 @@ ---- certbot_dns_cloudflare/_internal/dns_cloudflare.py.orig 2025-02-11 19:57:38 UTC -+++ certbot_dns_cloudflare/_internal/dns_cloudflare.py +--- src/certbot_dns_cloudflare/_internal/dns_cloudflare.py.orig 2025-02-11 19:57:38 UTC ++++ src/certbot_dns_cloudflare/_internal/dns_cloudflare.py @@ -100,12 +100,12 @@ class _CloudflareClient: # We can't use named arguments in this case, as it would break compatibility with # the Cloudflare library since version 2.10.1, as the `token` argument was used for diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo index 524a886863d4..71dc67e63fd7 100644 --- a/security/py-certbot-dns-digitalocean/distinfo +++ b/security/py-certbot-dns-digitalocean/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167598 -SHA256 (certbot_dns_digitalocean-4.0.0.tar.gz) = 00ce5b7c6fdcf360ab65558ec0e9c9a7247ddeb7ac8355bca3f5ca43496b0b87 -SIZE (certbot_dns_digitalocean-4.0.0.tar.gz) = 14571 +TIMESTAMP = 1754427674 +SHA256 (certbot_dns_digitalocean-4.2.0.tar.gz) = a92c9d40353f08d4093de5861f454d9657e5e1480026fc081a31263bf8a029ef +SIZE (certbot_dns_digitalocean-4.2.0.tar.gz) = 14397 diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo index 98efb380fd24..febafe16ef0d 100644 --- a/security/py-certbot-dns-dnsimple/distinfo +++ b/security/py-certbot-dns-dnsimple/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167599 -SHA256 (certbot_dns_dnsimple-4.0.0.tar.gz) = 3dbe24c0cd5ada5c833d6de174c7ced9fd2a215547d18ad569ee4fe45aafb41b -SIZE (certbot_dns_dnsimple-4.0.0.tar.gz) = 11885 +TIMESTAMP = 1754427674 +SHA256 (certbot_dns_dnsimple-4.2.0.tar.gz) = a41172cba48250c321b4365d0952a01c6d1ab72d755e30c9498fa661db1f398f +SIZE (certbot_dns_dnsimple-4.2.0.tar.gz) = 12045 diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo index 792674798234..b5970ee42085 100644 --- a/security/py-certbot-dns-dnsmadeeasy/distinfo +++ b/security/py-certbot-dns-dnsmadeeasy/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167599 -SHA256 (certbot_dns_dnsmadeeasy-4.0.0.tar.gz) = bd42dc87844d764c80e27221b81371670ccce65e564119fe1c99fafe7b0b441e -SIZE (certbot_dns_dnsmadeeasy-4.0.0.tar.gz) = 12069 +TIMESTAMP = 1754427675 +SHA256 (certbot_dns_dnsmadeeasy-4.2.0.tar.gz) = 101cad8775bb2a34072210a3e4d206fbfee4dff7100b01ae8fada275f58107a4 +SIZE (certbot_dns_dnsmadeeasy-4.2.0.tar.gz) = 12202 diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo index d888dffea618..5ffebe844fe1 100644 --- a/security/py-certbot-dns-gehirn/distinfo +++ b/security/py-certbot-dns-gehirn/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167600 -SHA256 (certbot_dns_gehirn-4.0.0.tar.gz) = 554c35ab3582b37d3fa628cd0c8186f0801b2925bf21fcb08c9db502b276471f -SIZE (certbot_dns_gehirn-4.0.0.tar.gz) = 11966 +TIMESTAMP = 1754427676 +SHA256 (certbot_dns_gehirn-4.2.0.tar.gz) = ae9678049e5b39d714a178240b567a52702c19495c7074c2884a49a91aac2dc5 +SIZE (certbot_dns_gehirn-4.2.0.tar.gz) = 12112 diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo index ee603d75d370..539dc05fbf87 100644 --- a/security/py-certbot-dns-google/distinfo +++ b/security/py-certbot-dns-google/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167601 -SHA256 (certbot_dns_google-4.0.0.tar.gz) = 07f78292c7e9b76552a9eed5152c46b285acf3231338850195e895eb3a62a6d3 -SIZE (certbot_dns_google-4.0.0.tar.gz) = 25242 +TIMESTAMP = 1754427676 +SHA256 (certbot_dns_google-4.2.0.tar.gz) = 7e0ee4712ede9ea0b4222b9bca2713aad47bc975d8ff2c58012245f31d4c915f +SIZE (certbot_dns_google-4.2.0.tar.gz) = 25132 diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo index c20d0009f043..6d6143ba4092 100644 --- a/security/py-certbot-dns-linode/distinfo +++ b/security/py-certbot-dns-linode/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167601 -SHA256 (certbot_dns_linode-4.0.0.tar.gz) = a8487117a2c57606e9e554bf967058c598f6f559fdddd13a4c763c97416c999b -SIZE (certbot_dns_linode-4.0.0.tar.gz) = 12181 +TIMESTAMP = 1754427677 +SHA256 (certbot_dns_linode-4.2.0.tar.gz) = 74a7f3cee605bdfe236112648dbd6bc23ea587fdad8f112d5383cd4ddd2417f2 +SIZE (certbot_dns_linode-4.2.0.tar.gz) = 12322 diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo index 34df1fda5087..bc36437c7b84 100644 --- a/security/py-certbot-dns-luadns/distinfo +++ b/security/py-certbot-dns-luadns/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167602 -SHA256 (certbot_dns_luadns-4.0.0.tar.gz) = 2fb5bcd8eeada94f9ad9a5a213d0d90480071a5b5411c326e279fa352bc42ea6 -SIZE (certbot_dns_luadns-4.0.0.tar.gz) = 11888 +TIMESTAMP = 1754427678 +SHA256 (certbot_dns_luadns-4.2.0.tar.gz) = 4d82997d65e752dc4d469eb88f08f6dc94f9645f18b653e858f7c506f6695c78 +SIZE (certbot_dns_luadns-4.2.0.tar.gz) = 12070 diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo index 351b033e7fe7..82a2c6064e42 100644 --- a/security/py-certbot-dns-nsone/distinfo +++ b/security/py-certbot-dns-nsone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167603 -SHA256 (certbot_dns_nsone-4.0.0.tar.gz) = c0bdd769e88147e7b45371c4892c68404a014aa9c4aa48a505f011a94b5e18eb -SIZE (certbot_dns_nsone-4.0.0.tar.gz) = 11966 +TIMESTAMP = 1754427678 +SHA256 (certbot_dns_nsone-4.2.0.tar.gz) = fc21244e6fbd7b57a3d782499cf105de27a8045dde456be20cfcc2849a6a3e54 +SIZE (certbot_dns_nsone-4.2.0.tar.gz) = 12111 diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo index 5b6e491f4289..7b276e44d401 100644 --- a/security/py-certbot-dns-ovh/distinfo +++ b/security/py-certbot-dns-ovh/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167603 -SHA256 (certbot_dns_ovh-4.0.0.tar.gz) = 54b1637572d2ac5bbe78bddc180966ad9c7d90bb6baf820c4e7da4c02e6f21ab -SIZE (certbot_dns_ovh-4.0.0.tar.gz) = 12324 +TIMESTAMP = 1754427679 +SHA256 (certbot_dns_ovh-4.2.0.tar.gz) = 0168f064ad7a73bf97615c9d11788b006d229ea600fac84b564f7e5cd7cec8c3 +SIZE (certbot_dns_ovh-4.2.0.tar.gz) = 12477 diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo index 107400db71f4..3d9e3d5cee0d 100644 --- a/security/py-certbot-dns-rfc2136/distinfo +++ b/security/py-certbot-dns-rfc2136/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167604 -SHA256 (certbot_dns_rfc2136-4.0.0.tar.gz) = 9d403198294c6e2e4bc9df6a5e82a4ed35ab3ffef534307f732e967fec3292d7 -SIZE (certbot_dns_rfc2136-4.0.0.tar.gz) = 16948 +TIMESTAMP = 1754427680 +SHA256 (certbot_dns_rfc2136-4.2.0.tar.gz) = 6044ead6386be61895faee28225df4b20be0868057404f369ef92dcfbaeb73a6 +SIZE (certbot_dns_rfc2136-4.2.0.tar.gz) = 16777 diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo index bf6178bc02fd..bd41da7bdd31 100644 --- a/security/py-certbot-dns-route53/distinfo +++ b/security/py-certbot-dns-route53/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167605 -SHA256 (certbot_dns_route53-4.0.0.tar.gz) = 9b6397d5a0b3a23242346238cdf423b111b16114e59798638b47d1be9a84fc2e -SIZE (certbot_dns_route53-4.0.0.tar.gz) = 15688 +TIMESTAMP = 1754427681 +SHA256 (certbot_dns_route53-4.2.0.tar.gz) = fc0e59ad7e0f04c373e6e412da4d90fc6f5eec7317eb94e0b785367830e6daea +SIZE (certbot_dns_route53-4.2.0.tar.gz) = 15490 diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo index 17fdf8768906..e1e21d98ba1d 100644 --- a/security/py-certbot-dns-sakuracloud/distinfo +++ b/security/py-certbot-dns-sakuracloud/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167606 -SHA256 (certbot_dns_sakuracloud-4.0.0.tar.gz) = b658870de64ffab5f302575f391b8b37774a1cd5d294e8dbbe6db46a794bdd36 -SIZE (certbot_dns_sakuracloud-4.0.0.tar.gz) = 11967 +TIMESTAMP = 1754427681 +SHA256 (certbot_dns_sakuracloud-4.2.0.tar.gz) = f858be1b397d53b5789dd39a85ea819d8fea8beea3f0714bb1e80aa2ea2e629f +SIZE (certbot_dns_sakuracloud-4.2.0.tar.gz) = 12108 diff --git a/security/py-certbot-nginx/Makefile b/security/py-certbot-nginx/Makefile index a2e820017817..c6414612ae95 100644 --- a/security/py-certbot-nginx/Makefile +++ b/security/py-certbot-nginx/Makefile @@ -29,7 +29,7 @@ USE_PYTHON= autoplist concurrent pep517 NO_ARCH= yes post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot_nginx/_internal/constants.py + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/src/certbot_nginx/_internal/constants.py .include "${.CURDIR}/../py-acme/version.mk" .include <bsd.port.mk> diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo index c4a16deb245b..7053d4ca9df4 100644 --- a/security/py-certbot-nginx/distinfo +++ b/security/py-certbot-nginx/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167606 -SHA256 (certbot_nginx-4.0.0.tar.gz) = 4478c3e13e04b49f95675d83adaacdcf1356f8fac0824e236f893f2f5a1d991c -SIZE (certbot_nginx-4.0.0.tar.gz) = 79653 +TIMESTAMP = 1754427682 +SHA256 (certbot_nginx-4.2.0.tar.gz) = 83ef0a9b16616b908905fb61fabbe49cebfc4c33cda1983347ed3ab570b4abf6 +SIZE (certbot_nginx-4.2.0.tar.gz) = 80178 diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile index 5e66ba0a7c54..8649e57a9a21 100644 --- a/security/py-certbot/Makefile +++ b/security/py-certbot/Makefile @@ -24,7 +24,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}acme>=${ACME_VERSION},1:security/py-acme@${P ${PYTHON_PKGNAMEPREFIX}josepy>=2.0.0:security/py-josepy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyrfc3339>=0:devel/py-pyrfc3339@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pytz>=2019.3,1:devel/py-pytz@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=41.6.0:devel/py-setuptools@${PY_FLAVOR} USES= python @@ -48,11 +47,11 @@ MANPAGES_PLIST_FILES= share/man/man1/certbot.1.gz \ .include <bsd.port.pre.mk> .if ${PYTHON_REL} < 31000 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.6:devel/py-importlib-metadata@${PY_FLAVOR} +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=8.6.1:devel/py-importlib-metadata@${PY_FLAVOR} .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py ${WRKSRC}/certbot/_internal/tests/cli_test.py + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/src/certbot/compat/misc.py ${WRKSRC}/src/certbot/_internal/tests/cli_test.py post-build-MANPAGES-on: # Avoid gmake / ${DO_MAKE_BUILD} -C ${WRKSRC}/docs man diff --git a/security/py-certbot/distinfo b/security/py-certbot/distinfo index 05ecc6071f5a..ec199b581dfb 100644 --- a/security/py-certbot/distinfo +++ b/security/py-certbot/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1745167596 -SHA256 (certbot-4.0.0.tar.gz) = a867bfbb5126516c12d4c8a93909ef1e4d5309fc4e9f5b97b2d987b0ffd4bbe3 -SIZE (certbot-4.0.0.tar.gz) = 439556 +TIMESTAMP = 1754427671 +SHA256 (certbot-4.2.0.tar.gz) = fb1e56ca8a072bec49ac0c7b5390a29cbf68c2c05f712259a9b3491de041c27b +SIZE (certbot-4.2.0.tar.gz) = 442984 diff --git a/security/py-certbot/files/patch-certbot-compat-misc.py b/security/py-certbot/files/patch-certbot-compat-misc.py deleted file mode 100644 index 56031716086a..000000000000 --- a/security/py-certbot/files/patch-certbot-compat-misc.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 2023-04-04 15:06:41 UTC -+++ certbot/compat/misc.py -@@ -100,6 +100,11 @@ LINUX_DEFAULT_FOLDERS = { - 'work': '/var/lib/letsencrypt', - 'logs': '/var/log/letsencrypt', - } -+FREEBSD_DEFAULT_FOLDERS = { -+ 'config': '/usr/local/etc/letsencrypt', -+ 'work': '/var/db/letsencrypt', -+ 'logs': '/var/log/letsencrypt', -+} - - - def get_default_folder(folder_type: str) -> str: -@@ -113,8 +118,13 @@ def get_default_folder(folder_type: str) -> str: - - """ - if os.name != 'nt': -- # Linux specific -- return LINUX_DEFAULT_FOLDERS[folder_type] -+ # Unix-like -+ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): -+ # FreeBSD specific -+ return FREEBSD_DEFAULT_FOLDERS[folder_type] -+ else: -+ # Linux specific -+ return LINUX_DEFAULT_FOLDERS[folder_type] - # Windows specific - return WINDOWS_DEFAULT_FOLDERS[folder_type] - diff --git a/security/py-certbot/files/patch-certbot___internal_tests_cli__test.py b/security/py-certbot/files/patch-certbot___internal_tests_cli__test.py deleted file mode 100644 index c5c1cd41e898..000000000000 --- a/security/py-certbot/files/patch-certbot___internal_tests_cli__test.py +++ /dev/null @@ -1,28 +0,0 @@ ---- certbot/_internal/tests/cli_test.py.orig 2023-04-04 15:06:41 UTC -+++ certbot/_internal/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 sys -@@ -60,9 +61,14 @@ class FlagDefaultTest(unittest.TestCase): - - def test_default_directories(self): - if os.name != 'nt': -- assert cli.flag_default('config_dir') == '/etc/letsencrypt' -- assert cli.flag_default('work_dir') == '/var/lib/letsencrypt' -- assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' -+ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): -+ assert cli.flag_default('config_dir') == '/usr/local/etc/letsencrypt' -+ assert cli.flag_default('work_dir') == '/var/db/letsencrypt' -+ assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' -+ else: -+ assert cli.flag_default('config_dir') == '/etc/letsencrypt' -+ assert cli.flag_default('work_dir') == '/var/lib/letsencrypt' -+ assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' - else: - assert cli.flag_default('config_dir') == 'C:\\Certbot' - assert cli.flag_default('work_dir') == 'C:\\Certbot\\lib' diff --git a/security/py-certbot/files/patch-src-certbot-compat-misc.py b/security/py-certbot/files/patch-src-certbot-compat-misc.py new file mode 100644 index 000000000000..1ffb2afd1010 --- /dev/null +++ b/security/py-certbot/files/patch-src-certbot-compat-misc.py @@ -0,0 +1,36 @@ +# 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 + +--- src/certbot/compat/misc.py.orig 2023-04-04 15:06:41 UTC ++++ src/certbot/compat/misc.py +@@ -100,6 +100,11 @@ LINUX_DEFAULT_FOLDERS = { + 'work': '/var/lib/letsencrypt', + 'logs': '/var/log/letsencrypt', + } ++FREEBSD_DEFAULT_FOLDERS = { ++ 'config': '/usr/local/etc/letsencrypt', ++ 'work': '/var/db/letsencrypt', ++ 'logs': '/var/log/letsencrypt', ++} + + + def get_default_folder(folder_type: str) -> str: +@@ -113,8 +118,13 @@ def get_default_folder(folder_type: str) -> str: + + """ + if os.name != 'nt': +- # Linux specific +- return LINUX_DEFAULT_FOLDERS[folder_type] ++ # Unix-like ++ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): ++ # FreeBSD specific ++ return FREEBSD_DEFAULT_FOLDERS[folder_type] ++ else: ++ # Linux specific ++ return LINUX_DEFAULT_FOLDERS[folder_type] + # Windows specific + return WINDOWS_DEFAULT_FOLDERS[folder_type] + diff --git a/security/py-certbot/files/patch-src-certbot-internal_tests-cli__test.py b/security/py-certbot/files/patch-src-certbot-internal_tests-cli__test.py new file mode 100644 index 000000000000..d89ec8254b9e --- /dev/null +++ b/security/py-certbot/files/patch-src-certbot-internal_tests-cli__test.py @@ -0,0 +1,28 @@ +--- src/certbot/_internal/tests/cli_test.py.orig 2023-04-04 15:06:41 UTC ++++ src/certbot/_internal/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 sys +@@ -60,9 +61,14 @@ class FlagDefaultTest(unittest.TestCase): + + def test_default_directories(self): + if os.name != 'nt': +- assert cli.flag_default('config_dir') == '/etc/letsencrypt' +- assert cli.flag_default('work_dir') == '/var/lib/letsencrypt' +- assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' ++ if sys.platform.startswith('freebsd') or sys.platform.startswith('dragonfly'): ++ assert cli.flag_default('config_dir') == '/usr/local/etc/letsencrypt' ++ assert cli.flag_default('work_dir') == '/var/db/letsencrypt' ++ assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' ++ else: ++ assert cli.flag_default('config_dir') == '/etc/letsencrypt' ++ assert cli.flag_default('work_dir') == '/var/lib/letsencrypt' ++ assert cli.flag_default('logs_dir') == '/var/log/letsencrypt' + else: + assert cli.flag_default('config_dir') == 'C:\\Certbot' + assert cli.flag_default('work_dir') == 'C:\\Certbot\\lib' |