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-12-21 18:40:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Tue Dec 21 18:40:54 2021 rev:31 rq:941881 version:1.20.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2021-08-11 11:49:28.521583528 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.2520/python-certbot-apache.changes
2021-12-21 18:41:35.257925328 +0100
@@ -1,0 +2,7 @@
+Mon Dec 13 17:32:11 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de>
+
+- Update to version 1.19.0
+ * Fixed parsing of Defined values in the Apache plugin to allow
+ for = in the value.
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-1.18.0.tar.gz
New:
----
certbot-apache-1.20.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.yiv705/_old 2021-12-21 18:41:35.737925758 +0100
+++ /var/tmp/diff_new_pack.yiv705/_new 2021-12-21 18:41:35.741925762 +0100
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-certbot-apache
-Version: 1.18.0
+Version: 1.20.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
@@ -29,8 +29,6 @@
BuildRequires: %{python_module certbot >= %{version}}
BuildRequires: %{python_module pytest}
BuildRequires: %{python_module setuptools}
-BuildRequires: %{python_module zope.component}
-BuildRequires: %{python_module zope.interface}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
Requires: apache2
@@ -38,8 +36,6 @@
Requires: python-acme >= %{version}
Requires: python-augeas
Requires: python-certbot >= %{version}
-Requires: python-zope.component
-Requires: python-zope.interface
BuildArch: noarch
%python_subpackages
++++++ certbot-apache-1.18.0.tar.gz -> certbot-apache-1.20.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.18.0/PKG-INFO
new/certbot-apache-1.20.0/PKG-INFO
--- old/certbot-apache-1.18.0/PKG-INFO 2021-08-03 22:14:03.149039500 +0200
+++ new/certbot-apache-1.20.0/PKG-INFO 2021-10-05 15:53:05.602080600 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.18.0
+Version: 1.20.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.18.0/certbot_apache/_internal/apache_util.py
new/certbot-apache-1.20.0/certbot_apache/_internal/apache_util.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/apache_util.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/apache_util.py
2021-10-05 15:52:55.000000000 +0200
@@ -153,13 +153,10 @@
return {}
for match in matches:
- if match.count("=") > 1:
- logger.error("Unexpected number of equal signs in "
- "runtime config dump.")
- raise errors.PluginError(
- "Error parsing Apache runtime variables")
- parts = match.partition("=")
- variables[parts[0]] = parts[2]
+ # Value could also contain = so split only once
+ parts = match.split('=', 1)
+ value = parts[1] if len(parts) == 2 else ''
+ variables[parts[0]] = value
return variables
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/configurator.py
new/certbot-apache-1.20.0/certbot_apache/_internal/configurator.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/configurator.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/configurator.py
2021-10-05 15:52:55.000000000 +0200
@@ -121,7 +121,7 @@
"""Apache configurator.
:ivar config: Configuration.
- :type config: :class:`~certbot.interfaces.IConfig`
+ :type config: certbot.configuration.NamespaceConfig
:ivar parser: Handles low level parsing
:type parser: :class:`~certbot_apache._internal.parser`
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/constants.py
new/certbot-apache-1.20.0/certbot_apache/_internal/constants.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/constants.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/constants.py
2021-10-05 15:52:55.000000000 +0200
@@ -4,11 +4,13 @@
from certbot.compat import os
MOD_SSL_CONF_DEST = "options-ssl-apache.conf"
-"""Name of the mod_ssl config file as saved in `IConfig.config_dir`."""
+"""Name of the mod_ssl config file as saved
+in `certbot.configuration.NamespaceConfig.config_dir`."""
UPDATED_MOD_SSL_CONF_DIGEST = ".updated-options-ssl-apache-conf-digest.txt"
-"""Name of the hash of the updated or informed mod_ssl_conf as saved in
`IConfig.config_dir`."""
+"""Name of the hash of the updated or informed mod_ssl_conf as saved
+in `certbot.configuration.NamespaceConfig.config_dir`."""
# NEVER REMOVE A SINGLE HASH FROM THIS LIST UNLESS YOU KNOW EXACTLY WHAT YOU
ARE DOING!
ALL_SSL_OPTIONS_HASHES = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/http_01.py
new/certbot-apache-1.20.0/certbot_apache/_internal/http_01.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/http_01.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/http_01.py
2021-10-05 15:52:55.000000000 +0200
@@ -107,7 +107,7 @@
if any(a.is_wildcard() or a.get_port() == http_port for a in
vhost.addrs):
found = True
- # If there's at least one elgible VirtualHost, also add all unnamed
VirtualHosts
+ # If there's at least one eligible VirtualHost, also add all unnamed
VirtualHosts
# because they might match at runtime (#8890)
if found:
selected_vhosts += self._unnamed_vhosts()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/interfaces.py
new/certbot-apache-1.20.0/certbot_apache/_internal/interfaces.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/interfaces.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/interfaces.py
2021-10-05 15:52:55.000000000 +0200
@@ -312,7 +312,7 @@
"""
Sets the sequence of parameters for this ParserNode object without
whitespaces. While the whitespaces for parameters are discarded when
using
- this method, the whitespacing preceeding the ParserNode itself should
be
+ this method, the whitespacing preceding the ParserNode itself should be
kept intact.
:param list parameters: sequence of parameters
@@ -364,7 +364,7 @@
def add_child_block(self, name, parameters=None, position=None):
"""
Adds a new BlockNode child node with provided values and marks the
callee
- BlockNode dirty. This is used to add new children to the AST. The
preceeding
+ BlockNode dirty. This is used to add new children to the AST. The
preceding
whitespaces should not be added based on the ancestor or siblings for
the
newly created object. This is to match the current behavior of the
legacy
parser implementation.
@@ -385,7 +385,7 @@
"""
Adds a new DirectiveNode child node with provided values and marks the
callee BlockNode dirty. This is used to add new children to the AST.
The
- preceeding whitespaces should not be added based on the ancestor or
siblings
+ preceding whitespaces should not be added based on the ancestor or
siblings
for the newly created object. This is to match the current behavior of
the
legacy parser implementation.
@@ -406,7 +406,7 @@
"""
Adds a new CommentNode child node with provided value and marks the
callee BlockNode dirty. This is used to add new children to the AST.
The
- preceeding whitespaces should not be added based on the ancestor or
siblings
+ preceding whitespaces should not be added based on the ancestor or
siblings
for the newly created object. This is to match the current behavior of
the
legacy parser implementation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/override_centos.py
new/certbot-apache-1.20.0/certbot_apache/_internal/override_centos.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/override_centos.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/override_centos.py
2021-10-05 15:52:55.000000000 +0200
@@ -51,7 +51,7 @@
def _try_restart_fedora(self):
"""
- Tries to restart httpd using systemctl to generate the self signed
keypair.
+ Tries to restart httpd using systemctl to generate the self signed key
pair.
"""
try:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/override_fedora.py
new/certbot-apache-1.20.0/certbot_apache/_internal/override_fedora.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/override_fedora.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/override_fedora.py
2021-10-05 15:52:55.000000000 +0200
@@ -43,7 +43,7 @@
def _try_restart_fedora(self):
"""
- Tries to restart httpd using systemctl to generate the self signed
keypair.
+ Tries to restart httpd using systemctl to generate the self signed key
pair.
"""
try:
util.run_script(['systemctl', 'restart', 'httpd'])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache/_internal/override_void.py
new/certbot-apache-1.20.0/certbot_apache/_internal/override_void.py
--- old/certbot-apache-1.18.0/certbot_apache/_internal/override_void.py
2021-08-03 22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache/_internal/override_void.py
2021-10-05 15:52:55.000000000 +0200
@@ -1,12 +1,8 @@
""" 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
-@zope.interface.provider(interfaces.IPluginFactory)
class VoidConfigurator(configurator.ApacheConfigurator):
"""Void Linux specific ApacheConfigurator override class"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.18.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.20.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.18.0/certbot_apache.egg-info/PKG-INFO 2021-08-03
22:14:03.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache.egg-info/PKG-INFO 2021-10-05
15:53:05.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.18.0
+Version: 1.20.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.18.0/certbot_apache.egg-info/requires.txt
new/certbot-apache-1.20.0/certbot_apache.egg-info/requires.txt
--- old/certbot-apache-1.18.0/certbot_apache.egg-info/requires.txt
2021-08-03 22:14:03.000000000 +0200
+++ new/certbot-apache-1.20.0/certbot_apache.egg-info/requires.txt
2021-10-05 15:53:05.000000000 +0200
@@ -1,9 +1,7 @@
-acme>=1.18.0
-certbot>=1.18.0
+acme>=1.20.0
+certbot>=1.20.0
python-augeas
setuptools>=39.0.1
-zope.component
-zope.interface
[dev]
apacheconfig>=0.3.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.18.0/setup.py
new/certbot-apache-1.20.0/setup.py
--- old/certbot-apache-1.18.0/setup.py 2021-08-03 22:12:59.000000000 +0200
+++ new/certbot-apache-1.20.0/setup.py 2021-10-05 15:52:56.000000000 +0200
@@ -1,7 +1,7 @@
from setuptools import find_packages
from setuptools import setup
-version = '1.18.0'
+version = '1.20.0'
install_requires = [
# We specify the minimum acme and certbot version as the current plugin
@@ -11,8 +11,6 @@
f'certbot>={version}',
'python-augeas',
'setuptools>=39.0.1',
- 'zope.component',
- 'zope.interface',
]
dev_extras = [
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.18.0/tests/entrypoint_test.py
new/certbot-apache-1.20.0/tests/entrypoint_test.py
--- old/certbot-apache-1.18.0/tests/entrypoint_test.py 2021-08-03
22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/tests/entrypoint_test.py 2021-10-05
15:52:55.000000000 +0200
@@ -41,7 +41,7 @@
with mock.patch("certbot.util.get_os_info") as mock_info:
mock_info.return_value = ("nonexistent", "irrelevant")
with mock.patch("certbot.util.get_systemd_os_like") as mock_like:
- mock_like.return_value = ["unknonwn"]
+ mock_like.return_value = ["unknown"]
self.assertEqual(entrypoint.get_configurator(),
configurator.ApacheConfigurator)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.18.0/tests/parser_test.py
new/certbot-apache-1.20.0/tests/parser_test.py
--- old/certbot-apache-1.18.0/tests/parser_test.py 2021-08-03
22:12:58.000000000 +0200
+++ new/certbot-apache-1.20.0/tests/parser_test.py 2021-10-05
15:52:55.000000000 +0200
@@ -188,6 +188,8 @@
'Define: DUMP_RUN_CFG\n'
'Define: U_MICH\n'
'Define: TLS=443\n'
+ 'Define: WITH_ASSIGNMENT=URL=http://example.com\n'
+ 'Define: EMPTY=\n'
'Define: example_path=Documents/path\n'
'User: name="www-data" id=33 not_used\n'
'Group: name="www-data" id=33 not_used\n'
@@ -266,7 +268,10 @@
mock_cfg.side_effect = mock_get_vars
expected_vars = {"TEST": "", "U_MICH": "", "TLS": "443",
- "example_path": "Documents/path"}
+ "example_path": "Documents/path",
+ "WITH_ASSIGNMENT": "URL=http://example.com";,
+ "EMPTY": "",
+ }
self.parser.modules = {}
with mock.patch(
@@ -301,15 +306,6 @@
# path derived from root configuration Include statements
self.assertEqual(mock_parse.call_count, 1)
- @mock.patch("certbot_apache._internal.apache_util._get_runtime_cfg")
- def test_update_runtime_vars_bad_output(self, mock_cfg):
- mock_cfg.return_value = "Define: TLS=443=24"
- self.parser.update_runtime_variables()
-
- mock_cfg.return_value = "Define: DUMP_RUN_CFG\nDefine: TLS=443=24"
- self.assertRaises(
- errors.PluginError, self.parser.update_runtime_variables)
-
@mock.patch("certbot_apache._internal.apache_util.subprocess.run")
def test_update_runtime_vars_bad_ctl(self, mock_run):
mock_run.side_effect = OSError
