Hello community,
here is the log from the commit of package python-certbot-apache for
openSUSE:Factory checked in at 2020-07-15 15:01:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-apache (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-apache.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-apache"
Wed Jul 15 15:01:34 2020 rev:21 rq:820649 version:1.6.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-apache/python-certbot-apache.changes
2020-06-11 15:15:40.782992352 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-apache.new.3060/python-certbot-apache.changes
2020-07-15 15:01:59.455232795 +0200
@@ -1,0 +2,6 @@
+Mon Jul 13 08:38:29 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- update to version 1.6.0
+ * Sync with main certbot package.
+
+-------------------------------------------------------------------
Old:
----
certbot-apache-1.5.0.tar.gz
New:
----
certbot-apache-1.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-apache.spec ++++++
--- /var/tmp/diff_new_pack.Dp2kma/_old 2020-07-15 15:02:00.331233649 +0200
+++ /var/tmp/diff_new_pack.Dp2kma/_new 2020-07-15 15:02:00.335233653 +0200
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-certbot-apache
-Version: 1.5.0
+Version: 1.6.0
Release: 0
Summary: Apache plugin for Certbot
License: Apache-2.0
++++++ certbot-apache-1.5.0.tar.gz -> certbot-apache-1.6.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.5.0/PKG-INFO
new/certbot-apache-1.6.0/PKG-INFO
--- old/certbot-apache-1.5.0/PKG-INFO 2020-06-02 19:12:59.000000000 +0200
+++ new/certbot-apache-1.6.0/PKG-INFO 2020-07-07 19:13:36.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.5.0
+Version: 1.6.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.5.0/certbot_apache/_internal/apache_util.py
new/certbot-apache-1.6.0/certbot_apache/_internal/apache_util.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/apache_util.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/apache_util.py
2020-07-07 19:13:19.000000000 +0200
@@ -225,7 +225,8 @@
command,
stdout=subprocess.PIPE,
stderr=subprocess.PIPE,
- universal_newlines=True)
+ universal_newlines=True,
+ env=util.env_no_snap_for_external_calls())
stdout, stderr = proc.communicate()
except (OSError, ValueError):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/configurator.py
new/certbot-apache-1.6.0/certbot_apache/_internal/configurator.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/configurator.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/configurator.py
2020-07-07 19:13:19.000000000 +0200
@@ -115,6 +115,7 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/apache2",
+ bin=None
)
def option(self, key):
@@ -145,7 +146,7 @@
"""
opts = ["enmod", "dismod", "le_vhost_ext", "server_root", "vhost_root",
"logs_root", "challenge_location", "handle_modules",
"handle_sites",
- "ctl"]
+ "ctl", "bin"]
for o in opts:
# Config options use dashes instead of underscores
if self.conf(o.replace("_", "-")) is not None:
@@ -194,6 +195,8 @@
"(Only Ubuntu/Debian currently)")
add("ctl", default=DEFAULTS["ctl"],
help="Full path to Apache control script")
+ add("bin", default=DEFAULTS["bin"],
+ help="Full path to apache2/httpd binary")
def __init__(self, *args, **kwargs):
"""Initialize an Apache Configurator.
@@ -269,18 +272,25 @@
"""
if self._openssl_version:
return self._openssl_version
- # Step 1. Check for LoadModule directive
+ # Step 1. Determine the location of ssl_module
try:
ssl_module_location = self.parser.modules['ssl_module']
except KeyError:
if warn_on_no_mod_ssl:
logger.warning("Could not find ssl_module; not disabling
session tickets.")
return None
- if not ssl_module_location:
- logger.warning("Could not find ssl_module; not disabling session
tickets.")
- return None
- ssl_module_location =
self.parser.standard_path_from_server_root(ssl_module_location)
- # Step 2. Grep in the .so for openssl version
+ if ssl_module_location:
+ # Possibility A: ssl_module is a DSO
+ ssl_module_location =
self.parser.standard_path_from_server_root(ssl_module_location)
+ else:
+ # Possibility B: ssl_module is statically linked into Apache
+ if self.option("bin"):
+ ssl_module_location = self.option("bin")
+ else:
+ logger.warning("ssl_module is statically linked but
--apache-bin is "
+ "missing; not disabling session tickets.")
+ return None
+ # Step 2. Grep in the binary for openssl version
contents = self._open_module_file(ssl_module_location)
if not contents:
logger.warning("Unable to read ssl_module file; not disabling
session tickets.")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/http_01.py
new/certbot-apache-1.6.0/certbot_apache/_internal/http_01.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/http_01.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/http_01.py
2020-07-07 19:13:19.000000000 +0200
@@ -169,7 +169,7 @@
def _set_up_challenges(self):
if not os.path.isdir(self.challenge_dir):
- old_umask = os.umask(0o022)
+ old_umask = filesystem.umask(0o022)
try:
filesystem.makedirs(self.challenge_dir, 0o755)
except OSError as exception:
@@ -177,7 +177,7 @@
raise errors.PluginError(
"Couldn't create root for http-01 challenge")
finally:
- os.umask(old_umask)
+ filesystem.umask(old_umask)
responses = []
for achall in self.achalls:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_arch.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_arch.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_arch.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_arch.py
2020-07-07 19:13:19.000000000 +0200
@@ -24,4 +24,5 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/httpd/conf",
+ bin=None,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_centos.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_centos.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_centos.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_centos.py
2020-07-07 19:13:19.000000000 +0200
@@ -35,6 +35,7 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/httpd/conf.d",
+ bin=None,
)
def config_test(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_darwin.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_darwin.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_darwin.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_darwin.py
2020-07-07 19:13:19.000000000 +0200
@@ -24,4 +24,5 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/apache2/other",
+ bin=None,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_debian.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_debian.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_debian.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_debian.py
2020-07-07 19:13:19.000000000 +0200
@@ -33,6 +33,7 @@
handle_modules=True,
handle_sites=True,
challenge_location="/etc/apache2",
+ bin=None,
)
def enable_site(self, vhost):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_fedora.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_fedora.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_fedora.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_fedora.py
2020-07-07 19:13:19.000000000 +0200
@@ -29,6 +29,7 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/httpd/conf.d",
+ bin=None,
)
def config_test(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_gentoo.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_gentoo.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_gentoo.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_gentoo.py
2020-07-07 19:13:19.000000000 +0200
@@ -27,6 +27,7 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/apache2/vhosts.d",
+ bin=None,
)
def _prepare_options(self):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache/_internal/override_suse.py
new/certbot-apache-1.6.0/certbot_apache/_internal/override_suse.py
--- old/certbot-apache-1.5.0/certbot_apache/_internal/override_suse.py
2020-06-02 19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache/_internal/override_suse.py
2020-07-07 19:13:19.000000000 +0200
@@ -24,4 +24,5 @@
handle_modules=False,
handle_sites=False,
challenge_location="/etc/apache2/vhosts.d",
+ bin=None,
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-apache-1.5.0/certbot_apache.egg-info/PKG-INFO
new/certbot-apache-1.6.0/certbot_apache.egg-info/PKG-INFO
--- old/certbot-apache-1.5.0/certbot_apache.egg-info/PKG-INFO 2020-06-02
19:12:58.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache.egg-info/PKG-INFO 2020-07-07
19:13:36.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-apache
-Version: 1.5.0
+Version: 1.6.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.5.0/certbot_apache.egg-info/requires.txt
new/certbot-apache-1.6.0/certbot_apache.egg-info/requires.txt
--- old/certbot-apache-1.5.0/certbot_apache.egg-info/requires.txt
2020-06-02 19:12:58.000000000 +0200
+++ new/certbot-apache-1.6.0/certbot_apache.egg-info/requires.txt
2020-07-07 19:13:36.000000000 +0200
@@ -1,5 +1,5 @@
acme>=0.29.0
-certbot>=1.1.0
+certbot>=1.6.0
python-augeas
setuptools
zope.component
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.5.0/setup.py
new/certbot-apache-1.6.0/setup.py
--- old/certbot-apache-1.5.0/setup.py 2020-06-02 19:12:35.000000000 +0200
+++ new/certbot-apache-1.6.0/setup.py 2020-07-07 19:13:23.000000000 +0200
@@ -1,4 +1,4 @@
-from distutils.version import StrictVersion
+from distutils.version import LooseVersion
import sys
from setuptools import __version__ as setuptools_version
@@ -6,20 +6,20 @@
from setuptools import setup
from setuptools.command.test import test as TestCommand
-version = '1.5.0'
+version = '1.6.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
install_requires = [
'acme>=0.29.0',
- 'certbot>=1.1.0',
+ 'certbot>=1.6.0',
'python-augeas',
'setuptools',
'zope.component',
'zope.interface',
]
-setuptools_known_environment_markers = (StrictVersion(setuptools_version) >=
StrictVersion('36.2'))
+setuptools_known_environment_markers = (LooseVersion(setuptools_version) >=
LooseVersion('36.2'))
if setuptools_known_environment_markers:
install_requires.append('mock ; python_version < "3.3"')
elif 'bdist_wheel' in sys.argv[1:]:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-apache-1.5.0/tests/configurator_test.py
new/certbot-apache-1.6.0/tests/configurator_test.py
--- old/certbot-apache-1.5.0/tests/configurator_test.py 2020-06-02
19:12:31.000000000 +0200
+++ new/certbot-apache-1.6.0/tests/configurator_test.py 2020-07-07
19:13:19.000000000 +0200
@@ -1772,12 +1772,22 @@
AH02556: "SSLOpenSSLConfCmd %s %s" applied to %s
OpenSSL 1.0.2g 1 Mar 2016
"""
+ # ssl_module as a DSO
self.config.parser.modules['ssl_module'] = '/fake/path'
with mock.patch("certbot_apache._internal.configurator."
"ApacheConfigurator._open_module_file") as mock_omf:
mock_omf.return_value = some_string_contents
self.assertEqual(self.config.openssl_version(), "1.0.2g")
+ # ssl_module statically linked
+ self.config._openssl_version = None
+ self.config.parser.modules['ssl_module'] = None
+ self.config.options['bin'] = '/fake/path/to/httpd'
+ with mock.patch("certbot_apache._internal.configurator."
+ "ApacheConfigurator._open_module_file") as mock_omf:
+ mock_omf.return_value = some_string_contents
+ self.assertEqual(self.config.openssl_version(), "1.0.2g")
+
def test_current_version(self):
self.config.version = (2, 4, 10)
self.config._openssl_version = '1.0.2m'
@@ -1799,12 +1809,21 @@
self.assertEqual(self.config.openssl_version(), None)
self.assertTrue("Could not find ssl_module" in
mock_log.call_args[0][0])
+ # When no ssl_module is present at all
self.config._openssl_version = None
- self.config.parser.modules['ssl_module'] = None
+ self.assertTrue("ssl_module" not in self.config.parser.modules)
with
mock.patch("certbot_apache._internal.configurator.logger.warning") as mock_log:
self.assertEqual(self.config.openssl_version(), None)
self.assertTrue("Could not find ssl_module" in
mock_log.call_args[0][0])
+ # When ssl_module is statically linked but --apache-bin not provided
+ self.config._openssl_version = None
+ self.config.options['bin'] = None
+ self.config.parser.modules['ssl_module'] = None
+ with
mock.patch("certbot_apache._internal.configurator.logger.warning") as mock_log:
+ self.assertEqual(self.config.openssl_version(), None)
+ self.assertTrue("ssl_module is statically linked but" in
mock_log.call_args[0][0])
+
self.config.parser.modules['ssl_module'] = "/fake/path"
with
mock.patch("certbot_apache._internal.configurator.logger.warning") as mock_log:
# Check that correct logger.warning was printed
