From c3edc25fb71cf5255500a850a515bf44d6ca66ef Mon Sep 17 00:00:00 2001 From: Brad Warren Date: Mon, 10 Jun 2019 14:12:59 -0700 Subject: [PATCH 1/5] Fix dns rfc2136 (#7142) (#7143) * Revert "Add an option to dns_rfc2136 plugin to specify an authorative base domain. (#7029)" This reverts commit 5ab6a597b0e23b604e4d6e339a9d3784abc57217. * Update changelog. (cherry picked from commit 23b52ca1c8798285698b2a051a36b3c98d70191b) --- CHANGELOG.md | 17 +++++++ .../certbot_dns_rfc2136/__init__.py | 6 +-- .../certbot_dns_rfc2136/dns_rfc2136.py | 50 ++++++------------- .../certbot_dns_rfc2136/dns_rfc2136_test.py | 29 +---------- 4 files changed, 37 insertions(+), 65 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95833ad7b..4daa6f928 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,23 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +## 0.35.1 - master + +### Fixed + +* Support for specifying an authoritative base domain in our dns-rfc2136 plugin + has been removed. This feature was added in our last release but had a bug + which caused the plugin to fail so the feature has been removed until it can + be added properly. + +Despite us having broken lockstep, we are continuing to release new versions of +all Certbot components during releases for the time being, however, the only +package with changes other than its version number was: + +* certbot-dns-rfc2136 + +More details about these changes can be found on our GitHub repo. + ## 0.35.0 - 2019-06-05 ### Added diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/__init__.py b/certbot-dns-rfc2136/certbot_dns_rfc2136/__init__.py index cebff2841..12b360959 100644 --- a/certbot-dns-rfc2136/certbot_dns_rfc2136/__init__.py +++ b/certbot-dns-rfc2136/certbot_dns_rfc2136/__init__.py @@ -21,8 +21,8 @@ Credentials ----------- Use of this plugin requires a configuration file containing the target DNS -server, optional authorative domain and optional port that supports RFC 2136 Dynamic Updates, -the name of the TSIG key, the TSIG key secret itself and the algorithm used if it's +server and optional port that supports RFC 2136 Dynamic Updates, the name +of the TSIG key, the TSIG key secret itself and the algorithm used if it's different to HMAC-MD5. .. code-block:: ini @@ -33,8 +33,6 @@ different to HMAC-MD5. dns_rfc2136_server = 192.0.2.1 # Target DNS port dns_rfc2136_port = 53 - # Authorative domain (optional, will try to auto-detect if missing) - dns_rfc2136_base_domain = example.com # TSIG key name dns_rfc2136_name = keyname. # TSIG key secret diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136.py b/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136.py index 5db8c3020..2061374e0 100644 --- a/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136.py +++ b/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136.py @@ -79,33 +79,25 @@ class Authenticator(dns_common.DNSAuthenticator): self._get_rfc2136_client().del_txt_record(validation_name, validation) def _get_rfc2136_client(self): - key = _RFC2136Key(self.credentials.conf('name'), - self.credentials.conf('secret'), - self.ALGORITHMS.get(self.credentials.conf('algorithm'), - dns.tsig.HMAC_MD5)) return _RFC2136Client(self.credentials.conf('server'), int(self.credentials.conf('port') or self.PORT), - key, - self.credentials.conf('base-domain')) + self.credentials.conf('name'), + self.credentials.conf('secret'), + self.ALGORITHMS.get(self.credentials.conf('algorithm'), + dns.tsig.HMAC_MD5)) -class _RFC2136Key(object): - def __init__(self, name, secret, algorithm): - self.name = name - self.secret = secret - self.algorithm = algorithm class _RFC2136Client(object): """ Encapsulates all communication with the target DNS server. """ - def __init__(self, server, port, base_domain, key): + def __init__(self, server, port, key_name, key_secret, key_algorithm): self.server = server self.port = port self.keyring = dns.tsigkeyring.from_text({ - key.name: key.secret + key_name: key_secret }) - self.algorithm = key.algorithm - self.base_domain = base_domain + self.algorithm = key_algorithm def add_txt_record(self, record_name, record_content, record_ttl): """ @@ -179,33 +171,23 @@ class _RFC2136Client(object): def _find_domain(self, record_name): """ - If 'base_domain' option is specified check if the requested domain matches this base domain - and return it. If not explicitly specified find the closest domain with an SOA record for - the given domain name. + Find the closest domain with an SOA record for a given domain name. - :param str record_name: The record name for which to find the base domain. + :param str record_name: The record name for which to find the closest SOA record. :returns: The domain, if found. :rtype: str :raises certbot.errors.PluginError: if no SOA record can be found. """ - if self.base_domain: - if not record_name.endswith(self.base_domain): - raise errors.PluginError('Requested domain {0} does not match specified base ' - 'domain {1}.' - .format(record_name, self.base_domain)) - else: - return self.base_domain - else: - domain_name_guesses = dns_common.base_domain_name_guesses(record_name) + domain_name_guesses = dns_common.base_domain_name_guesses(record_name) - # Loop through until we find an authoritative SOA record - for guess in domain_name_guesses: - if self._query_soa(guess): - return guess + # Loop through until we find an authoritative SOA record + for guess in domain_name_guesses: + if self._query_soa(guess): + return guess - raise errors.PluginError('Unable to determine base domain for {0} using names: {1}.' - .format(record_name, domain_name_guesses)) + raise errors.PluginError('Unable to determine base domain for {0} using names: {1}.' + .format(record_name, domain_name_guesses)) def _query_soa(self, domain_name): """ diff --git a/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136_test.py b/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136_test.py index bed3445b6..d800f1ec7 100644 --- a/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136_test.py +++ b/certbot-dns-rfc2136/certbot_dns_rfc2136/dns_rfc2136_test.py @@ -73,12 +73,9 @@ class AuthenticatorTest(test_util.TempDirTestCase, dns_test_common.BaseAuthentic class RFC2136ClientTest(unittest.TestCase): def setUp(self): - from certbot_dns_rfc2136.dns_rfc2136 import _RFC2136Client, _RFC2136Key + from certbot_dns_rfc2136.dns_rfc2136 import _RFC2136Client - self.rfc2136_client = _RFC2136Client(SERVER, - PORT, - None, - _RFC2136Key(NAME, SECRET, dns.tsig.HMAC_MD5)) + self.rfc2136_client = _RFC2136Client(SERVER, PORT, NAME, SECRET, dns.tsig.HMAC_MD5) @mock.patch("dns.query.tcp") def test_add_txt_record(self, query_mock): @@ -165,28 +162,6 @@ class RFC2136ClientTest(unittest.TestCase): self.rfc2136_client._find_domain, 'foo.bar.'+DOMAIN) - def test_find_domain_with_base(self): - # _query_soa | pylint: disable=protected-access - self.rfc2136_client._query_soa = mock.MagicMock(side_effect=[False, False, True]) - self.rfc2136_client.base_domain = 'bar.' + DOMAIN - - # _find_domain | pylint: disable=protected-access - domain = self.rfc2136_client._find_domain('foo.bar.' + DOMAIN) - - self.assertTrue(domain == 'bar.' + DOMAIN) - - def test_find_domain_with_wrong_base(self): - - # _query_soa | pylint: disable=protected-access - self.rfc2136_client._query_soa = mock.MagicMock(side_effect=[False, False, True]) - self.rfc2136_client.base_domain = 'wrong.' + DOMAIN - - self.assertRaises( - errors.PluginError, - # _find_domain | pylint: disable=protected-access - self.rfc2136_client._find_domain, - 'foo.bar.' + DOMAIN) - @mock.patch("dns.query.udp") def test_query_soa_found(self, query_mock): query_mock.return_value = mock.MagicMock(answer=[mock.MagicMock()], flags=dns.flags.AA) From 6334d065cf2b5e34af65edffa1f9daf0a66e5cf8 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 10 Jun 2019 15:02:09 -0700 Subject: [PATCH 2/5] Update changelog for 0.35.1 release --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4daa6f928..6b664f8cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). -## 0.35.1 - master +## 0.35.1 - 2019-06-10 ### Fixed From 0cc56677e28fd29f82644037e35dd747e4278fff Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 10 Jun 2019 15:25:09 -0700 Subject: [PATCH 3/5] Release 0.35.1 --- acme/setup.py | 2 +- certbot-apache/setup.py | 2 +- certbot-auto | 26 +++++++++--------- certbot-compatibility-test/setup.py | 2 +- certbot-dns-cloudflare/setup.py | 2 +- certbot-dns-cloudxns/setup.py | 2 +- certbot-dns-digitalocean/setup.py | 2 +- certbot-dns-dnsimple/setup.py | 2 +- certbot-dns-dnsmadeeasy/setup.py | 2 +- certbot-dns-gehirn/setup.py | 2 +- certbot-dns-google/setup.py | 2 +- certbot-dns-linode/setup.py | 2 +- certbot-dns-luadns/setup.py | 2 +- certbot-dns-nsone/setup.py | 2 +- certbot-dns-ovh/setup.py | 2 +- certbot-dns-rfc2136/setup.py | 2 +- certbot-dns-route53/setup.py | 2 +- certbot-dns-sakuracloud/setup.py | 2 +- certbot-nginx/setup.py | 2 +- certbot/__init__.py | 2 +- docs/cli-help.txt | 2 +- letsencrypt-auto | 26 +++++++++--------- letsencrypt-auto-source/certbot-auto.asc | 16 +++++------ letsencrypt-auto-source/letsencrypt-auto | 26 +++++++++--------- letsencrypt-auto-source/letsencrypt-auto.sig | Bin 256 -> 256 bytes .../pieces/certbot-requirements.txt | 24 ++++++++-------- 26 files changed, 79 insertions(+), 79 deletions(-) diff --git a/acme/setup.py b/acme/setup.py index b5291862b..160010504 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -3,7 +3,7 @@ from setuptools import find_packages from setuptools.command.test import test as TestCommand import sys -version = '0.35.0' +version = '0.35.1' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index e991a8825..e6317eb73 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -4,7 +4,7 @@ from setuptools.command.test import test as TestCommand import sys -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-auto b/certbot-auto index abe655083..756b8e247 100755 --- a/certbot-auto +++ b/certbot-auto @@ -31,7 +31,7 @@ if [ -z "$VENV_PATH" ]; then fi VENV_BIN="$VENV_PATH/bin" BOOTSTRAP_VERSION_PATH="$VENV_PATH/certbot-auto-bootstrap-version.txt" -LE_AUTO_VERSION="0.35.0" +LE_AUTO_VERSION="0.35.1" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates @@ -1314,18 +1314,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.35.0 \ - --hash=sha256:6e02460eefdb37094b8ef283e76257a3557268dde519a6dbf6bf8954669cd754 \ - --hash=sha256:33bcdee9fd97a244545f0c1c6480a9889f0382d915927cdfd707c050e78544d9 -acme==0.35.0 \ - --hash=sha256:7b5483f635a994b2220d5cf49d313027dfd2fcd8ce90f94e92c6ec768c08852c \ - --hash=sha256:ddcc530bd8d8434687188115c5b7c6219717d50a4658e58fce24561134463880 -certbot-apache==0.35.0 \ - --hash=sha256:55a5c8c3785cc17d71d6a2cfc406e8bcea631a46f9bce52cce07ea041024d586 \ - --hash=sha256:a92cc1e5854cc7e7a386b3e7616c2787e3867ef604d76cad7ba922366f4a26d7 -certbot-nginx==0.35.0 \ - --hash=sha256:74af57b071c2c62e1066cc367f106f457d34d956be4ad14528f3fd133ce25d79 \ - --hash=sha256:435b37794204dbb02b4b346ea65758bdd6dfb58581bebef43b82911371e7a41f +certbot==0.35.1 \ + --hash=sha256:24821e10b05084a45c5bf29da704115f2637af613866589737cff502294dad2a \ + --hash=sha256:d7e8ecc14e06ed1dc691c6069bc9ce42dce04e8db1684ddfab446fbd71290860 +acme==0.35.1 \ + --hash=sha256:3ec62f638f2b3684bcb3d8476345c7ae37c8f3b28f2999622ff836aec6e73d64 \ + --hash=sha256:a988b8b418cc74075e68b4acf3ff64c026bf52c377b0d01223233660a755c423 +certbot-apache==0.35.1 \ + --hash=sha256:ee4fe10cbd18e0aa7fe36d43ad7792187f41a7298f383610b87049c3a6493bbb \ + --hash=sha256:69962eafe0ec9be8eb2845e3622da6f37ecaeee7e517ea172d71d7b31f01be71 +certbot-nginx==0.35.1 \ + --hash=sha256:22150f13b3c0bd1c3c58b11a64886dad9695796aac42f5809da7ec66de187760 \ + --hash=sha256:85e9a48b4b549f6989304f66cb2fad822c3f8717d361bde0d6a43aabb792d461 UNLIKELY_EOF # ------------------------------------------------------------------------- diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py index dacf43870..2300b6208 100644 --- a/certbot-compatibility-test/setup.py +++ b/certbot-compatibility-test/setup.py @@ -4,7 +4,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' install_requires = [ 'certbot', diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index b552b017f..9de84f2df 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index 9156e7a6c..3c0df32a4 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index 0c97eadb5..c597ff2cd 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index 91745a27d..fec720b07 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -3,7 +3,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index eaf048d33..0e3c160c7 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index 3c5022832..a3f8be72a 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index 73ba0e795..6f9c50825 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index d2e84a8c1..2a55aa6e9 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -1,7 +1,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 7160c857a..8e1231d1d 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index 3e0f6787c..c63dfa70f 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index f5cb7782d..288772e3e 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index 0d5cb5498..cc406aa1a 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index efc5c4d7a..b7260362c 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -1,7 +1,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index c29a20169..689240772 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.0' +version = '0.35.1' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index e7d742b7f..2f108ee5f 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -4,7 +4,7 @@ from setuptools.command.test import test as TestCommand import sys -version = '0.35.0' +version = '0.35.1' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot/__init__.py b/certbot/__init__.py index 0d0c96fb7..18803420f 100644 --- a/certbot/__init__.py +++ b/certbot/__init__.py @@ -1,4 +1,4 @@ """Certbot client.""" # version number like 1.2.3a0, must have at least 2 parts, like 1.2 -__version__ = '0.35.0' +__version__ = '0.35.1' diff --git a/docs/cli-help.txt b/docs/cli-help.txt index 03338dbea..3499acf19 100644 --- a/docs/cli-help.txt +++ b/docs/cli-help.txt @@ -113,7 +113,7 @@ optional arguments: case, and to know when to deprecate support for past Python versions and flags. If you wish to hide this information from the Let's Encrypt server, set this to - "". (default: CertbotACMEClient/0.35.0 + "". (default: CertbotACMEClient/0.35.1 (certbot(-auto); OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel). The flags encoded in the diff --git a/letsencrypt-auto b/letsencrypt-auto index abe655083..756b8e247 100755 --- a/letsencrypt-auto +++ b/letsencrypt-auto @@ -31,7 +31,7 @@ if [ -z "$VENV_PATH" ]; then fi VENV_BIN="$VENV_PATH/bin" BOOTSTRAP_VERSION_PATH="$VENV_PATH/certbot-auto-bootstrap-version.txt" -LE_AUTO_VERSION="0.35.0" +LE_AUTO_VERSION="0.35.1" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates @@ -1314,18 +1314,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.35.0 \ - --hash=sha256:6e02460eefdb37094b8ef283e76257a3557268dde519a6dbf6bf8954669cd754 \ - --hash=sha256:33bcdee9fd97a244545f0c1c6480a9889f0382d915927cdfd707c050e78544d9 -acme==0.35.0 \ - --hash=sha256:7b5483f635a994b2220d5cf49d313027dfd2fcd8ce90f94e92c6ec768c08852c \ - --hash=sha256:ddcc530bd8d8434687188115c5b7c6219717d50a4658e58fce24561134463880 -certbot-apache==0.35.0 \ - --hash=sha256:55a5c8c3785cc17d71d6a2cfc406e8bcea631a46f9bce52cce07ea041024d586 \ - --hash=sha256:a92cc1e5854cc7e7a386b3e7616c2787e3867ef604d76cad7ba922366f4a26d7 -certbot-nginx==0.35.0 \ - --hash=sha256:74af57b071c2c62e1066cc367f106f457d34d956be4ad14528f3fd133ce25d79 \ - --hash=sha256:435b37794204dbb02b4b346ea65758bdd6dfb58581bebef43b82911371e7a41f +certbot==0.35.1 \ + --hash=sha256:24821e10b05084a45c5bf29da704115f2637af613866589737cff502294dad2a \ + --hash=sha256:d7e8ecc14e06ed1dc691c6069bc9ce42dce04e8db1684ddfab446fbd71290860 +acme==0.35.1 \ + --hash=sha256:3ec62f638f2b3684bcb3d8476345c7ae37c8f3b28f2999622ff836aec6e73d64 \ + --hash=sha256:a988b8b418cc74075e68b4acf3ff64c026bf52c377b0d01223233660a755c423 +certbot-apache==0.35.1 \ + --hash=sha256:ee4fe10cbd18e0aa7fe36d43ad7792187f41a7298f383610b87049c3a6493bbb \ + --hash=sha256:69962eafe0ec9be8eb2845e3622da6f37ecaeee7e517ea172d71d7b31f01be71 +certbot-nginx==0.35.1 \ + --hash=sha256:22150f13b3c0bd1c3c58b11a64886dad9695796aac42f5809da7ec66de187760 \ + --hash=sha256:85e9a48b4b549f6989304f66cb2fad822c3f8717d361bde0d6a43aabb792d461 UNLIKELY_EOF # ------------------------------------------------------------------------- diff --git a/letsencrypt-auto-source/certbot-auto.asc b/letsencrypt-auto-source/certbot-auto.asc index fe8053e4f..0abdfdfdb 100644 --- a/letsencrypt-auto-source/certbot-auto.asc +++ b/letsencrypt-auto-source/certbot-auto.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAABCAAdFiEEos+1H6J1pyhiNOeyTRfJlc2XdfIFAlz4LVUACgkQTRfJlc2X -dfL3rQf/UUZa51owdNuiGl7EbbyGyQFMAzq4pYDofsSlFWYPYQSMtcxuBa/w3Cxp -TzFMpWs2tr4y+axFZwNleVDdD5bw/CWLQ+aScvRYblYFPOucwz9/GMEjpy1056Gh -4hZ3FyLYPtD9oP9YR5VMPy109Djv4DX5F6de3JgC2Wv3FbvtZkkZfforCHxEnbjU -6dHDT1qxEzqqEyFHjtlRi1hGymeMbu56+ZqhzkkZJVO0KS1+y7M8DxuKa7kbTP43 -337ASSFZ/eL/A9HGJNoxWLX0+VazNJomHyG9zGmscj1lK1/S/HoIREzdZV84tUME -0iroJw2aax7jpgrlTm6z2zt/vPpemw== -=rvAB +iQEzBAABCAAdFiEEos+1H6J1pyhiNOeyTRfJlc2XdfIFAlz+2KgACgkQTRfJlc2X +dfKLvwf/XUnWRyKldk/d8Egx514mpjzV38grCcZTZrY0O/Rd3YMv5KtrxnTnmvxJ +zAkTfNIo7Y1894mZ6XUIF3D7BiPoRqLj6F8tYLV6jbdsPJKC75dQY/6rcttTSJab +Zbqcw+WTXYNZ72AlHw0uTaxNT+S31KvrJ0pNmuj2ezKzZcDfgcxeeqmI1pJYozbQ ++AfqJMFgP9qHtfZVnmRO5UFBW2qPM522E02wWCtkaQSybI9ikRTvJOtilQgsLFJK +vBdD/MgGHm/xQC6lxG6l/SD4pebvNBaIPCiPAo2XC8ML+4tpjuJ5lPoK/aFCvfYQ +wSMHbDbse/Ndw+ssjmriiBreKB37Mg== +=flRo -----END PGP SIGNATURE----- diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index abe655083..756b8e247 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -31,7 +31,7 @@ if [ -z "$VENV_PATH" ]; then fi VENV_BIN="$VENV_PATH/bin" BOOTSTRAP_VERSION_PATH="$VENV_PATH/certbot-auto-bootstrap-version.txt" -LE_AUTO_VERSION="0.35.0" +LE_AUTO_VERSION="0.35.1" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates @@ -1314,18 +1314,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.35.0 \ - --hash=sha256:6e02460eefdb37094b8ef283e76257a3557268dde519a6dbf6bf8954669cd754 \ - --hash=sha256:33bcdee9fd97a244545f0c1c6480a9889f0382d915927cdfd707c050e78544d9 -acme==0.35.0 \ - --hash=sha256:7b5483f635a994b2220d5cf49d313027dfd2fcd8ce90f94e92c6ec768c08852c \ - --hash=sha256:ddcc530bd8d8434687188115c5b7c6219717d50a4658e58fce24561134463880 -certbot-apache==0.35.0 \ - --hash=sha256:55a5c8c3785cc17d71d6a2cfc406e8bcea631a46f9bce52cce07ea041024d586 \ - --hash=sha256:a92cc1e5854cc7e7a386b3e7616c2787e3867ef604d76cad7ba922366f4a26d7 -certbot-nginx==0.35.0 \ - --hash=sha256:74af57b071c2c62e1066cc367f106f457d34d956be4ad14528f3fd133ce25d79 \ - --hash=sha256:435b37794204dbb02b4b346ea65758bdd6dfb58581bebef43b82911371e7a41f +certbot==0.35.1 \ + --hash=sha256:24821e10b05084a45c5bf29da704115f2637af613866589737cff502294dad2a \ + --hash=sha256:d7e8ecc14e06ed1dc691c6069bc9ce42dce04e8db1684ddfab446fbd71290860 +acme==0.35.1 \ + --hash=sha256:3ec62f638f2b3684bcb3d8476345c7ae37c8f3b28f2999622ff836aec6e73d64 \ + --hash=sha256:a988b8b418cc74075e68b4acf3ff64c026bf52c377b0d01223233660a755c423 +certbot-apache==0.35.1 \ + --hash=sha256:ee4fe10cbd18e0aa7fe36d43ad7792187f41a7298f383610b87049c3a6493bbb \ + --hash=sha256:69962eafe0ec9be8eb2845e3622da6f37ecaeee7e517ea172d71d7b31f01be71 +certbot-nginx==0.35.1 \ + --hash=sha256:22150f13b3c0bd1c3c58b11a64886dad9695796aac42f5809da7ec66de187760 \ + --hash=sha256:85e9a48b4b549f6989304f66cb2fad822c3f8717d361bde0d6a43aabb792d461 UNLIKELY_EOF # ------------------------------------------------------------------------- diff --git a/letsencrypt-auto-source/letsencrypt-auto.sig b/letsencrypt-auto-source/letsencrypt-auto.sig index 987dd3a91e92fee8183e5dc233db3d7ac3814a40..d3824cf4723a708f8f91edebfbc9a2a99cf4ffd3 100644 GIT binary patch literal 256 zcmV+b0ssDcq1=`|$KaB$QCu*^|2!%L-A~)iBmL!@aQ)h&?Xop@bZlMy(+dfpaF0|L zm+4I*&ALOsm~i~UA(Yj#|IG`{%^~g^DhLJtaUL}Uoet3TS zIxq#F&(}Ail*w-=H=L>rlbM04Bbsh*Qs`$oQ$x2|u8o&s6rsk9$J^<6nQ&ohZ~go8 ztxswbwn^J@QNBAi5cJvT0u%BqgFRk@FN371d$Zb9O3tZX_45AHBTST3$%?13k1O0U zSP)}b4|jy$3tt?8ZPIe_?BfhNM3#FYLn$WM4y3@p|)(Ep)9e4$fq$RekufUv$--&JyTdv-IF*r zEHvOrB{!Z0*6s_ED*WWy{~(RULmGF1SI2_b9W3+MDi<8FPI2XT)aoKh!@?c-%mJ?@ zn@?TCNO5v_^#;uw*c-*sBMG6(WJxC}@iB`41TG5-9=MK-9Ob5=pSiG`JX?%n?B|?K zkEe?46mK7p{?mM;Dv6F_q0P0aU=j2;$EnK@vS1@x*`}bt&_V$cE6f%X%L?KHe7#}q zg+yQIHxR9I>HD+*>l|>Co4^VI7rf*xr}fU~4cqtpawqsiHYW`!m*#ZA@gGIjw50`e GU{7|Jk9;-& diff --git a/letsencrypt-auto-source/pieces/certbot-requirements.txt b/letsencrypt-auto-source/pieces/certbot-requirements.txt index 8aab11cef..71c041934 100644 --- a/letsencrypt-auto-source/pieces/certbot-requirements.txt +++ b/letsencrypt-auto-source/pieces/certbot-requirements.txt @@ -1,12 +1,12 @@ -certbot==0.35.0 \ - --hash=sha256:6e02460eefdb37094b8ef283e76257a3557268dde519a6dbf6bf8954669cd754 \ - --hash=sha256:33bcdee9fd97a244545f0c1c6480a9889f0382d915927cdfd707c050e78544d9 -acme==0.35.0 \ - --hash=sha256:7b5483f635a994b2220d5cf49d313027dfd2fcd8ce90f94e92c6ec768c08852c \ - --hash=sha256:ddcc530bd8d8434687188115c5b7c6219717d50a4658e58fce24561134463880 -certbot-apache==0.35.0 \ - --hash=sha256:55a5c8c3785cc17d71d6a2cfc406e8bcea631a46f9bce52cce07ea041024d586 \ - --hash=sha256:a92cc1e5854cc7e7a386b3e7616c2787e3867ef604d76cad7ba922366f4a26d7 -certbot-nginx==0.35.0 \ - --hash=sha256:74af57b071c2c62e1066cc367f106f457d34d956be4ad14528f3fd133ce25d79 \ - --hash=sha256:435b37794204dbb02b4b346ea65758bdd6dfb58581bebef43b82911371e7a41f +certbot==0.35.1 \ + --hash=sha256:24821e10b05084a45c5bf29da704115f2637af613866589737cff502294dad2a \ + --hash=sha256:d7e8ecc14e06ed1dc691c6069bc9ce42dce04e8db1684ddfab446fbd71290860 +acme==0.35.1 \ + --hash=sha256:3ec62f638f2b3684bcb3d8476345c7ae37c8f3b28f2999622ff836aec6e73d64 \ + --hash=sha256:a988b8b418cc74075e68b4acf3ff64c026bf52c377b0d01223233660a755c423 +certbot-apache==0.35.1 \ + --hash=sha256:ee4fe10cbd18e0aa7fe36d43ad7792187f41a7298f383610b87049c3a6493bbb \ + --hash=sha256:69962eafe0ec9be8eb2845e3622da6f37ecaeee7e517ea172d71d7b31f01be71 +certbot-nginx==0.35.1 \ + --hash=sha256:22150f13b3c0bd1c3c58b11a64886dad9695796aac42f5809da7ec66de187760 \ + --hash=sha256:85e9a48b4b549f6989304f66cb2fad822c3f8717d361bde0d6a43aabb792d461 From f18143b11776d8821db305e6391ff982ba4ce870 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 10 Jun 2019 15:25:15 -0700 Subject: [PATCH 4/5] Add contents to CHANGELOG.md for next version --- CHANGELOG.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b664f8cb..a07efae75 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,28 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). +## 0.36.0 - master + +### Added + +* + +### Changed + +* + +### Fixed + +* + +Despite us having broken lockstep, we are continuing to release new versions of +all Certbot components during releases for the time being, however, the only +package with changes other than its version number was: + +* + +More details about these changes can be found on our GitHub repo. + ## 0.35.1 - 2019-06-10 ### Fixed From 3bceae4a892a9c42a1a142502e45906dc708a387 Mon Sep 17 00:00:00 2001 From: Erica Portnoy Date: Mon, 10 Jun 2019 15:25:16 -0700 Subject: [PATCH 5/5] Bump version to 0.36.0 --- acme/setup.py | 2 +- certbot-apache/setup.py | 2 +- certbot-compatibility-test/setup.py | 2 +- certbot-dns-cloudflare/setup.py | 2 +- certbot-dns-cloudxns/setup.py | 2 +- certbot-dns-digitalocean/setup.py | 2 +- certbot-dns-dnsimple/setup.py | 2 +- certbot-dns-dnsmadeeasy/setup.py | 2 +- certbot-dns-gehirn/setup.py | 2 +- certbot-dns-google/setup.py | 2 +- certbot-dns-linode/setup.py | 2 +- certbot-dns-luadns/setup.py | 2 +- certbot-dns-nsone/setup.py | 2 +- certbot-dns-ovh/setup.py | 2 +- certbot-dns-rfc2136/setup.py | 2 +- certbot-dns-route53/setup.py | 2 +- certbot-dns-sakuracloud/setup.py | 2 +- certbot-nginx/setup.py | 2 +- certbot/__init__.py | 2 +- letsencrypt-auto-source/letsencrypt-auto | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/acme/setup.py b/acme/setup.py index 160010504..9fca57e01 100644 --- a/acme/setup.py +++ b/acme/setup.py @@ -3,7 +3,7 @@ from setuptools import find_packages from setuptools.command.test import test as TestCommand import sys -version = '0.35.1' +version = '0.36.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-apache/setup.py b/certbot-apache/setup.py index e6317eb73..396f1ccf2 100644 --- a/certbot-apache/setup.py +++ b/certbot-apache/setup.py @@ -4,7 +4,7 @@ from setuptools.command.test import test as TestCommand import sys -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-compatibility-test/setup.py b/certbot-compatibility-test/setup.py index 2300b6208..362043531 100644 --- a/certbot-compatibility-test/setup.py +++ b/certbot-compatibility-test/setup.py @@ -4,7 +4,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' install_requires = [ 'certbot', diff --git a/certbot-dns-cloudflare/setup.py b/certbot-dns-cloudflare/setup.py index 9de84f2df..bd201aca2 100644 --- a/certbot-dns-cloudflare/setup.py +++ b/certbot-dns-cloudflare/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-cloudxns/setup.py b/certbot-dns-cloudxns/setup.py index 3c0df32a4..d8d7aa9b8 100644 --- a/certbot-dns-cloudxns/setup.py +++ b/certbot-dns-cloudxns/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-digitalocean/setup.py b/certbot-dns-digitalocean/setup.py index c597ff2cd..92a9b2b14 100644 --- a/certbot-dns-digitalocean/setup.py +++ b/certbot-dns-digitalocean/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-dnsimple/setup.py b/certbot-dns-dnsimple/setup.py index fec720b07..709ca8330 100644 --- a/certbot-dns-dnsimple/setup.py +++ b/certbot-dns-dnsimple/setup.py @@ -3,7 +3,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-dnsmadeeasy/setup.py b/certbot-dns-dnsmadeeasy/setup.py index 0e3c160c7..1d55b0fe4 100644 --- a/certbot-dns-dnsmadeeasy/setup.py +++ b/certbot-dns-dnsmadeeasy/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-gehirn/setup.py b/certbot-dns-gehirn/setup.py index a3f8be72a..6dac126d0 100644 --- a/certbot-dns-gehirn/setup.py +++ b/certbot-dns-gehirn/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-dns-google/setup.py b/certbot-dns-google/setup.py index 6f9c50825..5c31a81f8 100644 --- a/certbot-dns-google/setup.py +++ b/certbot-dns-google/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-linode/setup.py b/certbot-dns-linode/setup.py index 2a55aa6e9..b70a6a39c 100644 --- a/certbot-dns-linode/setup.py +++ b/certbot-dns-linode/setup.py @@ -1,7 +1,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-dns-luadns/setup.py b/certbot-dns-luadns/setup.py index 8e1231d1d..5f5322319 100644 --- a/certbot-dns-luadns/setup.py +++ b/certbot-dns-luadns/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-nsone/setup.py b/certbot-dns-nsone/setup.py index c63dfa70f..00ed64032 100644 --- a/certbot-dns-nsone/setup.py +++ b/certbot-dns-nsone/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-ovh/setup.py b/certbot-dns-ovh/setup.py index 288772e3e..bff394bf9 100644 --- a/certbot-dns-ovh/setup.py +++ b/certbot-dns-ovh/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-rfc2136/setup.py b/certbot-dns-rfc2136/setup.py index cc406aa1a..25c6ae1d1 100644 --- a/certbot-dns-rfc2136/setup.py +++ b/certbot-dns-rfc2136/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-route53/setup.py b/certbot-dns-route53/setup.py index b7260362c..b8af58b30 100644 --- a/certbot-dns-route53/setup.py +++ b/certbot-dns-route53/setup.py @@ -1,7 +1,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot-dns-sakuracloud/setup.py b/certbot-dns-sakuracloud/setup.py index 689240772..b674b7199 100644 --- a/certbot-dns-sakuracloud/setup.py +++ b/certbot-dns-sakuracloud/setup.py @@ -2,7 +2,7 @@ from setuptools import setup from setuptools import find_packages -version = '0.35.1' +version = '0.36.0.dev0' # Please update tox.ini when modifying dependency version requirements install_requires = [ diff --git a/certbot-nginx/setup.py b/certbot-nginx/setup.py index 2f108ee5f..09a1ab8d5 100644 --- a/certbot-nginx/setup.py +++ b/certbot-nginx/setup.py @@ -4,7 +4,7 @@ from setuptools.command.test import test as TestCommand import sys -version = '0.35.1' +version = '0.36.0.dev0' # Remember to update local-oldest-requirements.txt when changing the minimum # acme/certbot version. diff --git a/certbot/__init__.py b/certbot/__init__.py index 18803420f..32ab75aaa 100644 --- a/certbot/__init__.py +++ b/certbot/__init__.py @@ -1,4 +1,4 @@ """Certbot client.""" # version number like 1.2.3a0, must have at least 2 parts, like 1.2 -__version__ = '0.35.1' +__version__ = '0.36.0.dev0' diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index 756b8e247..24e9b295e 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -31,7 +31,7 @@ if [ -z "$VENV_PATH" ]; then fi VENV_BIN="$VENV_PATH/bin" BOOTSTRAP_VERSION_PATH="$VENV_PATH/certbot-auto-bootstrap-version.txt" -LE_AUTO_VERSION="0.35.1" +LE_AUTO_VERSION="0.36.0.dev0" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates