Package: release.debian.org Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hello, I'd like to fix https://bugs.debian.org/881974 (dehydrated using the old license agreement URL by default) in stretch. The issue does not concern buster, as in that version dehydrated is able to retrieve the correct URL dinamically. See attached a patch for the stretch version, also built and tested on stretch. TIA. -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. more about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for dehydrated-0.3.1 dehydrated-0.3.1
changelog | 6 +
gbp.conf | 2
patches/Update-the-default-License-Subscriber-Agreement-URL.patch | 39 ++++++++++
patches/series | 1
4 files changed, 47 insertions(+), 1 deletion(-)
diff -Nru dehydrated-0.3.1/debian/changelog dehydrated-0.3.1/debian/changelog
--- dehydrated-0.3.1/debian/changelog 2017-02-08 18:45:09.000000000 +0100
+++ dehydrated-0.3.1/debian/changelog 2017-11-18 14:00:07.000000000 +0100
@@ -1,3 +1,9 @@
+dehydrated (0.3.1-3+deb9u1) stretch; urgency=medium
+
+ * Update the default License Subscriber Agreement URL. Closes: #881974
+
+ -- Mattia Rizzolo <mat...@debian.org> Sat, 18 Nov 2017 14:00:07 +0100
+
dehydrated (0.3.1-3) unstable; urgency=medium
* Fix typo s/know/now/ in letsencrypt.sh wrapper.
diff -Nru dehydrated-0.3.1/debian/gbp.conf dehydrated-0.3.1/debian/gbp.conf
--- dehydrated-0.3.1/debian/gbp.conf 2017-02-08 18:44:07.000000000 +0100
+++ dehydrated-0.3.1/debian/gbp.conf 2017-11-18 14:00:07.000000000 +0100
@@ -1,6 +1,6 @@
[DEFAULT]
upstream-branch = upstream/master
-debian-branch = debian/master
+debian-branch = debian/stretch
upstream-tag = v%(version)s
pristine-tar = True
pristine-tar-commit = True
diff -Nru dehydrated-0.3.1/debian/patches/series dehydrated-0.3.1/debian/patches/series
--- dehydrated-0.3.1/debian/patches/series 2017-02-08 18:44:07.000000000 +0100
+++ dehydrated-0.3.1/debian/patches/series 2017-11-18 14:00:07.000000000 +0100
@@ -4,3 +4,4 @@
Update-the-location-of-WELLKNOWN-in-the-notice-message-of.patch
honor-config-if-the-user-provided-one-to-letsencrypt.sh-w.patch
Support-both-config.sh-and-config-as-config-filenames-for.patch
+Update-the-default-License-Subscriber-Agreement-URL.patch
diff -Nru dehydrated-0.3.1/debian/patches/Update-the-default-License-Subscriber-Agreement-URL.patch dehydrated-0.3.1/debian/patches/Update-the-default-License-Subscriber-Agreement-URL.patch
--- dehydrated-0.3.1/debian/patches/Update-the-default-License-Subscriber-Agreement-URL.patch 1970-01-01 01:00:00.000000000 +0100
+++ dehydrated-0.3.1/debian/patches/Update-the-default-License-Subscriber-Agreement-URL.patch 2017-11-18 14:00:07.000000000 +0100
@@ -0,0 +1,39 @@
+From: Mattia Rizzolo <mat...@debian.org>
+Date: Sat, 18 Nov 2017 13:54:41 +0100
+Subject: Update the default License Subscriber Agreement URL
+
+Closes: #881974
+Signed-off-by: Mattia Rizzolo <mat...@debian.org>
+---
+ dehydrated | 2 +-
+ docs/examples/config | 4 ++--
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/dehydrated b/dehydrated
+index 7b88ae9..882c6bd 100755
+--- a/dehydrated
++++ b/dehydrated
+@@ -105,7 +105,7 @@ load_config() {
+
+ # Default values
+ CA="https://acme-v01.api.letsencrypt.org/directory";
+- LICENSE="https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf";
++ LICENSE="https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf";
+ CERTDIR=
+ ACCOUNTDIR=
+ CHALLENGETYPE="http-01"
+diff --git a/docs/examples/config b/docs/examples/config
+index 17621d2..d28214b 100644
+--- a/docs/examples/config
++++ b/docs/examples/config
+@@ -18,8 +18,8 @@
+ # Path to certificate authority (default: https://acme-v01.api.letsencrypt.org/directory)
+ #CA="https://acme-v01.api.letsencrypt.org/directory";
+
+-# Path to license agreement (default: https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf)
+-#LICENSE="https://letsencrypt.org/documents/LE-SA-v1.1.1-August-1-2016.pdf";
++# Path to license agreement (default: https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf)
++#LICENSE="https://letsencrypt.org/documents/LE-SA-v1.2-November-15-2017.pdf";
+
+ # Which challenge should be used? Currently http-01 and dns-01 are supported
+ #CHALLENGETYPE="http-01"
signature.asc
Description: PGP signature
