On Wed, Feb 08, 2017 at 07:00:03PM +0100, Mattia Rizzolo wrote:
> Package: release.debian.org
> User: release.debian.org@packages.debian.org
> Usertags: unblock
>
> Please unblock package dehydrated
>
>
> This is a very small Debian revision, the most relevant fix being typos,
> with the aim of releasing with the best user-visible strings.
> Another thing that might be relevant for some, this revision uploads
> the detached signature from upstream of the upstream tarball (he
> post-signed it).
>
> You can find attached a debdiff against testing.
Joking, it's in this email instead :)
> unblock dehydrated/0.3.1-3
--
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 | 11
config.sh | 2
patches/Support-both-config.sh-and-config-as-config-filenames-for.patch | 2
patches/Update-the-location-of-WELLKNOWN-in-the-notice-message-of.patch | 16 +
patches/honor-config-if-the-user-provided-one-to-letsencrypt.sh-w.patch | 2
upstream/signing-key.asc | 114 ++++++++++
watch | 6
7 files changed, 144 insertions(+), 9 deletions(-)
diff -Nru dehydrated-0.3.1/debian/changelog dehydrated-0.3.1/debian/changelog
--- dehydrated-0.3.1/debian/changelog 2017-01-12 21:48:48.000000000 +0100
+++ dehydrated-0.3.1/debian/changelog 2017-02-08 18:45:09.000000000 +0100
@@ -1,3 +1,14 @@
+dehydrated (0.3.1-3) unstable; urgency=medium
+
+ * Fix typo s/know/now/ in letsencrypt.sh wrapper.
+ Thanks to jcristau for spotting.
+ * Verify the upstream tarball signature.
+ Thanks to Georg Faerber <georg@riseup.net> for prodding upstream and
+ providing the patch. Closes: #853068
+ * Fix path to the configuration example in the main config. Closes: #854328
+
+ -- Mattia Rizzolo <mattia@debian.org> Wed, 08 Feb 2017 18:45:09 +0100
+
dehydrated (0.3.1-2) unstable; urgency=medium
[ Jan Wagner ]
diff -Nru dehydrated-0.3.1/debian/config.sh dehydrated-0.3.1/debian/config.sh
--- dehydrated-0.3.1/debian/config.sh 2017-01-12 18:26:11.000000000 +0100
+++ dehydrated-0.3.1/debian/config.sh 2017-02-08 18:44:07.000000000 +0100
@@ -3,7 +3,7 @@
# #
# This is the default configuration for the Debian package. #
# To see a more comprehensive example, see #
-# /usr/share/doc/dehydrated/examples/config.example #
+# /usr/share/doc/dehydrated/examples/config #
# #
# For details please read: #
# /usr/share/doc/dehydrated/README.Debian #
diff -Nru dehydrated-0.3.1/debian/patches/honor-config-if-the-user-provided-one-to-letsencrypt.sh-w.patch dehydrated-0.3.1/debian/patches/honor-config-if-the-user-provided-one-to-letsencrypt.sh-w.patch
--- dehydrated-0.3.1/debian/patches/honor-config-if-the-user-provided-one-to-letsencrypt.sh-w.patch 2017-01-12 18:19:19.000000000 +0100
+++ dehydrated-0.3.1/debian/patches/honor-config-if-the-user-provided-one-to-letsencrypt.sh-w.patch 2017-02-08 18:44:07.000000000 +0100
@@ -7,7 +7,7 @@
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/letsencrypt.sh b/letsencrypt.sh
-index 20021a8..1e73414 100755
+index 98dabf0..0ceeda9 100755
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -23,12 +23,11 @@ sleep 10
diff -Nru dehydrated-0.3.1/debian/patches/Support-both-config.sh-and-config-as-config-filenames-for.patch dehydrated-0.3.1/debian/patches/Support-both-config.sh-and-config-as-config-filenames-for.patch
--- dehydrated-0.3.1/debian/patches/Support-both-config.sh-and-config-as-config-filenames-for.patch 2017-01-12 18:19:19.000000000 +0100
+++ dehydrated-0.3.1/debian/patches/Support-both-config.sh-and-config-as-config-filenames-for.patch 2017-02-08 18:44:07.000000000 +0100
@@ -8,7 +8,7 @@
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/letsencrypt.sh b/letsencrypt.sh
-index 1e73414..4bf580c 100755
+index 0ceeda9..44bc9d8 100755
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
@@ -39,10 +39,12 @@ set -- "${tmpargs[@]}"
diff -Nru dehydrated-0.3.1/debian/patches/Update-the-location-of-WELLKNOWN-in-the-notice-message-of.patch dehydrated-0.3.1/debian/patches/Update-the-location-of-WELLKNOWN-in-the-notice-message-of.patch
--- dehydrated-0.3.1/debian/patches/Update-the-location-of-WELLKNOWN-in-the-notice-message-of.patch 2017-01-12 18:19:19.000000000 +0100
+++ dehydrated-0.3.1/debian/patches/Update-the-location-of-WELLKNOWN-in-the-notice-message-of.patch 2017-02-08 18:44:07.000000000 +0100
@@ -3,16 +3,24 @@
Subject: Update the location of WELLKNOWN in the notice message of
letsencrypt.sh
++ fix typo s/know/now/
+
Forwarded: not-needed
---
- letsencrypt.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ letsencrypt.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/letsencrypt.sh b/letsencrypt.sh
-index 3e66307..20021a8 100755
+index 3e66307..98dabf0 100755
--- a/letsencrypt.sh
+++ b/letsencrypt.sh
-@@ -10,7 +10,7 @@ Due to trademark violation letsencrypt.sh had to be renamed and is know called d
+@@ -5,12 +5,12 @@ cat >&2 << EOF
+ !! letsencrypt.sh has been renamed to dehydrated !!
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+-Due to trademark violation letsencrypt.sh had to be renamed and is know called dehydrated.
++Due to trademark violation letsencrypt.sh had to be renamed and is now called dehydrated.
+
To make a clean cut dehydrated doesn't use the old config locations /etc/letsencrypt.sh and
/usr/local/etc/letsencrypt.sh anymore, also the script file has been renamed.
diff -Nru dehydrated-0.3.1/debian/upstream/signing-key.asc dehydrated-0.3.1/debian/upstream/signing-key.asc
--- dehydrated-0.3.1/debian/upstream/signing-key.asc 1970-01-01 01:00:00.000000000 +0100
+++ dehydrated-0.3.1/debian/upstream/signing-key.asc 2017-02-08 18:45:09.000000000 +0100
@@ -0,0 +1,114 @@
+pub rsa2048 2013-04-05 [SC]
+ 3C2F 2605 E078 A1E1 8F47 9390 9C4D BE6C F438 F333
+uid [ unknown] Lukas Schauer <lukas@schauer.so>
+uid [ unknown] Lukas Schauer <lukas2511@xxpro.net>
+uid [ unknown] [jpeg image of size 2989]
+sub rsa2048 2013-04-05 [E]
+
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mQENBFFfGhMBCADuxAL1vqC7J1AmxMrFGxobyPaY9tmUEueRF+JuUJlk48qSbcWg
+zAMEprSgw3HY/15Galu/7g8KxXnlN4WO2vgA6eu1CYx3CoukJ8dc/m6hEMxqwsIW
+H/1sI7P2hLGB/6YC3MqgpyZxrXzS3coe/JLLkeOtcnBgeT1VpGnodSEKsK4unkfV
+cmheLuF+zMb0t1DFtd//Ka99XtoF7HXW6p/n8NjiAXKkEkTWf+0qsOIzar3Hl7QE
+dnEMK1EjDbrqNufTe+TyvM9hVMyDTptvA0EDOj+5Jmt29pWpriOgUgm2D1JgZi9b
+YmGnTo149q5bUzfLvsTDI0IS7ClxXIES/dfXABEBAAG0IEx1a2FzIFNjaGF1ZXIg
+PGx1a2FzQHNjaGF1ZXIuc28+iQE5BBMBAgAjBQJSHiDfAhsDBwsJCAcDAgEGFQgC
+CQoLBBYCAwECHgECF4AACgkQnE2+bPQ48zPRxgf/Y1pJ9H6uB6rmCa3VHoxhvLkV
+ruUSpI+JXNUhwpUWUKNE1yk78jmjRhMMZf7UMYifyGkuK/0/cErktr5j8kqJ2r60
+hOnmkC3jEq5H0hKfGzhosenUvzR9cENYzgnm/4BNWWz1I16jkWRcEGjeC8y033U3
+Tjrtc6f0jLe7R6LzospUCWKzp8WUWgTgqpAyjJY6I44Y6QpTjmRF6t1Nz2yRxxf2
+NAbOQWkSTueusgLVYyvqLZ51u3fsuDJxbQiBnNt0ZGYSDBKrs59Rvg0Xj1cBv1t7
+SrzHuwyiiCQsEaLMvYCygk7qRmZBZ6PKA0gE8oYIr5f10Kx0Mjqnrs8wmpegiLQj
+THVrYXMgU2NoYXVlciA8bHVrYXMyNTExQHh4cHJvLm5ldD6JATgEEwECACIFAlFf
+GhMCGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEJxNvmz0OPMzHXoH/jCy
+wwo+W3hy7WAzaKqgnIjRfMQD63OFSwrPI8P7mU0WWrxURwET4C/i+eYHIZYPVaP0
+HvdMMcpgSbBZ0sAW+gtv2qMtL+kB4s+FGVchV4lfh4q5w4EDRknuCEpD5bj7NsOT
+ROvGu0gSvGbGG/EFLJuhrkct5s7ESH5sWonxstk6Ea9L5STR4PGH6swTq0WggbMq
+VFQuWOkjw6KpQOeFTp9koQl3R6P6I0uqe6tVLKJD/nSTKbMYPMZX9Q+TvzqRSRlH
+wL509ZIZV4IzdDFXGM28xvC7KIifbxEzWHVci2afdqbVNH2MBhgHt/SIaW8xBab2
+wnd45rkdHuoK2wBPlPvRywDK/gEQAAEBAAAAAAAAAAAAAAAA/9j/4AAQSkZJRgAB
+AQAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwg
+JC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwh
+MjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
+MjL/wAARCACHAIcDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQF
+BgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKB
+kaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW
+V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKz
+tLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QA
+HwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQA
+AQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcY
+GRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
+hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX
+2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDiVPPWng5quGBqQNik
+QWA1PBquG96kVqQ0ThqkBqsGrM1TXorEGOP55vTsPrQM3GmjjXc7BQOpJrOn8Tad
+bkgSFyP7grg7rULi6dmklY5OcZ4qqXJFHKB3h8a2mfkgkIHqQKnt/GdhIwWSOWP3
+4IrzsMRxSlielHKhnsNpqFveRiSCVXHsatK+a8cgu5oSDHKyMOhBxXYaL4t3IIr8
+4xx5o/rUuIHbBqfuqjBdRTxh4nDqehBqcSVIFgNTg/vVXzKUPmgC1u5oquHNFO4H
+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
+TPRv64fKcA0JFBQYoiA=
+=p5IV
+-----END PGP PUBLIC KEY BLOCK-----
diff -Nru dehydrated-0.3.1/debian/watch dehydrated-0.3.1/debian/watch
--- dehydrated-0.3.1/debian/watch 2017-01-02 17:16:15.000000000 +0100
+++ dehydrated-0.3.1/debian/watch 2017-02-08 18:44:07.000000000 +0100
@@ -1,3 +1,5 @@
version=4
-opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/@PACKAGE@-$1\.tar\.gz/ \
- https://github.com/lukas2511/@PACKAGE@/tags .*/v?(\d\S*)\.tar\.gz
+opts="\
+pgpsigurlmangle=s/archive\/v(.+)\.tar\.gz/releases\/download\/v$1\/@PACKAGE@-$1\.tar\.gz\.asc/\
+" \
+https://github.com/lukas2511/@PACKAGE@/releases/ /lukas2511/@PACKAGE@/archive/v(.+).tar.gz
Attachment:
signature.asc
Description: PGP signature