Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2021-07-30 23:22:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Fri Jul 30 23:22:07 2021 rev:29 rq:909350 version:1.17.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2021-06-24 18:23:05.316950456 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.1899/python-certbot-apache.changes
2021-07-30 23:22:31.359613601 +0200
@@ -1,0 +2,9 @@
+Fri Jul 30 08:43:59 UTC 2021 - Mark??ta Machov?? <[email protected]>
+
+- update to version 1.17.0
+ * Add Void Linux overrides for certbot-apache.
+ * The Apache authenticator now always configures virtual hosts which do not
have
+ an explicit ServerName. This should make it work more reliably with the
+ default Apache configuration in Debian-based environments.
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-1.16.0.tar.gz
New:
----
certbot-apache-1.17.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.bmlCDF/_old 2021-07-30 23:22:31.863613048 +0200
+++ /var/tmp/diff_new_pack.bmlCDF/_new 2021-07-30 23:22:31.863613048 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-certbot-apache
-Version: 1.16.0
+Version: 1.17.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
++++++ certbot-apache-1.16.0.tar.gz -> certbot-apache-1.17.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.16.0/PKG-INFO
new/certbot-apache-1.17.0/PKG-INFO
--- old/certbot-apache-1.16.0/PKG-INFO 2021-06-01 19:49:36.872988500 +0200
+++ new/certbot-apache-1.17.0/PKG-INFO 2021-07-06 17:41:26.245873200 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.16.0
+Version: 1.17.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.16.0/certbot_apache/_internal/entrypoint.py
new/certbot-apache-1.17.0/certbot_apache/_internal/entrypoint.py
--- old/certbot-apache-1.16.0/certbot_apache/_internal/entrypoint.py
2021-06-01 19:49:17.000000000 +0200
+++ new/certbot-apache-1.17.0/certbot_apache/_internal/entrypoint.py
2021-07-06 17:41:15.000000000 +0200
@@ -10,6 +10,7 @@
from certbot_apache._internal import override_fedora
from certbot_apache._internal import override_gentoo
from certbot_apache._internal import override_suse
+from certbot_apache._internal import override_void
OVERRIDE_CLASSES = {
"arch": override_arch.ArchConfigurator,
@@ -35,6 +36,7 @@
"sles": override_suse.OpenSUSEConfigurator,
"scientific": override_centos.CentOSConfigurator,
"scientific linux": override_centos.CentOSConfigurator,
+ "void": override_void.VoidConfigurator,
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.16.0/certbot_apache/_internal/http_01.py
new/certbot-apache-1.17.0/certbot_apache/_internal/http_01.py
--- old/certbot-apache-1.16.0/certbot_apache/_internal/http_01.py
2021-06-01 19:49:17.000000000 +0200
+++ new/certbot-apache-1.17.0/certbot_apache/_internal/http_01.py
2021-07-06 17:41:15.000000000 +0200
@@ -95,10 +95,10 @@
def _mod_config(self):
selected_vhosts: List[VirtualHost] = []
http_port = str(self.configurator.config.http01_port)
+
+ # Search for VirtualHosts matching by name
for chall in self.achalls:
- # Search for matching VirtualHosts
- for vh in self._matching_vhosts(chall.domain):
- selected_vhosts.append(vh)
+ selected_vhosts += self._matching_vhosts(chall.domain)
# Ensure that we have one or more VirtualHosts that we can continue
# with. (one that listens to port configured with --http-01-port)
@@ -107,9 +107,13 @@
if any(a.is_wildcard() or a.get_port() == http_port for a in
vhost.addrs):
found = True
- if not found:
- for vh in self._relevant_vhosts():
- selected_vhosts.append(vh)
+ # If there's at least one elgible VirtualHost, also add all unnamed
VirtualHosts
+ # because they might match at runtime (#8890)
+ if found:
+ selected_vhosts += self._unnamed_vhosts()
+ # Otherwise, add every Virtualhost which listens on the right port
+ else:
+ selected_vhosts += self._relevant_vhosts()
# Add the challenge configuration
for vh in selected_vhosts:
@@ -167,6 +171,10 @@
return relevant_vhosts
+ def _unnamed_vhosts(self) -> List[VirtualHost]:
+ """Return all VirtualHost objects with no ServerName"""
+ return [vh for vh in self.configurator.vhosts if vh.name is None]
+
def _set_up_challenges(self):
if not os.path.isdir(self.challenge_dir):
old_umask = filesystem.umask(0o022)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.16.0/certbot_apache/_internal/override_void.py
new/certbot-apache-1.17.0/certbot_apache/_internal/override_void.py
--- old/certbot-apache-1.16.0/certbot_apache/_internal/override_void.py
1970-01-01 01:00:00.000000000 +0100
+++ new/certbot-apache-1.17.0/certbot_apache/_internal/override_void.py
2021-07-06 17:41:15.000000000 +0200
@@ -0,0 +1,23 @@
+""" Distribution specific override class for Void Linux """
+import zope.interface
+
+from certbot import interfaces
+from certbot_apache._internal import configurator
+from certbot_apache._internal.configurator import OsOptions
+
+
[email protected](interfaces.IPluginFactory)
+class VoidConfigurator(configurator.ApacheConfigurator):
+ """Void Linux specific ApacheConfigurator override class"""
+
+ OS_DEFAULTS = OsOptions(
+ server_root="/etc/apache",
+ vhost_root="/etc/apache/extra",
+ vhost_files="*.conf",
+ logs_root="/var/log/httpd",
+ ctl="apachectl",
+ version_cmd=['apachectl', '-v'],
+ restart_cmd=['apachectl', 'graceful'],
+ conftest_cmd=['apachectl', 'configtest'],
+ challenge_location="/etc/apache/extra",
+ )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.16.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.17.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.16.0/certbot_apache.egg-info/PKG-INFO 2021-06-01
19:49:36.000000000 +0200
+++ new/certbot-apache-1.17.0/certbot_apache.egg-info/PKG-INFO 2021-07-06
17:41:26.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.16.0
+Version: 1.17.0
Summary: Apache plugin for Certbot
Home-page: https://github.com/letsencrypt/letsencrypt
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.16.0/certbot_apache.egg-info/SOURCES.txt
new/certbot-apache-1.17.0/certbot_apache.egg-info/SOURCES.txt
--- old/certbot-apache-1.16.0/certbot_apache.egg-info/SOURCES.txt
2021-06-01 19:49:36.000000000 +0200
+++ new/certbot-apache-1.17.0/certbot_apache.egg-info/SOURCES.txt
2021-07-06 17:41:26.000000000 +0200
@@ -30,6 +30,7 @@
certbot_apache/_internal/override_fedora.py
certbot_apache/_internal/override_gentoo.py
certbot_apache/_internal/override_suse.py
+certbot_apache/_internal/override_void.py
certbot_apache/_internal/parser.py
certbot_apache/_internal/parsernode_util.py
certbot_apache/_internal/augeas_lens/httpd.aug
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.16.0/certbot_apache.egg-info/requires.txt
new/certbot-apache-1.17.0/certbot_apache.egg-info/requires.txt
--- old/certbot-apache-1.16.0/certbot_apache.egg-info/requires.txt
2021-06-01 19:49:36.000000000 +0200
+++ new/certbot-apache-1.17.0/certbot_apache.egg-info/requires.txt
2021-07-06 17:41:26.000000000 +0200
@@ -1,5 +1,5 @@
-acme>=1.8.0
-certbot>=1.10.1
+acme>=1.17.0
+certbot>=1.17.0
python-augeas
setuptools>=39.0.1
zope.component
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.16.0/setup.py
new/certbot-apache-1.17.0/setup.py
--- old/certbot-apache-1.16.0/setup.py 2021-06-01 19:49:18.000000000 +0200
+++ new/certbot-apache-1.17.0/setup.py 2021-07-06 17:41:17.000000000 +0200
@@ -1,13 +1,14 @@
from setuptools import find_packages
from setuptools import setup
-version = '1.16.0'
+version = '1.17.0'
-# Remember to update local-oldest-requirements.txt when changing the minimum
-# acme/certbot version.
install_requires = [
- 'acme>=1.8.0',
- 'certbot>=1.10.1',
+ # We specify the minimum acme and certbot version as the current plugin
+ # version for simplicity. See
+ # https://github.com/certbot/certbot/issues/8761 for more info.
+ f'acme>={version}',
+ f'certbot>={version}',
'python-augeas',
'setuptools>=39.0.1',
'zope.component',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.16.0/tests/http_01_test.py
new/certbot-apache-1.17.0/tests/http_01_test.py
--- old/certbot-apache-1.16.0/tests/http_01_test.py 2021-06-01
19:49:17.000000000 +0200
+++ new/certbot-apache-1.17.0/tests/http_01_test.py 2021-07-06
17:41:15.000000000 +0200
@@ -125,6 +125,18 @@
domain="duplicate.example.com", account_key=self.account_key)]
self.common_perform_test(achalls, vhosts)
+ def test_configure_name_and_blank(self):
+ domain = "certbot.demo"
+ vhosts = [v for v in self.config.vhosts if v.name == domain or v.name
is None]
+ achalls = [
+ achallenges.KeyAuthorizationAnnotatedChallenge(
+ challb=acme_util.chall_to_challb(
+ challenges.HTTP01(token=((b'a' * 16))),
+ "pending"),
+ domain=domain, account_key=self.account_key),
+ ]
+ self.common_perform_test(achalls, vhosts)
+
def test_no_vhost(self):
for achall in self.achalls:
self.http.add_chall(achall)
