Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-certbot-dns-cloudflare for
openSUSE:Factory checked in at 2022-10-27 13:54:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-certbot-dns-cloudflare (Old)
and /work/SRC/openSUSE:Factory/.python-certbot-dns-cloudflare.new.2275
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-certbot-dns-cloudflare"
Thu Oct 27 13:54:38 2022 rev:36 rq:1031483 version:1.31.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-certbot-dns-cloudflare/python-certbot-dns-cloudflare.changes
2022-09-22 14:50:22.050503613 +0200
+++
/work/SRC/openSUSE:Factory/.python-certbot-dns-cloudflare.new.2275/python-certbot-dns-cloudflare.changes
2022-10-27 13:55:13.116887725 +0200
@@ -1,0 +2,10 @@
+Thu Oct 27 08:20:48 UTC 2022 - Mark??ta Machov?? <[email protected]>
+
+- update to version 1.31.0
+ * Fixed an incompatibility in the certbot-dns-cloudflare plugin and the
+ Cloudflare library which was introduced in the Cloudflare library version
+ 2.10.1. The library would raise an error if a token was specified in the
+ Certbot --dns-cloudflare-credentials file as well as the cloudflare.cfg
+ configuration file of the Cloudflare library.
+
+-------------------------------------------------------------------
Old:
----
certbot-dns-cloudflare-1.30.0.tar.gz
New:
----
certbot-dns-cloudflare-1.31.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-certbot-dns-cloudflare.spec ++++++
--- /var/tmp/diff_new_pack.cpIJoT/_old 2022-10-27 13:55:13.588890133 +0200
+++ /var/tmp/diff_new_pack.cpIJoT/_new 2022-10-27 13:55:13.592890153 +0200
@@ -19,7 +19,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
%define skip_python2 1
Name: python-certbot-dns-cloudflare
-Version: 1.30.0
+Version: 1.31.0
Release: 0
Summary: Cloudflare Authenticator plugin for Certbot
License: Apache-2.0
++++++ certbot-dns-cloudflare-1.30.0.tar.gz ->
certbot-dns-cloudflare-1.31.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-dns-cloudflare-1.30.0/PKG-INFO
new/certbot-dns-cloudflare-1.31.0/PKG-INFO
--- old/certbot-dns-cloudflare-1.30.0/PKG-INFO 2022-09-07 20:08:24.556738900
+0200
+++ new/certbot-dns-cloudflare-1.31.0/PKG-INFO 2022-10-04 16:40:57.979791900
+0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-dns-cloudflare
-Version: 1.30.0
+Version: 1.31.0
Summary: Cloudflare DNS Authenticator plugin for Certbot
Home-page: https://github.com/certbot/certbot
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare/__init__.py
new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare/__init__.py
--- old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare/__init__.py
2022-09-07 20:08:15.000000000 +0200
+++ new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare/__init__.py
2022-10-04 16:40:41.000000000 +0200
@@ -39,7 +39,7 @@
zones you need certificates for.
Using Cloudflare Tokens also requires at least version 2.3.1 of the
``cloudflare``
-python module. If the version that automatically installed with this plugin is
+Python module. If the version that automatically installed with this plugin is
older than that, and you can't upgrade it on your system, you'll have to stick
to
the Global key.
@@ -77,6 +77,18 @@
including for renewal, and cannot be silenced except by addressing the issue
(e.g., by using a command like ``chmod 600`` to restrict access to the file).
+.. note::
+ Please note that the ``cloudflare`` Python module used by the plugin has
+ additional methods of providing credentials to the module, e.g. environment
+ variables or the ``cloudflare.cfg`` configuration file. These methods are
not
+ supported by Certbot. If any of those additional methods of providing
+ credentials is being used, they must provide the same credentials (i.e.,
+ email and API key *or* an API token) as the credentials file provided to
+ Certbot. If there is a discrepancy, the ``cloudflare`` Python module will
+ raise an error. Also note that the credentials provided to Certbot will
take
+ precedence over any other method of providing credentials to the
``cloudflare``
+ Python module.
+
Examples
--------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare/_internal/dns_cloudflare.py
new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare/_internal/dns_cloudflare.py
---
old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare/_internal/dns_cloudflare.py
2022-09-07 20:08:15.000000000 +0200
+++
new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare/_internal/dns_cloudflare.py
2022-10-04 16:40:41.000000000 +0200
@@ -82,8 +82,9 @@
if not self.credentials: # pragma: no cover
raise errors.Error("Plugin has not been prepared.")
if self.credentials.conf('api-token'):
- return _CloudflareClient(None, self.credentials.conf('api-token'))
- return _CloudflareClient(self.credentials.conf('email'),
self.credentials.conf('api-key'))
+ return _CloudflareClient(api_token =
self.credentials.conf('api-token'))
+ return _CloudflareClient(email = self.credentials.conf('email'),
+ api_key = self.credentials.conf('api-key'))
class _CloudflareClient:
@@ -91,8 +92,19 @@
Encapsulates all communication with the Cloudflare API.
"""
- def __init__(self, email: Optional[str], api_key: str) -> None:
- self.cf = CloudFlare.CloudFlare(email, api_key)
+ def __init__(self, email: Optional[str] = None, api_key: Optional[str] =
None,
+ api_token: Optional[str] = None) -> None:
+ if email:
+ # If an email was specified, we're using an email/key combination
and not a token.
+ # We can't use named arguments in this case, as it would break
compatibility with
+ # the Cloudflare library since version 2.10.1, as the `token`
argument was used for
+ # tokens and keys alike and the `key` argument did not exist in
earlier versions.
+ self.cf = CloudFlare.CloudFlare(email, api_key)
+ else:
+ # If no email was specified, we're using just a token. Let's use
the named argument
+ # for simplicity, which is compatible with all (current) versions
of the Cloudflare
+ # library.
+ self.cf = CloudFlare.CloudFlare(token=api_token)
def add_txt_record(self, domain: str, record_name: str, record_content:
str,
record_ttl: int) -> None:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare.egg-info/PKG-INFO
new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare.egg-info/PKG-INFO
--- old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare.egg-info/PKG-INFO
2022-09-07 20:08:24.000000000 +0200
+++ new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare.egg-info/PKG-INFO
2022-10-04 16:40:57.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: certbot-dns-cloudflare
-Version: 1.30.0
+Version: 1.31.0
Summary: Cloudflare DNS Authenticator plugin for Certbot
Home-page: https://github.com/certbot/certbot
Author: Certbot Project
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare.egg-info/requires.txt
new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare.egg-info/requires.txt
---
old/certbot-dns-cloudflare-1.30.0/certbot_dns_cloudflare.egg-info/requires.txt
2022-09-07 20:08:24.000000000 +0200
+++
new/certbot-dns-cloudflare-1.31.0/certbot_dns_cloudflare.egg-info/requires.txt
2022-10-04 16:40:57.000000000 +0200
@@ -1,7 +1,7 @@
cloudflare>=1.5.1
setuptools>=41.6.0
-acme>=1.30.0
-certbot>=1.30.0
+acme>=1.31.0
+certbot>=1.31.0
[docs]
Sphinx>=1.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/certbot-dns-cloudflare-1.30.0/setup.py
new/certbot-dns-cloudflare-1.31.0/setup.py
--- old/certbot-dns-cloudflare-1.30.0/setup.py 2022-09-07 20:08:16.000000000
+0200
+++ new/certbot-dns-cloudflare-1.31.0/setup.py 2022-10-04 16:40:42.000000000
+0200
@@ -4,7 +4,7 @@
from setuptools import find_packages
from setuptools import setup
-version = '1.30.0'
+version = '1.31.0'
install_requires = [
'cloudflare>=1.5.1',
