[rpms/certbot] f43: Merge branch 'f44' into f43

[Nick Bebout <nick@bebout.net>]

A new commit has been pushed.

Repo   : rpms/certbot
Branch : f43
Commit : 3630eee3ed07c05f4ac469dbd9380a753e1a52ae
Author : Nick Bebout <nick@bebout.net>
Date   : 2026-08-06T23:10:10-05:00
Stats  : +40/-5 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/certbot/c/3630eee3ed07c05f4ac469dbd9380a753e1a52ae?branch=f43

Log:
Merge branch 'f44' into f43

---
diff --git a/certbot-python315-deprecation-warning.patch b/certbot-python315-deprecation-warning.patch
new file mode 100644
index 0000000..b809ce1
--- /dev/null
+++ b/certbot-python315-deprecation-warning.patch
@@ -0,0 +1,20 @@
+--- b/acme/src/acme/_internal/tests/challenges_test.py.orig	2026-07-08 15:57:50.601790670 -0500
++++ a/acme/src/acme/_internal/tests/challenges_test.py	2026-07-08 16:00:00.547538729 -0500
+@@ -118,7 +118,7 @@
+     def setUp(self):
+         from acme.challenges import DNS01
+         self.msg = DNS01(token=jose.decode_b64jose(
+-            'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ+PCt92wr+oA'))
++            'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA'))
+         self.jmsg = {
+             'type': 'dns-01',
+             'token': 'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA',
+@@ -231,7 +231,7 @@
+         from acme.challenges import HTTP01
+         self.msg = HTTP01(
+             token=jose.decode_b64jose(
+-                'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ+PCt92wr+oA'))
++                'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA'))
+         self.jmsg = {
+             'type': 'http-01',
+             'token': 'evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA',

diff --git a/certbot-renew-systemd.service b/certbot-renew-systemd.service
index acb6b8e..fcaab0c 100644
--- a/certbot-renew-systemd.service
+++ b/certbot-renew-systemd.service
@@ -4,4 +4,4 @@ Description=This service automatically renews any certbot certificates found
 [Service]
 EnvironmentFile=/etc/sysconfig/certbot
 Type=oneshot
-ExecStart=/usr/bin/certbot renew --noninteractive --no-random-sleep-on-renew $PRE_HOOK $POST_HOOK $RENEW_HOOK $DEPLOY_HOOK $CERTBOT_ARGS
+ExecStart=/usr/bin/certbot renew --noninteractive --no-random-sleep-on-renew $PRE_HOOK $POST_HOOK $DEPLOY_HOOK $CERTBOT_ARGS

diff --git a/certbot.spec b/certbot.spec
index 1b3a9b2..1f67e6e 100644
--- a/certbot.spec
+++ b/certbot.spec
@@ -17,7 +17,7 @@
 
 
 Name:           certbot
-Version:        5.4.0
+Version:        5.5.0
 Release:        1%{?dist}
 Summary:        A free, automated certificate authority client
 
@@ -35,6 +35,8 @@ Source15:       certbot.logrotate
 # disable one test which tries to access the network
 # https://github.com/certbot/certbot/issues/10354
 Patch1:         certbot-disable-test_lock_order-renew.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=2466655
+Patch2:         certbot-python315-deprecation-warning.patch
 
 BuildArch:      noarch
 
@@ -212,12 +214,15 @@ Plugin for certbot that allows for automatic configuration of ngnix
 # Remove bundled egg-info
 rm -rf %{name}.egg-info
 
+%if 0%{?rhel} && 0%{?rhel} >= 10
+find . -name pyproject.toml -exec sed -i -e s'@license = "Apache-2.0"@license = { text = "Apache-2.0" }@' {} \;
+%endif
 
 %generate_buildrequires
 for module in acme certbot %{MODULES} certbot-apache certbot-nginx
 do
   cd $module
-  sed -Ei '/(acme|certbot)>=\{version\}/d' setup.py
+  sed -Ei '/(acme|certbot)[^>]*>=\{version\}/d' setup.py
     %pyproject_buildrequires
   cd ..
 done
@@ -265,7 +270,11 @@ install -dm 0755 %{buildroot}%{_localstatedir}/log/letsencrypt
 
 %if %{with tests}
 %check
-for module in acme certbot %{MODULES} certbot-apache certbot-nginx; do
+# certbot-apache and certbot-nginx are thin shim packages as of certbot 5.5.0;
+# their code and unit tests now live inside the certbot package (apache/nginx
+# extras) and run during the certbot core %%check, so they are not listed here
+# (pytest would otherwise collect 0 tests and exit non-zero).
+for module in acme certbot %{MODULES}; do
 pushd $module
 %pytest -v -W ignore::DeprecationWarning
 popd
@@ -377,6 +386,9 @@ fi
 
 
 %changelog
+* Thu Aug  6 2026 Nick Bebout <nb@fedoraproject.org> - 5.5.0-1
+- Update to 5.5.0
+
 * Tue Mar 24 2026 Jonathan Wright <jonathan@almalinux.org> - 5.4.0-1
 - update to 5.4.0
 

diff --git a/sources b/sources
index 78f2604..72ad1be 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (certbot-5.4.0.tar.gz) = 9e7b25fa8bc1f36e8ba4cc5818200f366d581707a0a36c599b862659a6b992804bd8d5fc6aae013f8e06e850be7d5abecde395cf2900457d2330385a20950498
+SHA512 (certbot-5.5.0.tar.gz) = 5e9bbbdc35fa1a13b777d4323b56a8aaa813faeee42718bf2ba964ae77f2448f48af57545658350fe7a4e48ae36ed33e9e4945c49b5040ef8177fc82667c3870

diff --git a/certbot.spec b/certbot.spec
index 8ec2334..1f67e6e 100644
--- a/certbot.spec
+++ b/certbot.spec
@@ -416,6 +416,9 @@ fi
 * Tue Sep 09 2025 Jonathan Wright <jonathan@almalinux.org> - 4.2.0-1
 - update to 4.2.0
 
+* Tue Sep 30 2025 Paul Howarth <paul@city-fan.org> - 4.1.1-4
+- Rebuilt for Python 3.14.0rc3 bytecode (rhbz#2396684)
+
 * Fri Aug 15 2025 Python Maint <python-maint@redhat.com> - 4.1.1-3
 - Rebuilt for Python 3.14.0rc2 bytecode