git: fcf4f74c8856 - main - security/py-{acme,certbot*}: Update to 2.6.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Mon, 15 May 2023 05:22:58 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=fcf4f74c885625d014ef1520dbc2a2b687fbc083

commit fcf4f74c885625d014ef1520dbc2a2b687fbc083
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-05-09 23:14:16 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2023-05-15 05:21:19 +0000

    security/py-{acme,certbot*}: Update to 2.6.0
    
    ChangeLog:      https://github.com/certbot/certbot/releases/tag/v2.5.0
    ChangeLog:      https://github.com/certbot/certbot/releases/tag/v2.6.0
    PR:             271336
    Approved by:    sunpoet (python@)
---
 security/py-acme/distinfo                                         | 6 +++---
 security/py-acme/version.mk                                       | 2 +-
 security/py-certbot-apache/distinfo                               | 6 +++---
 security/py-certbot-dns-cloudflare/distinfo                       | 6 +++---
 security/py-certbot-dns-digitalocean/distinfo                     | 6 +++---
 security/py-certbot-dns-dnsimple/distinfo                         | 6 +++---
 security/py-certbot-dns-dnsmadeeasy/distinfo                      | 6 +++---
 security/py-certbot-dns-gehirn/distinfo                           | 6 +++---
 security/py-certbot-dns-google/distinfo                           | 6 +++---
 security/py-certbot-dns-linode/distinfo                           | 6 +++---
 security/py-certbot-dns-luadns/distinfo                           | 6 +++---
 security/py-certbot-dns-nsone/distinfo                            | 6 +++---
 security/py-certbot-dns-ovh/distinfo                              | 6 +++---
 security/py-certbot-dns-rfc2136/distinfo                          | 6 +++---
 security/py-certbot-dns-route53/distinfo                          | 6 +++---
 security/py-certbot-dns-sakuracloud/distinfo                      | 6 +++---
 security/py-certbot-nginx/distinfo                                | 6 +++---
 security/py-certbot/Makefile                                      | 2 +-
 security/py-certbot/distinfo                                      | 6 +++---
 security/py-certbot/files/patch-certbot-compat-misc.py            | 8 ++++----
 ...s_cli__test.py => patch-certbot___internal_tests_cli__test.py} | 6 ++----
 21 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/security/py-acme/distinfo b/security/py-acme/distinfo
index 7564728cf10b..2435ea5c9d77 100644
--- a/security/py-acme/distinfo
+++ b/security/py-acme/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249637
-SHA256 (acme-2.4.0.tar.gz) = 755efb9c8e97aa0a4ee6d739189546e5a01f3adb1292688db280a8161060acfe
-SIZE (acme-2.4.0.tar.gz) = 89576
+TIMESTAMP = 1683673130
+SHA256 (acme-2.6.0.tar.gz) = 607360db73e458150ab63825a82b220bdf04badbd81c6d3218e5d993c6be491c
+SIZE (acme-2.6.0.tar.gz) = 91257
diff --git a/security/py-acme/version.mk b/security/py-acme/version.mk
index 257b2a0c309a..5401086aafc2 100644
--- a/security/py-acme/version.mk
+++ b/security/py-acme/version.mk
@@ -1 +1 @@
-ACME_VERSION=	2.4.0
+ACME_VERSION=	2.6.0
diff --git a/security/py-certbot-apache/distinfo b/security/py-certbot-apache/distinfo
index 17919fc8ffcf..edd4bd660332 100644
--- a/security/py-certbot-apache/distinfo
+++ b/security/py-certbot-apache/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249638
-SHA256 (certbot-apache-2.4.0.tar.gz) = dd2eba75df6024e469c44f445b801f81f79936f28e8d2a71b6af3f0067287d15
-SIZE (certbot-apache-2.4.0.tar.gz) = 205404
+TIMESTAMP = 1683673132
+SHA256 (certbot-apache-2.6.0.tar.gz) = 9fa677d8bb286c84f6fed9c109fe7ba4b88d4074f1c18e6b43230a7d5954160c
+SIZE (certbot-apache-2.6.0.tar.gz) = 182176
diff --git a/security/py-certbot-dns-cloudflare/distinfo b/security/py-certbot-dns-cloudflare/distinfo
index 4403d252c649..5629389734b2 100644
--- a/security/py-certbot-dns-cloudflare/distinfo
+++ b/security/py-certbot-dns-cloudflare/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249638
-SHA256 (certbot-dns-cloudflare-2.4.0.tar.gz) = 2bd62947469db8519a577da6fd59219be16ba37fa3cd36a001bdb44ff2a17699
-SIZE (certbot-dns-cloudflare-2.4.0.tar.gz) = 16327
+TIMESTAMP = 1683673132
+SHA256 (certbot-dns-cloudflare-2.6.0.tar.gz) = ccec1a7c1b1cb3246922dbed6030a625546e6b72f4372f362d5e8569cb19ceb5
+SIZE (certbot-dns-cloudflare-2.6.0.tar.gz) = 16228
diff --git a/security/py-certbot-dns-digitalocean/distinfo b/security/py-certbot-dns-digitalocean/distinfo
index 1c8e754e3041..1b7e2c31e595 100644
--- a/security/py-certbot-dns-digitalocean/distinfo
+++ b/security/py-certbot-dns-digitalocean/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249639
-SHA256 (certbot-dns-digitalocean-2.4.0.tar.gz) = c799cd62be33c0b463cd75df98b8f84a4f3a29fc88fbed6f2113f4b0cd09d9e1
-SIZE (certbot-dns-digitalocean-2.4.0.tar.gz) = 14183
+TIMESTAMP = 1683673133
+SHA256 (certbot-dns-digitalocean-2.6.0.tar.gz) = 85b1dd1fd64b6e256bf2545e35c402c2e9e802f5cc1a9952bbe6ed3b9f1ae943
+SIZE (certbot-dns-digitalocean-2.6.0.tar.gz) = 14513
diff --git a/security/py-certbot-dns-dnsimple/distinfo b/security/py-certbot-dns-dnsimple/distinfo
index 1bd6d715afda..9f7e65229dbb 100644
--- a/security/py-certbot-dns-dnsimple/distinfo
+++ b/security/py-certbot-dns-dnsimple/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249640
-SHA256 (certbot-dns-dnsimple-2.4.0.tar.gz) = 88971d6cd5da5ce98eefc6b821e1e75bd8ee47c74003ac1334935f1b7ce8a9b8
-SIZE (certbot-dns-dnsimple-2.4.0.tar.gz) = 12511
+TIMESTAMP = 1683673133
+SHA256 (certbot-dns-dnsimple-2.6.0.tar.gz) = b375d22a3e1f0329e124d59766092985901776a165b840603ae17d1ffecadd33
+SIZE (certbot-dns-dnsimple-2.6.0.tar.gz) = 12461
diff --git a/security/py-certbot-dns-dnsmadeeasy/distinfo b/security/py-certbot-dns-dnsmadeeasy/distinfo
index 697c9cca3816..1b285450a085 100644
--- a/security/py-certbot-dns-dnsmadeeasy/distinfo
+++ b/security/py-certbot-dns-dnsmadeeasy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249641
-SHA256 (certbot-dns-dnsmadeeasy-2.4.0.tar.gz) = 963824366100c0a8c6f9124eef3a6cda6c5947c78d88fd3b11849c273f003fdf
-SIZE (certbot-dns-dnsmadeeasy-2.4.0.tar.gz) = 12726
+TIMESTAMP = 1683673134
+SHA256 (certbot-dns-dnsmadeeasy-2.6.0.tar.gz) = 6169319414f4729e6691811880eaa436ce2f96653b021d4d0bdaf7eaa811c57f
+SIZE (certbot-dns-dnsmadeeasy-2.6.0.tar.gz) = 12652
diff --git a/security/py-certbot-dns-gehirn/distinfo b/security/py-certbot-dns-gehirn/distinfo
index ec67de9b33a3..95d6ddf4194e 100644
--- a/security/py-certbot-dns-gehirn/distinfo
+++ b/security/py-certbot-dns-gehirn/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249641
-SHA256 (certbot-dns-gehirn-2.4.0.tar.gz) = 24d16b6d84eea92143d8f697853b50d8a94b5272da83e424a2efdd59378d38e6
-SIZE (certbot-dns-gehirn-2.4.0.tar.gz) = 12612
+TIMESTAMP = 1683673136
+SHA256 (certbot-dns-gehirn-2.6.0.tar.gz) = 4a16c94dd18843a0fd1c6cc17f16239f1608f185f073176d8af33a0f81a3ae28
+SIZE (certbot-dns-gehirn-2.6.0.tar.gz) = 12571
diff --git a/security/py-certbot-dns-google/distinfo b/security/py-certbot-dns-google/distinfo
index cd4987df3bcb..ef97de313cfd 100644
--- a/security/py-certbot-dns-google/distinfo
+++ b/security/py-certbot-dns-google/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249642
-SHA256 (certbot-dns-google-2.4.0.tar.gz) = f4fbbeb27bdaf7426b6e12f0aae31bc98531015969981c7ede63aa74d9f119b1
-SIZE (certbot-dns-google-2.4.0.tar.gz) = 23881
+TIMESTAMP = 1683673137
+SHA256 (certbot-dns-google-2.6.0.tar.gz) = cffb8671f8332a41b3774276f70aa23a4f46dac135c65a4ceb35316215eab333
+SIZE (certbot-dns-google-2.6.0.tar.gz) = 24848
diff --git a/security/py-certbot-dns-linode/distinfo b/security/py-certbot-dns-linode/distinfo
index db4bd054b0d1..574883d41e42 100644
--- a/security/py-certbot-dns-linode/distinfo
+++ b/security/py-certbot-dns-linode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249642
-SHA256 (certbot-dns-linode-2.4.0.tar.gz) = 7433c1d58e558b09bdd82eba16e8481873cd74fc9fac114f3a61d9c57f4f4090
-SIZE (certbot-dns-linode-2.4.0.tar.gz) = 13092
+TIMESTAMP = 1683673137
+SHA256 (certbot-dns-linode-2.6.0.tar.gz) = 8e22e507f240dd6c4ad89bc72f42cebba1fddf354e8641a254a6de98d9cbc674
+SIZE (certbot-dns-linode-2.6.0.tar.gz) = 13466
diff --git a/security/py-certbot-dns-luadns/distinfo b/security/py-certbot-dns-luadns/distinfo
index 9a97aa70c6ba..a08e592e9bf5 100644
--- a/security/py-certbot-dns-luadns/distinfo
+++ b/security/py-certbot-dns-luadns/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249643
-SHA256 (certbot-dns-luadns-2.4.0.tar.gz) = 9e3c162c19d7f451ddf534ec50069d7ac4c9c2d3e3d5056218511f74feebc75a
-SIZE (certbot-dns-luadns-2.4.0.tar.gz) = 12540
+TIMESTAMP = 1683673138
+SHA256 (certbot-dns-luadns-2.6.0.tar.gz) = d341d5140f44151ddc88a5937ee5099fb07e0b04797087ed0f2267f88ebddf56
+SIZE (certbot-dns-luadns-2.6.0.tar.gz) = 12513
diff --git a/security/py-certbot-dns-nsone/distinfo b/security/py-certbot-dns-nsone/distinfo
index 4d60965f2640..74e762926bf0 100644
--- a/security/py-certbot-dns-nsone/distinfo
+++ b/security/py-certbot-dns-nsone/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249644
-SHA256 (certbot-dns-nsone-2.4.0.tar.gz) = f3a01bcdfa3363c2a8c4ba643ccc1ab3ab9c266056698f2a6a982c53798e1b86
-SIZE (certbot-dns-nsone-2.4.0.tar.gz) = 12583
+TIMESTAMP = 1683673138
+SHA256 (certbot-dns-nsone-2.6.0.tar.gz) = 387d98d2388e5e6d416ccc59a00b80ef3dbd8e504ab86e5286ddb35c53e45fca
+SIZE (certbot-dns-nsone-2.6.0.tar.gz) = 12516
diff --git a/security/py-certbot-dns-ovh/distinfo b/security/py-certbot-dns-ovh/distinfo
index b81cdf7d1265..6c7e3e9cd193 100644
--- a/security/py-certbot-dns-ovh/distinfo
+++ b/security/py-certbot-dns-ovh/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249644
-SHA256 (certbot-dns-ovh-2.4.0.tar.gz) = d705da075772f14a763bb494247748b4fa26ccbd6e37e228a39aee91c229090b
-SIZE (certbot-dns-ovh-2.4.0.tar.gz) = 13004
+TIMESTAMP = 1683673139
+SHA256 (certbot-dns-ovh-2.6.0.tar.gz) = 1e8c2975d3999bd5d78bd1a1b34aaf80bce78ddeef860af866ace4c1fe3059c6
+SIZE (certbot-dns-ovh-2.6.0.tar.gz) = 13311
diff --git a/security/py-certbot-dns-rfc2136/distinfo b/security/py-certbot-dns-rfc2136/distinfo
index e689e4c2e96d..bf4e17a740d1 100644
--- a/security/py-certbot-dns-rfc2136/distinfo
+++ b/security/py-certbot-dns-rfc2136/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249645
-SHA256 (certbot-dns-rfc2136-2.4.0.tar.gz) = b8131a0e19c8adcdf27980b373cc7f471dc3f30350770c96fba70b31d3de596b
-SIZE (certbot-dns-rfc2136-2.4.0.tar.gz) = 16351
+TIMESTAMP = 1683673139
+SHA256 (certbot-dns-rfc2136-2.6.0.tar.gz) = 7c8283da1ccab556f9fd84f8f0fcc67cb851a628860f30ffbf9c25286bbb8942
+SIZE (certbot-dns-rfc2136-2.6.0.tar.gz) = 16740
diff --git a/security/py-certbot-dns-route53/distinfo b/security/py-certbot-dns-route53/distinfo
index f16bd27f6ac4..7e24e6c68a14 100644
--- a/security/py-certbot-dns-route53/distinfo
+++ b/security/py-certbot-dns-route53/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249646
-SHA256 (certbot-dns-route53-2.4.0.tar.gz) = a824e847130b803d8029bc17d3662fecc5806d5808cc7ea59fb4267c4354c364
-SIZE (certbot-dns-route53-2.4.0.tar.gz) = 15013
+TIMESTAMP = 1683673140
+SHA256 (certbot-dns-route53-2.6.0.tar.gz) = 6b77f9a0d78e9c64d3222919b33a335c145a0f1e4e2249630351e82377dbc2fd
+SIZE (certbot-dns-route53-2.6.0.tar.gz) = 15494
diff --git a/security/py-certbot-dns-sakuracloud/distinfo b/security/py-certbot-dns-sakuracloud/distinfo
index 4aa1f5fe2097..825141ffad68 100644
--- a/security/py-certbot-dns-sakuracloud/distinfo
+++ b/security/py-certbot-dns-sakuracloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249646
-SHA256 (certbot-dns-sakuracloud-2.4.0.tar.gz) = d5ef21d1d61fde6986321805cb06308606c8276f3a60f287e0f49091844fb690
-SIZE (certbot-dns-sakuracloud-2.4.0.tar.gz) = 12626
+TIMESTAMP = 1683673141
+SHA256 (certbot-dns-sakuracloud-2.6.0.tar.gz) = d41047f98c80e8178c727eea66063d122ac0e09b8d87f86962d2bdb4d0d53505
+SIZE (certbot-dns-sakuracloud-2.6.0.tar.gz) = 12576
diff --git a/security/py-certbot-nginx/distinfo b/security/py-certbot-nginx/distinfo
index 3a2a3b3fc4f7..35f124cb77f6 100644
--- a/security/py-certbot-nginx/distinfo
+++ b/security/py-certbot-nginx/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249647
-SHA256 (certbot-nginx-2.4.0.tar.gz) = 8e86d889864731ec7e5b0fd52212d07165345010feea11afd57b690ac24fb113
-SIZE (certbot-nginx-2.4.0.tar.gz) = 78622
+TIMESTAMP = 1683673141
+SHA256 (certbot-nginx-2.6.0.tar.gz) = 426038336f0eb305579aa1bd71d021cfbbfa0925d165198054763b7225d64a05
+SIZE (certbot-nginx-2.6.0.tar.gz) = 77755
diff --git a/security/py-certbot/Makefile b/security/py-certbot/Makefile
index 71553ec6f509..dd019ac1430a 100644
--- a/security/py-certbot/Makefile
+++ b/security/py-certbot/Makefile
@@ -43,7 +43,7 @@ MANPAGES_PLIST_FILES=	share/man/man1/certbot.1.gz \
 			share/man/man7/certbot.7.gz
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py ${WRKSRC}/tests/cli_test.py
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/certbot/compat/misc.py ${WRKSRC}/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 31d3e61c165e..1ff4eeb71850 100644
--- a/security/py-certbot/distinfo
+++ b/security/py-certbot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678249637
-SHA256 (certbot-2.4.0.tar.gz) = 06bfde9e177a185fa7a7c0a8e533dfb03c6648ef90a205d3a8345e1966d5eb04
-SIZE (certbot-2.4.0.tar.gz) = 425768
+TIMESTAMP = 1683673131
+SHA256 (certbot-2.6.0.tar.gz) = c4de6bb0d092729650ed90a5bdb513932bdc47ec5f7f98049180ab8e4a835dab
+SIZE (certbot-2.6.0.tar.gz) = 428303
diff --git a/security/py-certbot/files/patch-certbot-compat-misc.py b/security/py-certbot/files/patch-certbot-compat-misc.py
index c104a34cf796..56031716086a 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	2021-03-02 21:37:04 UTC
+--- certbot/compat/misc.py.orig	2023-04-04 15:06:41 UTC
 +++ certbot/compat/misc.py
-@@ -79,6 +79,11 @@ LINUX_DEFAULT_FOLDERS = {
+@@ -100,6 +100,11 @@ LINUX_DEFAULT_FOLDERS = {
      'work': '/var/lib/letsencrypt',
      'logs': '/var/log/letsencrypt',
  }
@@ -17,8 +17,8 @@
 +}
  
  
- def get_default_folder(folder_type):
-@@ -93,8 +98,13 @@ def get_default_folder(folder_type):
+ def get_default_folder(folder_type: str) -> str:
+@@ -113,8 +118,13 @@ def get_default_folder(folder_type: str) -> str:
  
      """
      if os.name != 'nt':
diff --git a/security/py-certbot/files/patch-tests_cli__test.py b/security/py-certbot/files/patch-certbot___internal_tests_cli__test.py
similarity index 91%
rename from security/py-certbot/files/patch-tests_cli__test.py
rename to security/py-certbot/files/patch-certbot___internal_tests_cli__test.py
index 5499547b3ff7..c5c1cd41e898 100644
--- a/security/py-certbot/files/patch-tests_cli__test.py
+++ b/security/py-certbot/files/patch-certbot___internal_tests_cli__test.py
@@ -1,7 +1,5 @@
-# See files/patch-certbot-compat-misc.py
-
---- tests/cli_test.py.orig	2023-03-07 21:17:25 UTC
-+++ tests/cli_test.py
+--- 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