From 8caa8cd2b541bba1f63c174160c5faad07db1ee3 Mon Sep 17 00:00:00 2001 From: ohemorange Date: Fri, 25 Jan 2019 14:17:08 -0800 Subject: [PATCH] Revert "Release 0.30.2" --- CHANGELOG.md | 15 ++------- certbot-auto | 32 +++++++++---------- docs/cli-help.txt | 15 ++++----- letsencrypt-auto | 32 +++++++++---------- letsencrypt-auto-source/certbot-auto.asc | 16 +++++----- letsencrypt-auto-source/letsencrypt-auto | 24 +++++++------- letsencrypt-auto-source/letsencrypt-auto.sig | 5 ++- .../pieces/certbot-requirements.txt | 24 +++++++------- 8 files changed, 77 insertions(+), 86 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d45af20e8..4f9c0782b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,8 @@ Certbot adheres to [Semantic Versioning](https://semver.org/). * Fixed accessing josepy contents through acme.jose when the full acme.jose path is used. * Clarify behavior for deleting certs as part of revocation. +* Update the version of setuptools pinned in certbot-auto to 40.6.3 to + solve installation problems on newer OSes. 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 @@ -38,19 +40,6 @@ package with changes other than its version number was: More details about these changes can be found on our GitHub repo. -## 0.30.2 - 2019-01-25 - -### Fixed - -* Update the version of setuptools pinned in certbot-auto to 40.6.3 to - solve installation problems on newer OSes. - -Despite us having broken lockstep, we are continuing to release new versions of -all Certbot components during releases for the time being, however, this -release only affects certbot-auto. - -More details about these changes can be found on our GitHub repo. - ## 0.30.1 - 2019-01-24 ### Fixed diff --git a/certbot-auto b/certbot-auto index a79a9c5ae..93bb05419 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.30.2" +LE_AUTO_VERSION="0.30.1" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates @@ -1232,18 +1232,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.30.2 \ - --hash=sha256:e411b72fa86eec1018e6de28e649e8c9c71191a7431dcc77f207b57ca9484c11 \ - --hash=sha256:534487cb552ced8e47948ba3d2e7ca12c3a439133fc609485012b1a02fc7776e -acme==0.30.2 \ - --hash=sha256:68982576492dfa99c7e2be0fce4371adc9344740b05420ce0ab53238d2bb9b3b \ - --hash=sha256:295a5b7fce9f908e6e5cff8c40be1a3daf3e1ebabd2e139a4c87274e68eeb8f2 -certbot-apache==0.30.2 \ - --hash=sha256:3b7fa4e59772da7c9975ef2a49ceff157c9d7cb31eb9475928b5986d89701a3a \ - --hash=sha256:32fa915a8a51810fdfe828ac1361da4425c231d7384891e49e6338e4741464b2 -certbot-nginx==0.30.2 \ - --hash=sha256:7dc785f6f0c0c57b19cea8d98f9ea8feef53945613967b52c9348c81327010e2 \ - --hash=sha256:6ba4dd772d0c7cdfb3383ca325b35639e01ac9e142e4baa6445cd85c7fb59552 +certbot==0.30.1 \ + --hash=sha256:debdf5cfe17d55c124508a5f720e80094b82e87f167fb45cb6fda41482b6bd76 \ + --hash=sha256:39d1a58d3b59c68e57e26bcb1b73078fc227c8944388e61646dd6bbb203618e7 +acme==0.30.1 \ + --hash=sha256:b75705eba723a6082c7bc8e41853407cb1520ce64d11359ba09b269db9356aed \ + --hash=sha256:dc9b99bdbe1582993c96a8145354a61e79470be382d4d875990dd7d41727d3df +certbot-apache==0.30.1 \ + --hash=sha256:18dae95e4785e2acdbe0b8d00db9e83b890ca8145f39092911f8ea9e1b0169b3 \ + --hash=sha256:224cf83aeb85f7ca12ad08ddce020ff04576a692305f12ab1d1e7f21ee527180 +certbot-nginx==0.30.1 \ + --hash=sha256:2360e1e0e5b61c4078eced7889b90b85dc00dbc280461bf4e8fc4c3280bb3e52 \ + --hash=sha256:4e15deba3542fcf5b98d021acfdfdea2ed93db0159824271a49694cc357de7f4 UNLIKELY_EOF # ------------------------------------------------------------------------- @@ -1324,9 +1324,9 @@ PACKAGES = maybe_argparse + [ 'pip-{0}.tar.gz'.format(PIP_VERSION), '09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d'), # This version of setuptools has only optional dependencies: - ('37/1b/b25507861991beeade31473868463dad0e58b1978c209de27384ae541b0b/' - 'setuptools-40.6.3.zip', - '3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8'), + ('59/88/2f3990916931a5de6fa9706d6d75eb32ee8b78627bb2abaab7ed9e6d0622/' + 'setuptools-29.0.1.tar.gz', + 'b539118819a4857378398891fa5366e090690e46b3e41421a1e07d6e9fd8feb0'), ('c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/' 'wheel-0.29.0.tar.gz', '1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648') diff --git a/docs/cli-help.txt b/docs/cli-help.txt index cd6d431b3..77c6dd230 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.30.2 + "". (default: CertbotACMEClient/0.30.1 (certbot(-auto); OS_NAME OS_VERSION) Authenticator/XXX Installer/YYY (SUBCOMMAND; flags: FLAGS) Py/major.minor.patchlevel). The flags encoded in the @@ -479,10 +479,9 @@ apache: Apache Web Server plugin --apache-enmod APACHE_ENMOD - Path to the Apache 'a2enmod' binary (default: a2enmod) + Path to the Apache 'a2enmod' binary (default: None) --apache-dismod APACHE_DISMOD - Path to the Apache 'a2dismod' binary (default: - a2dismod) + Path to the Apache 'a2dismod' binary (default: None) --apache-le-vhost-ext APACHE_LE_VHOST_EXT SSL vhost configuration extension (default: -le- ssl.conf) @@ -496,16 +495,16 @@ apache: /var/log/apache2) --apache-challenge-location APACHE_CHALLENGE_LOCATION Directory path for challenge configuration (default: - /etc/apache2) + /etc/apache2/other) --apache-handle-modules APACHE_HANDLE_MODULES Let installer handle enabling required modules for you - (Only Ubuntu/Debian currently) (default: True) + (Only Ubuntu/Debian currently) (default: False) --apache-handle-sites APACHE_HANDLE_SITES Let installer handle enabling sites for you (Only - Ubuntu/Debian currently) (default: True) + Ubuntu/Debian currently) (default: False) --apache-ctl APACHE_CTL Full path to Apache control script (default: - apache2ctl) + apachectl) dns-cloudflare: Obtain certificates using a DNS TXT record (if you are using Cloudflare diff --git a/letsencrypt-auto b/letsencrypt-auto index a79a9c5ae..93bb05419 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.30.2" +LE_AUTO_VERSION="0.30.1" BASENAME=$(basename $0) USAGE="Usage: $BASENAME [OPTIONS] A self-updating wrapper script for the Certbot ACME client. When run, updates @@ -1232,18 +1232,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.30.2 \ - --hash=sha256:e411b72fa86eec1018e6de28e649e8c9c71191a7431dcc77f207b57ca9484c11 \ - --hash=sha256:534487cb552ced8e47948ba3d2e7ca12c3a439133fc609485012b1a02fc7776e -acme==0.30.2 \ - --hash=sha256:68982576492dfa99c7e2be0fce4371adc9344740b05420ce0ab53238d2bb9b3b \ - --hash=sha256:295a5b7fce9f908e6e5cff8c40be1a3daf3e1ebabd2e139a4c87274e68eeb8f2 -certbot-apache==0.30.2 \ - --hash=sha256:3b7fa4e59772da7c9975ef2a49ceff157c9d7cb31eb9475928b5986d89701a3a \ - --hash=sha256:32fa915a8a51810fdfe828ac1361da4425c231d7384891e49e6338e4741464b2 -certbot-nginx==0.30.2 \ - --hash=sha256:7dc785f6f0c0c57b19cea8d98f9ea8feef53945613967b52c9348c81327010e2 \ - --hash=sha256:6ba4dd772d0c7cdfb3383ca325b35639e01ac9e142e4baa6445cd85c7fb59552 +certbot==0.30.1 \ + --hash=sha256:debdf5cfe17d55c124508a5f720e80094b82e87f167fb45cb6fda41482b6bd76 \ + --hash=sha256:39d1a58d3b59c68e57e26bcb1b73078fc227c8944388e61646dd6bbb203618e7 +acme==0.30.1 \ + --hash=sha256:b75705eba723a6082c7bc8e41853407cb1520ce64d11359ba09b269db9356aed \ + --hash=sha256:dc9b99bdbe1582993c96a8145354a61e79470be382d4d875990dd7d41727d3df +certbot-apache==0.30.1 \ + --hash=sha256:18dae95e4785e2acdbe0b8d00db9e83b890ca8145f39092911f8ea9e1b0169b3 \ + --hash=sha256:224cf83aeb85f7ca12ad08ddce020ff04576a692305f12ab1d1e7f21ee527180 +certbot-nginx==0.30.1 \ + --hash=sha256:2360e1e0e5b61c4078eced7889b90b85dc00dbc280461bf4e8fc4c3280bb3e52 \ + --hash=sha256:4e15deba3542fcf5b98d021acfdfdea2ed93db0159824271a49694cc357de7f4 UNLIKELY_EOF # ------------------------------------------------------------------------- @@ -1324,9 +1324,9 @@ PACKAGES = maybe_argparse + [ 'pip-{0}.tar.gz'.format(PIP_VERSION), '09f243e1a7b461f654c26a725fa373211bb7ff17a9300058b205c61658ca940d'), # This version of setuptools has only optional dependencies: - ('37/1b/b25507861991beeade31473868463dad0e58b1978c209de27384ae541b0b/' - 'setuptools-40.6.3.zip', - '3b474dad69c49f0d2d86696b68105f3a6f195f7ab655af12ef9a9c326d2b08f8'), + ('59/88/2f3990916931a5de6fa9706d6d75eb32ee8b78627bb2abaab7ed9e6d0622/' + 'setuptools-29.0.1.tar.gz', + 'b539118819a4857378398891fa5366e090690e46b3e41421a1e07d6e9fd8feb0'), ('c9/1d/bd19e691fd4cfe908c76c429fe6e4436c9e83583c4414b54f6c85471954a/' 'wheel-0.29.0.tar.gz', '1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648') diff --git a/letsencrypt-auto-source/certbot-auto.asc b/letsencrypt-auto-source/certbot-auto.asc index a60ccd8bb..a5920c7e5 100644 --- a/letsencrypt-auto-source/certbot-auto.asc +++ b/letsencrypt-auto-source/certbot-auto.asc @@ -1,11 +1,11 @@ -----BEGIN PGP SIGNATURE----- -iQEzBAABCAAdFiEEos+1H6J1pyhiNOeyTRfJlc2XdfIFAlxLcw8ACgkQTRfJlc2X -dfK35gf+PoxtrJJIjvybNqd3lb8HOg2ntIVmXcYJGuuUo6m09fzai+XI6cOm5Dpu -l2D5OrbLqmez8tYkCkEWHV0OfwyVWw+m8T3sXlcrv14eA1RfgMnZ+cmmlpDskzHU -EOtaXo1/IkLDwBRrsl8IUbwD2XxbjuLsA2Sevoa59NlfTXJUApfAzohl3epRiJjB -gugdqcsfjRRAqQqOz+iJCKBCWSTIrr/g6Y9aZu9V93t/WDSLRFjehxO1GQrLnCnX -17JGlr0/AXd67jOKS1OWmORPPAFfLIXezUMtgrz5hE7T5UviaUu9ySV8UCxq1N79 -cfSBb/HIUxZ0wf1CkTUMRFQpA7cGtw== -=cNcT +iQEzBAABCAAdFiEEos+1H6J1pyhiNOeyTRfJlc2XdfIFAlxKOFoACgkQTRfJlc2X +dfI/ZAf+NpqBT6ieOTMt+Us/mBou82EEVZ4tEn6W+v5+nRWFv6pDZQof/A2EU+Ti +QwUGc2CGPFhXwMxM5ASMnwJjYZ4fHZLUFTNrVXXV+lKXRXyT1jWH4D1iStCuvH/1 +l/fstEeH1csLH5VxBiMIfuiepowaqLmE6DDCjYdERfPoxS09WJftLzOJolDCpXmj +XX0/EvS9MWfFznBqE23qRjaRNH0A+SVPlLjVffmIwQb2NIonSYinTt/7DnF9kO3J +bSwVdEiLlTQyYgvblriWlsC/E2Tb0oY4exD3qE1WT6IgYaaMj75DMzqJHW1pw0RP +mhC5E2wFsfutkeBgNjFrXiB83X9rcw== +=W4KG -----END PGP SIGNATURE----- diff --git a/letsencrypt-auto-source/letsencrypt-auto b/letsencrypt-auto-source/letsencrypt-auto index 48ddfb570..d07af3d31 100755 --- a/letsencrypt-auto-source/letsencrypt-auto +++ b/letsencrypt-auto-source/letsencrypt-auto @@ -1180,18 +1180,18 @@ letsencrypt==0.7.0 \ --hash=sha256:105a5fb107e45bcd0722eb89696986dcf5f08a86a321d6aef25a0c7c63375ade \ --hash=sha256:c36e532c486a7e92155ee09da54b436a3c420813ec1c590b98f635d924720de9 -certbot==0.30.2 \ - --hash=sha256:e411b72fa86eec1018e6de28e649e8c9c71191a7431dcc77f207b57ca9484c11 \ - --hash=sha256:534487cb552ced8e47948ba3d2e7ca12c3a439133fc609485012b1a02fc7776e -acme==0.30.2 \ - --hash=sha256:68982576492dfa99c7e2be0fce4371adc9344740b05420ce0ab53238d2bb9b3b \ - --hash=sha256:295a5b7fce9f908e6e5cff8c40be1a3daf3e1ebabd2e139a4c87274e68eeb8f2 -certbot-apache==0.30.2 \ - --hash=sha256:3b7fa4e59772da7c9975ef2a49ceff157c9d7cb31eb9475928b5986d89701a3a \ - --hash=sha256:32fa915a8a51810fdfe828ac1361da4425c231d7384891e49e6338e4741464b2 -certbot-nginx==0.30.2 \ - --hash=sha256:7dc785f6f0c0c57b19cea8d98f9ea8feef53945613967b52c9348c81327010e2 \ - --hash=sha256:6ba4dd772d0c7cdfb3383ca325b35639e01ac9e142e4baa6445cd85c7fb59552 +certbot==0.30.1 \ + --hash=sha256:debdf5cfe17d55c124508a5f720e80094b82e87f167fb45cb6fda41482b6bd76 \ + --hash=sha256:39d1a58d3b59c68e57e26bcb1b73078fc227c8944388e61646dd6bbb203618e7 +acme==0.30.1 \ + --hash=sha256:b75705eba723a6082c7bc8e41853407cb1520ce64d11359ba09b269db9356aed \ + --hash=sha256:dc9b99bdbe1582993c96a8145354a61e79470be382d4d875990dd7d41727d3df +certbot-apache==0.30.1 \ + --hash=sha256:18dae95e4785e2acdbe0b8d00db9e83b890ca8145f39092911f8ea9e1b0169b3 \ + --hash=sha256:224cf83aeb85f7ca12ad08ddce020ff04576a692305f12ab1d1e7f21ee527180 +certbot-nginx==0.30.1 \ + --hash=sha256:2360e1e0e5b61c4078eced7889b90b85dc00dbc280461bf4e8fc4c3280bb3e52 \ + --hash=sha256:4e15deba3542fcf5b98d021acfdfdea2ed93db0159824271a49694cc357de7f4 UNLIKELY_EOF # ------------------------------------------------------------------------- diff --git a/letsencrypt-auto-source/letsencrypt-auto.sig b/letsencrypt-auto-source/letsencrypt-auto.sig index f5175187a..4cd20c9c4 100644 --- a/letsencrypt-auto-source/letsencrypt-auto.sig +++ b/letsencrypt-auto-source/letsencrypt-auto.sig @@ -1 +1,4 @@ -^)kAT{`$91`tp ^T%nl/cnjdr=V+~\ ޡQ[ tYni5[N ZA&K(ڴd]L|?;UfRĨxK+nt;ekni,6ROŤPV|;l,W]zպiLgCZQD3 ԟ*ULf_O?_!ȵ6y1o+p \ No newline at end of file +*G7j2x\?VmcPٝgՆ#I&h ug=-V>?YO  +7馻〄X;ke