Hello community,
here is the log from the commit of package python-certbot-nginx for
openSUSE:Leap:15.2 checked in at 2020-03-13 10:58:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/python-certbot-nginx (Old)
and /work/SRC/openSUSE:Leap:15.2/.python-certbot-nginx.new.3160 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-nginx"
Fri Mar 13 10:58:55 2020 rev:7 rq:784027 version:1.3.0
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/python-certbot-nginx/python-certbot-nginx.changes
2020-02-27 06:42:03.453678868 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.python-certbot-nginx.new.3160/python-certbot-nginx.changes
2020-03-13 11:01:17.872602491 +0100
@@ -1,0 +2,6 @@
+Wed Mar 11 13:45:50 UTC 2020 - Marketa Calabkova <[email protected]>
+
+- update to version 1.3.0
+ * Sync with main certbot package.
+
+-------------------------------------------------------------------
Old:
----
certbot-nginx-1.2.0.tar.gz
New:
----
certbot-nginx-1.3.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-nginx.spec ++++++
--- /var/tmp/diff_new_pack.5fjxl3/_old 2020-03-13 11:01:18.308602802 +0100
+++ /var/tmp/diff_new_pack.5fjxl3/_new 2020-03-13 11:01:18.312602805 +0100
@@ -18,7 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
Name: python-certbot-nginx
-Version: 1.2.0
+Version: 1.3.0
Release: 0
Summary: Nginx plugin for Certbot
License: Apache-2.0
++++++ certbot-nginx-1.2.0.tar.gz -> certbot-nginx-1.3.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.2.0/PKG-INFO
new/certbot-nginx-1.3.0/PKG-INFO
--- old/certbot-nginx-1.2.0/PKG-INFO 2020-02-04 22:47:08.000000000 +0100
+++ new/certbot-nginx-1.3.0/PKG-INFO 2020-03-03 21:36:47.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: certbot-nginx
-Version: 1.2.0
+Version: 1.3.0
Summary: Nginx 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-nginx-1.2.0/certbot_nginx/_internal/configurator.py
new/certbot-nginx-1.3.0/certbot_nginx/_internal/configurator.py
--- old/certbot-nginx-1.2.0/certbot_nginx/_internal/configurator.py
2020-02-04 22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx/_internal/configurator.py
2020-03-03 21:36:36.000000000 +0100
@@ -1,6 +1,6 @@
"""Nginx Configuration"""
# https://github.com/PyCQA/pylint/issues/73
-from distutils.version import LooseVersion # pylint:
disable=no-name-in-module, import-error
+from distutils.version import LooseVersion
import logging
import re
import socket
@@ -14,9 +14,9 @@
from acme import challenges
from acme import crypto_util as acme_crypto_util
-from acme.magic_typing import Dict # pylint: disable=unused-import,
no-name-in-module
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Dict
+from acme.magic_typing import List
+from acme.magic_typing import Set
from certbot import crypto_util
from certbot import errors
from certbot import interfaces
@@ -313,9 +313,6 @@
.. todo:: This should maybe return list if no obvious answer
is presented.
- .. todo:: The special name "$hostname" corresponds to the machine's
- hostname. Currently we just ignore this.
-
:param str target_name: domain name
:param bool create_if_no_match: If we should create a new vhost from
default
when there is no match found. If we can't choose a default, raise a
@@ -598,6 +595,12 @@
all_names = set() # type: Set[str]
for vhost in self.parser.get_vhosts():
+ try:
+ vhost.names.remove("$hostname")
+ vhost.names.add(socket.gethostname())
+ except KeyError:
+ pass
+
all_names.update(vhost.names)
for addr in vhost.addrs:
@@ -693,7 +696,7 @@
##################################
# enhancement methods (IInstaller)
##################################
- def supported_enhancements(self): # pylint: disable=no-self-use
+ def supported_enhancements(self):
"""Returns currently supported enhancements."""
return ['redirect', 'ensure-http-header', 'staple-ocsp']
@@ -912,7 +915,7 @@
"""
nginx_restart(self.conf('ctl'), self.nginx_conf)
- def config_test(self): # pylint: disable=no-self-use
+ def config_test(self):
"""Check the configuration of Nginx for errors.
:raises .errors.MisconfigurationError: If config_test fails
@@ -1008,7 +1011,7 @@
matches = re.findall(r"built with OpenSSL ([^ ]+) ", text)
if not matches:
logger.warning("NGINX configured with OpenSSL alternatives is
not officially"
- "supported by Certbot.")
+ " supported by Certbot.")
return ""
return matches[0]
@@ -1087,7 +1090,7 @@
###########################################################################
# Challenges Section for IAuthenticator
###########################################################################
- def get_chall_pref(self, unused_domain): # pylint: disable=no-self-use
+ def get_chall_pref(self, unused_domain):
"""Return list of challenge preferences."""
return [challenges.HTTP01]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.2.0/certbot_nginx/_internal/http_01.py
new/certbot-nginx-1.3.0/certbot_nginx/_internal/http_01.py
--- old/certbot-nginx-1.2.0/certbot_nginx/_internal/http_01.py 2020-02-04
22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx/_internal/http_01.py 2020-03-03
21:36:36.000000000 +0100
@@ -3,7 +3,7 @@
import logging
from acme import challenges
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import List
from certbot import errors
from certbot.compat import os
from certbot.plugins import common
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.2.0/certbot_nginx/_internal/nginxparser.py
new/certbot-nginx-1.3.0/certbot_nginx/_internal/nginxparser.py
--- old/certbot-nginx-1.2.0/certbot_nginx/_internal/nginxparser.py
2020-02-04 22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx/_internal/nginxparser.py
2020-03-03 21:36:36.000000000 +0100
@@ -20,7 +20,6 @@
logger = logging.getLogger(__name__)
class RawNginxParser(object):
- # pylint: disable=expression-not-assigned
# pylint: disable=pointless-statement
"""A class that parses nginx configuration with pyparsing."""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.2.0/certbot_nginx/_internal/parser.py
new/certbot-nginx-1.3.0/certbot_nginx/_internal/parser.py
--- old/certbot-nginx-1.2.0/certbot_nginx/_internal/parser.py 2020-02-04
22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx/_internal/parser.py 2020-03-03
21:36:36.000000000 +0100
@@ -8,11 +8,11 @@
import pyparsing
import six
-from acme.magic_typing import Dict # pylint: disable=unused-import,
no-name-in-module
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
-from acme.magic_typing import Set # pylint: disable=unused-import,
no-name-in-module
-from acme.magic_typing import Tuple # pylint: disable=unused-import,
no-name-in-module
-from acme.magic_typing import Union # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import Dict
+from acme.magic_typing import List
+from acme.magic_typing import Set
+from acme.magic_typing import Tuple
+from acme.magic_typing import Union
from certbot import errors
from certbot.compat import os
from certbot_nginx._internal import nginxparser
@@ -127,7 +127,6 @@
return servers
def get_vhosts(self):
- # pylint: disable=cell-var-from-loop
"""Gets list of all 'virtual hosts' found in Nginx configuration.
Technically this is a misnomer because Nginx does not have virtual
hosts, it has 'server blocks'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.2.0/certbot_nginx/_internal/parser_obj.py
new/certbot-nginx-1.3.0/certbot_nginx/_internal/parser_obj.py
--- old/certbot-nginx-1.2.0/certbot_nginx/_internal/parser_obj.py
2020-02-04 22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx/_internal/parser_obj.py
2020-03-03 21:36:36.000000000 +0100
@@ -6,7 +6,7 @@
import six
-from acme.magic_typing import List # pylint: disable=unused-import,
no-name-in-module
+from acme.magic_typing import List
from certbot import errors
logger = logging.getLogger(__name__)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.2.0/certbot_nginx.egg-info/PKG-INFO
new/certbot-nginx-1.3.0/certbot_nginx.egg-info/PKG-INFO
--- old/certbot-nginx-1.2.0/certbot_nginx.egg-info/PKG-INFO 2020-02-04
22:47:08.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx.egg-info/PKG-INFO 2020-03-03
21:36:47.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.2
Name: certbot-nginx
-Version: 1.2.0
+Version: 1.3.0
Summary: Nginx 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-nginx-1.2.0/certbot_nginx.egg-info/SOURCES.txt
new/certbot-nginx-1.3.0/certbot_nginx.egg-info/SOURCES.txt
--- old/certbot-nginx-1.2.0/certbot_nginx.egg-info/SOURCES.txt 2020-02-04
22:47:08.000000000 +0100
+++ new/certbot-nginx-1.3.0/certbot_nginx.egg-info/SOURCES.txt 2020-03-03
21:36:47.000000000 +0100
@@ -43,6 +43,7 @@
tests/testdata/etc_nginx/server.conf
tests/testdata/etc_nginx/sites-enabled/default
tests/testdata/etc_nginx/sites-enabled/example.com
+tests/testdata/etc_nginx/sites-enabled/example.net
tests/testdata/etc_nginx/sites-enabled/globalssl.com
tests/testdata/etc_nginx/sites-enabled/headers.com
tests/testdata/etc_nginx/sites-enabled/ipv6.com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.2.0/setup.py
new/certbot-nginx-1.3.0/setup.py
--- old/certbot-nginx-1.2.0/setup.py 2020-02-04 22:46:58.000000000 +0100
+++ new/certbot-nginx-1.3.0/setup.py 2020-03-03 21:36:38.000000000 +0100
@@ -4,7 +4,7 @@
from setuptools import setup
from setuptools.command.test import test as TestCommand
-version = '1.2.0'
+version = '1.3.0'
# Remember to update local-oldest-requirements.txt when changing the minimum
# acme/certbot version.
@@ -13,7 +13,7 @@
'certbot>=1.1.0',
'mock',
'PyOpenSSL',
- 'pyparsing>=1.5.5', # Python3 support; perhaps unnecessary?
+ 'pyparsing>=1.5.5', # Python3 support
'setuptools',
'zope.interface',
]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.2.0/tests/configurator_test.py
new/certbot-nginx-1.3.0/tests/configurator_test.py
--- old/certbot-nginx-1.2.0/tests/configurator_test.py 2020-02-04
22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/tests/configurator_test.py 2020-03-03
21:36:36.000000000 +0100
@@ -36,7 +36,7 @@
def test_prepare(self):
self.assertEqual((1, 6, 2), self.config.version)
- self.assertEqual(11, len(self.config.parser.parsed))
+ self.assertEqual(12, len(self.config.parser.parsed))
@mock.patch("certbot_nginx._internal.configurator.util.exe_exists")
@mock.patch("certbot_nginx._internal.configurator.subprocess.Popen")
@@ -76,15 +76,17 @@
else: # pragma: no cover
self.fail("Exception wasn't raised!")
+ @mock.patch("certbot_nginx._internal.configurator.socket.gethostname")
@mock.patch("certbot_nginx._internal.configurator.socket.gethostbyaddr")
- def test_get_all_names(self, mock_gethostbyaddr):
+ def test_get_all_names(self, mock_gethostbyaddr, mock_gethostname):
mock_gethostbyaddr.return_value = ('155.225.50.69.nephoscale.net', [],
[])
+ mock_gethostname.return_value = ('example.net')
names = self.config.get_all_names()
self.assertEqual(names, {
"155.225.50.69.nephoscale.net", "www.example.org", "another.alias",
"migration.com", "summer.com", "geese.com", "sslon.com",
"globalssl.com", "globalsslsetssl.com", "ipv6.com", "ipv6ssl.com",
- "headers.com"})
+ "headers.com", "example.net"})
def test_supported_enhancements(self):
self.assertEqual(['redirect', 'ensure-http-header', 'staple-ocsp'],
@@ -924,7 +926,7 @@
prefer_ssl=False,
no_ssl_filter_port='80')
# Check that the dialog was called with only port 80 vhosts
- self.assertEqual(len(mock_select_vhs.call_args[0][0]), 5)
+ self.assertEqual(len(mock_select_vhs.call_args[0][0]), 6)
class InstallSslOptionsConfTest(util.NginxTest):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.2.0/tests/parser_test.py
new/certbot-nginx-1.3.0/tests/parser_test.py
--- old/certbot-nginx-1.2.0/tests/parser_test.py 2020-02-04
22:46:57.000000000 +0100
+++ new/certbot-nginx-1.3.0/tests/parser_test.py 2020-03-03
21:36:36.000000000 +0100
@@ -58,7 +58,8 @@
'sites-enabled/sslon.com',
'sites-enabled/globalssl.com',
'sites-enabled/ipv6.com',
- 'sites-enabled/ipv6ssl.com']},
+ 'sites-enabled/ipv6ssl.com',
+ 'sites-enabled/example.net']},
set(nparser.parsed.keys()))
self.assertEqual([['server_name', 'somename', 'alias',
'another.alias']],
nparser.parsed[nparser.abs_path('server.conf')])
@@ -88,7 +89,7 @@
parsed = nparser._parse_files(nparser.abs_path(
'sites-enabled/example.com.test'))
self.assertEqual(3, len(glob.glob(nparser.abs_path('*.test'))))
- self.assertEqual(8, len(
+ self.assertEqual(9, len(
glob.glob(nparser.abs_path('sites-enabled/*.test'))))
self.assertEqual([[['server'], [['listen', '69.50.225.155:9000'],
['listen', '127.0.0.1'],
@@ -171,7 +172,7 @@
'*.www.example.com']),
[], [2, 1, 0])
- self.assertEqual(13, len(vhosts))
+ self.assertEqual(14, len(vhosts))
example_com = [x for x in vhosts if 'example.com' in x.filep][0]
self.assertEqual(vhost3, example_com)
default = [x for x in vhosts if 'default' in x.filep][0]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.2.0/tests/testdata/etc_nginx/sites-enabled/example.net
new/certbot-nginx-1.3.0/tests/testdata/etc_nginx/sites-enabled/example.net
--- old/certbot-nginx-1.2.0/tests/testdata/etc_nginx/sites-enabled/example.net
1970-01-01 01:00:00.000000000 +0100
+++ new/certbot-nginx-1.3.0/tests/testdata/etc_nginx/sites-enabled/example.net
2020-03-03 21:36:36.000000000 +0100
@@ -0,0 +1,5 @@
+server {
+ listen 80;
+ listen [::]:80;
+ server_name $hostname;
+}
