From 96085d33caafc261648a39fa8ad79dbcf8f9d0f1c952acd82dda495374ca2ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mark=C3=A9ta=20Machov=C3=A1?= Date: Fri, 8 Jan 2021 12:12:08 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:certbot/python-certbot-apache?expand=0&rev=56 --- ...e-the-SUSE-override-to-use-apachectl.patch | 56 +++++++++++++++++++ certbot-apache-1.11.0.tar.gz | 3 + certbot-apache-1.9.0.tar.gz | 3 - python-certbot-apache.changes | 21 +++++++ python-certbot-apache.spec | 7 ++- 5 files changed, 85 insertions(+), 5 deletions(-) create mode 100644 0001-Change-the-SUSE-override-to-use-apachectl.patch create mode 100644 certbot-apache-1.11.0.tar.gz delete mode 100644 certbot-apache-1.9.0.tar.gz diff --git a/0001-Change-the-SUSE-override-to-use-apachectl.patch b/0001-Change-the-SUSE-override-to-use-apachectl.patch new file mode 100644 index 0000000..552febd --- /dev/null +++ b/0001-Change-the-SUSE-override-to-use-apachectl.patch @@ -0,0 +1,56 @@ +From 2a352569853010f010d80c5d58f5f189f589fecf Mon Sep 17 00:00:00 2001 +From: Antonio Larrosa +Date: Fri, 8 Jan 2021 10:27:13 +0100 +Subject: [PATCH] Change the SUSE override to use apachectl + +For some time, SUSE distributions have had both an apachectl +executable and an apache2ctl compat symlink so both could be used +but apachectl is preferred since that's the official upstream name. +This is currently the case in SLE 15 SP2 and openSUSE Leap 15.2 +(and every release since SLE 12 SP1) + +OTOH, openSUSE Tumbleweed removed the apache2ctl compat symlink +some weeks ago and both SLE/Leap will follow in one of the next +releases so it's better to change certbot to use the official name, +apachectl. +--- + certbot-apache/certbot_apache/_internal/override_suse.py | 8 ++++---- + certbot/CHANGELOG.md | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/certbot-apache/certbot_apache/_internal/override_suse.py b/certbot-apache/certbot_apache/_internal/override_suse.py +index eee9b0b64..afce98dfa 100644 +--- a/certbot-apache/certbot_apache/_internal/override_suse.py ++++ b/certbot-apache/certbot_apache/_internal/override_suse.py +@@ -14,10 +14,10 @@ class OpenSUSEConfigurator(configurator.ApacheConfigurator): + vhost_root="/etc/apache2/vhosts.d", + vhost_files="*.conf", + logs_root="/var/log/apache2", +- ctl="apache2ctl", +- version_cmd=['apache2ctl', '-v'], +- restart_cmd=['apache2ctl', 'graceful'], +- conftest_cmd=['apache2ctl', 'configtest'], ++ ctl="apachectl", ++ version_cmd=['apachectl', '-v'], ++ restart_cmd=['apachectl', 'graceful'], ++ conftest_cmd=['apachectl', 'configtest'], + enmod="a2enmod", + dismod="a2dismod", + le_vhost_ext="-le-ssl.conf", +#diff --git a/certbot/CHANGELOG.md b/certbot/CHANGELOG.md +#index c01fe830c..efaa2f6be 100644 +#--- a/certbot/CHANGELOG.md +#+++ b/certbot/CHANGELOG.md +#@@ -14,7 +14,8 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +# +# ### Fixed +# +#-* +#+* Fixed the apache component on openSUSE Tumbleweed which no longer provides +#+ an apache2ctl symlink and uses apachectl instead. +# +# More details about these changes can be found on our GitHub repo. +# +-- +2.29.2 + diff --git a/certbot-apache-1.11.0.tar.gz b/certbot-apache-1.11.0.tar.gz new file mode 100644 index 0000000..4514704 --- /dev/null +++ b/certbot-apache-1.11.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ed001427ec0b49324f2b9af7170fa6e6e88948fa51c3678b07bf17f8138863d +size 221609 diff --git a/certbot-apache-1.9.0.tar.gz b/certbot-apache-1.9.0.tar.gz deleted file mode 100644 index 1f05ff8..0000000 --- a/certbot-apache-1.9.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f47fb3f4a9bd927f4812121a0beefe56b163475a28f4db34c64dc838688d9e9e -size 221424 diff --git a/python-certbot-apache.changes b/python-certbot-apache.changes index 0edbbf0..2371126 100644 --- a/python-certbot-apache.changes +++ b/python-certbot-apache.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Jan 8 10:37:11 UTC 2021 - Antonio Larrosa + +- Add patch to fix the apache2 package not providing apache2ctl + any longer (gh#certbot/certbot#8592) + * 0001-Change-the-SUSE-override-to-use-apachectl.patch + +------------------------------------------------------------------- +Fri Jan 8 10:19:34 UTC 2021 - Antonio Larrosa + +- update to version 1.11.0 + * We deprecated support for Apache 2.2 in the certbot-apache + plugin and it will be removed in a future release of Certbot. + +- update to version 1.10.1 + * sync with the main certbot package + +- update to version 1.10.0 + * Support for Python 3.9 was added to Certbot and all of its + components. + ------------------------------------------------------------------- Wed Oct 7 08:42:56 UTC 2020 - Marketa Calabkova diff --git a/python-certbot-apache.spec b/python-certbot-apache.spec index 012f122..394118a 100644 --- a/python-certbot-apache.spec +++ b/python-certbot-apache.spec @@ -1,7 +1,7 @@ # # spec file for package python-certbot-apache # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,14 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-certbot-apache -Version: 1.9.0 +Version: 1.11.0 Release: 0 Summary: Apache plugin for Certbot License: Apache-2.0 URL: https://github.com/letsencrypt/letsencrypt Source: https://files.pythonhosted.org/packages/source/c/certbot-apache/certbot-apache-%{version}.tar.gz +# PATCH-FIX-UPSTREAM alarrosa@suse.com - gh#certbot/certbot#8592 +Patch0: 0001-Change-the-SUSE-override-to-use-apachectl.patch BuildRequires: %{python_module augeas} BuildRequires: %{python_module certbot >= 1.1.0} BuildRequires: %{python_module pytest} @@ -47,6 +49,7 @@ The Apache plugin for Certbot. %prep %setup -q -n certbot-apache-%{version} +%patch0 -p2 %build %python_build