Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian@packages.debian.org
Usertags: pu
Dear stable release managers,
I'd like to propose the attached dnsruby NMU to fix two bugs:
#908887: include latest DNS trust anchor (KSK-2017)
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908887
#910754: dnsruby: warning: constant ::TimeoutError is deprecated
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=910754
May I go ahead?
Cheers,
-- Santiago
diff -u dnsruby-1.54/debian/changelog dnsruby-1.54/debian/changelog
--- dnsruby-1.54/debian/changelog
+++ dnsruby-1.54/debian/changelog
@@ -1,3 +1,14 @@
+dnsruby (1.54-2+deb9u1) stretch; urgency=medium
+
+ * Non-maintainer upload.
+ * add new root key (KSK-2017).
+upstream commit 55edc31a2150e4617edb6664d440e6141f535e6a
+(Closes: #908887)
+ * ruby 2.3.0 deprecates TimeoutError, use Timeout::Error
+(Closes: #910754)
+
+ -- Santiago Ruano Rincón Wed, 10 Oct 2018 20:16:25
+0200
+
dnsruby (1.54-2) unstable; urgency=medium
* Fix Vcs-Urls to point to anonscm.d.o
only in patch2:
unchanged:
--- dnsruby-1.54.orig/debian/patches/0001-add-new-root-key.patch
+++ dnsruby-1.54/debian/patches/0001-add-new-root-key.patch
@@ -0,0 +1,31 @@
+From 55edc31a2150e4617edb6664d440e6141f535e6a Mon Sep 17 00:00:00 2001
+From: AlexD
+Date: Sun, 15 Jul 2018 14:03:00 +0100
+Subject: [PATCH] add new root key
+
+Closes: #908887
+
+Bug-Debian: https://bugs.debian.org/908887
+Reviewed-by: Santiago R.R.
+
+---
+ lib/dnsruby/dnssec.rb | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/lib/dnsruby/dnssec.rb b/lib/dnsruby/dnssec.rb
+index 4278fbd..a4f927e 100644
+--- a/lib/dnsruby/dnssec.rb
b/lib/dnsruby/dnssec.rb
+@@ -82,6 +82,9 @@ module Dnsruby
+ @@root_key = RR.create(". IN DS 19036 8 2
49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5")
+ @@root_verifier.add_root_ds(@@root_key)
+
++@@root_key_new = RR.create(". IN DS 20326 8 2
E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D")
++@@root_verifier.add_root_ds(@@root_key_new)
++
+ @@dlv_verifier = SingleVerifier.new(SingleVerifier::VerifierType::DLV)
+
+ # @TODO@ Could add a new one of these for each anchor.
+--
+2.19.1
+
only in patch2:
unchanged:
---
dnsruby-1.54.orig/debian/patches/0001-ruby-2.3.0-deprecates-TimeoutError-use-Timeout-Error.patch
+++
dnsruby-1.54/debian/patches/0001-ruby-2.3.0-deprecates-TimeoutError-use-Timeout-Error.patch
@@ -0,0 +1,32 @@
+From d4dca7f58a58f893c84b2263a0591a90b7193053 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Santiago=20Ruano=20Rinc=C3=B3n?=
+Date: Wed, 10 Oct 2018 20:15:46 +0200
+Subject: [PATCH] ruby 2.3.0 deprecates TimeoutError, use Timeout::Error
+
+Backport upstream 31a2a6b4b533f056c6e18ec9439ba0f65bc6b638
+
+Closes: #910754
+
+Bug-Debian: https://bugs.debian.org/910754
+Reviewed-by: Santiago R.R.
+
+---
+ lib/dnsruby.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/dnsruby.rb b/lib/dnsruby.rb
+index 4930706..6b94b9d 100644
+--- a/lib/dnsruby.rb
b/lib/dnsruby.rb
+@@ -410,7 +410,7 @@ module Dnsruby
+ end
+
+ #A timeout error raised while querying for a resource
+- class ResolvTimeout < TimeoutError
++ class ResolvTimeout < Timeout::Error
+ end
+
+ #The requested domain does not exist
+--
+2.19.1
+
only in patch2:
unchanged:
--- dnsruby-1.54.orig/debian/patches/README.md
+++ dnsruby-1.54/debian/patches/README.md
@@ -0,0 +1,3 @@
+As of 1.54-2, dnsruby uses debian packaging format 1.0, so changes are
+applied directly to the source code. The patches found in debian/patches
+have only documentation purposes.
only in patch2:
unchanged:
--- dnsruby-1.54.orig/lib/Dnsruby/dnssec.rb
+++ dnsruby-1.54/lib/Dnsruby/dnssec.rb
@@ -82,6 +82,9 @@
@@root_key = RR.create(". IN DS 19036 8 2
49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5")
@@root_verifier.add_root_ds(@@root_key)
+@@root_key_new = RR.create(". IN DS 20326 8 2
E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D")
+@@root_verifier.add_root_ds(@@root_key_new)
+
@@dlv_verifier = SingleVerifier.new(SingleVerifier::VerifierType::DLV)
# @TODO@ Could add a new one of these for each anchor.
only in patch2:
unchanged:
--- dnsruby-1.54.orig/lib/dnsruby.rb
+++ dnsruby-1.54/lib/dnsruby.rb
@@ -410,7 +410,7 @@
end
#A timeout error raised while querying for a resource
- class ResolvTimeout < TimeoutError
+ class ResolvTimeout < Timeout::Error
end
#The requested domain does not exist
signature.asc
Description: PGP signature
