Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-certbot-nginx for
openSUSE:Factory checked in at 2021-07-30 23:22:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-nginx (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-nginx.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-nginx"
Fri Jul 30 23:22:16 2021 rev:29 rq:909362 version:1.17.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-nginx/python-certbot-nginx.changes
2021-06-24 18:23:12.476958399 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-nginx.new.1899/python-certbot-nginx.changes
2021-07-30 23:22:44.851598783 +0200
@@ -1,0 +2,9 @@
+Fri Jul 30 08:46:18 UTC 2021 - Mark??ta Machov?? <[email protected]>
+
+- update to version 1.17.0
+ * When we increased the logging level on our nginx "Could not parse file"
message,
+ it caused a previously-existing inability to parse empty files to become
more
+ visible. We have now added the ability to correctly parse empty files, so
that
+ message should only show for more significant errors.
+
+-------------------------------------------------------------------
Old:
----
certbot-nginx-1.16.0.tar.gz
New:
----
certbot-nginx-1.17.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-nginx.spec ++++++
--- /var/tmp/diff_new_pack.dVKSx4/_old 2021-07-30 23:22:45.207598392 +0200
+++ /var/tmp/diff_new_pack.dVKSx4/_new 2021-07-30 23:22:45.207598392 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-certbot-nginx
-Version: 1.16.0
+Version: 1.17.0
Release: 0
Summary: Nginx plugin for Certbot
License: Apache-2.0
++++++ certbot-nginx-1.16.0.tar.gz -> certbot-nginx-1.17.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.16.0/PKG-INFO
new/certbot-nginx-1.17.0/PKG-INFO
--- old/certbot-nginx-1.16.0/PKG-INFO 2021-06-01 19:49:45.433660500 +0200
+++ new/certbot-nginx-1.17.0/PKG-INFO 2021-07-06 17:41:29.002795500 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-nginx
-Version: 1.16.0
+Version: 1.17.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.16.0/certbot_nginx/_internal/configurator.py
new/certbot-nginx-1.17.0/certbot_nginx/_internal/configurator.py
--- old/certbot-nginx-1.16.0/certbot_nginx/_internal/configurator.py
2021-06-01 19:49:17.000000000 +0200
+++ new/certbot-nginx-1.17.0/certbot_nginx/_internal/configurator.py
2021-07-06 17:41:16.000000000 +0200
@@ -769,9 +769,6 @@
except (KeyError, ValueError):
raise errors.PluginError(
"Unsupported enhancement: {0}".format(enhancement))
- except errors.PluginError:
- logger.error("Failed %s for %s", enhancement, domain)
- raise
def _has_certbot_redirect(self, vhost, domain):
test_redirect_block =
_test_block_from_block(_redirect_block_for_domain(domain))
@@ -791,6 +788,10 @@
:raises .errors.PluginError: If no viable HTTPS host can be created or
set with header header_substring.
"""
+ if not header_substring in constants.HEADER_ARGS:
+ raise errors.NotSupportedError(
+ f"{header_substring} is not supported by the nginx plugin.")
+
vhosts = self.choose_vhosts(domain)
if not vhosts:
raise errors.PluginError(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-nginx-1.16.0/certbot_nginx/_internal/nginxparser.py
new/certbot-nginx-1.17.0/certbot_nginx/_internal/nginxparser.py
--- old/certbot-nginx-1.16.0/certbot_nginx/_internal/nginxparser.py
2021-06-01 19:49:17.000000000 +0200
+++ new/certbot-nginx-1.17.0/certbot_nginx/_internal/nginxparser.py
2021-07-06 17:41:16.000000000 +0200
@@ -9,7 +9,6 @@
from pyparsing import Forward
from pyparsing import Group
from pyparsing import Literal
-from pyparsing import OneOrMore
from pyparsing import Optional
from pyparsing import QuotedString
from pyparsing import Regex
@@ -57,7 +56,7 @@
block_innards = Group(ZeroOrMore(contents) + space).leaveWhitespace()
block << block_begin + left_bracket + block_innards + right_bracket
- script = OneOrMore(contents) + space + stringEnd
+ script = ZeroOrMore(contents) + space + stringEnd
script.parseWithTabs().leaveWhitespace()
def __init__(self, source):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.16.0/certbot_nginx.egg-info/PKG-INFO
new/certbot-nginx-1.17.0/certbot_nginx.egg-info/PKG-INFO
--- old/certbot-nginx-1.16.0/certbot_nginx.egg-info/PKG-INFO 2021-06-01
19:49:45.000000000 +0200
+++ new/certbot-nginx-1.17.0/certbot_nginx.egg-info/PKG-INFO 2021-07-06
17:41:28.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-nginx
-Version: 1.16.0
+Version: 1.17.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.16.0/certbot_nginx.egg-info/requires.txt
new/certbot-nginx-1.17.0/certbot_nginx.egg-info/requires.txt
--- old/certbot-nginx-1.16.0/certbot_nginx.egg-info/requires.txt
2021-06-01 19:49:45.000000000 +0200
+++ new/certbot-nginx-1.17.0/certbot_nginx.egg-info/requires.txt
2021-07-06 17:41:28.000000000 +0200
@@ -1,5 +1,5 @@
-acme>=1.8.0
-certbot>=1.16.0
+acme>=1.17.0
+certbot>=1.17.0
PyOpenSSL>=17.3.0
pyparsing>=2.2.0
setuptools>=39.0.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.16.0/setup.py
new/certbot-nginx-1.17.0/setup.py
--- old/certbot-nginx-1.16.0/setup.py 2021-06-01 19:49:18.000000000 +0200
+++ new/certbot-nginx-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.16.0',
+ # 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}',
'PyOpenSSL>=17.3.0',
'pyparsing>=2.2.0',
'setuptools>=39.0.1',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.16.0/tests/configurator_test.py
new/certbot-nginx-1.17.0/tests/configurator_test.py
--- old/certbot-nginx-1.16.0/tests/configurator_test.py 2021-06-01
19:49:17.000000000 +0200
+++ new/certbot-nginx-1.17.0/tests/configurator_test.py 2021-07-06
17:41:16.000000000 +0200
@@ -43,7 +43,7 @@
def test_prepare(self):
self.assertEqual((1, 6, 2), self.config.version)
- self.assertEqual(13, len(self.config.parser.parsed))
+ self.assertEqual(14, len(self.config.parser.parsed))
@mock.patch("certbot_nginx._internal.configurator.util.exe_exists")
@mock.patch("certbot_nginx._internal.configurator.subprocess.run")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.16.0/tests/nginxparser_test.py
new/certbot-nginx-1.17.0/tests/nginxparser_test.py
--- old/certbot-nginx-1.16.0/tests/nginxparser_test.py 2021-06-01
19:49:17.000000000 +0200
+++ new/certbot-nginx-1.17.0/tests/nginxparser_test.py 2021-07-06
17:41:16.000000000 +0200
@@ -350,6 +350,10 @@
self.assertEqual(loads("blag${dfgdfg};"), [['blag${dfgdfg}']])
self.assertRaises(ParseException, loads, "blag${dfgdf{g};")
+ # empty file
+ parsed = loads("")
+ self.assertEqual(parsed, [])
+
class TestUnspacedList(unittest.TestCase):
"""Test the UnspacedList data structure"""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-nginx-1.16.0/tests/parser_test.py
new/certbot-nginx-1.17.0/tests/parser_test.py
--- old/certbot-nginx-1.16.0/tests/parser_test.py 2021-06-01
19:49:17.000000000 +0200
+++ new/certbot-nginx-1.17.0/tests/parser_test.py 2021-07-06
17:41:16.000000000 +0200
@@ -50,7 +50,7 @@
nparser = parser.NginxParser(self.config_path)
nparser.load()
self.assertEqual({nparser.abs_path(x) for x in
- ['foo.conf', 'nginx.conf', 'server.conf',
+ ['foo.conf', 'nginx.conf', 'server.conf',
'mime.types',
'sites-enabled/default',
'sites-enabled/both.com',
'sites-enabled/example.com',
@@ -89,7 +89,7 @@
# pylint: disable=protected-access
parsed = nparser._parse_files(nparser.abs_path(
'sites-enabled/example.com.test'))
- self.assertEqual(3, len(glob.glob(nparser.abs_path('*.test'))))
+ self.assertEqual(4, len(glob.glob(nparser.abs_path('*.test'))))
self.assertEqual(10, len(
glob.glob(nparser.abs_path('sites-enabled/*.test'))))
self.assertEqual([[['server'], [['listen', '69.50.225.155:9000'],
