rediffed patches

diff --git a/unbound-default_trust_anchor.patch b/unbound-default_trust_anchor.patch
index 7ffede3678da10fad8a4106dd477ad63e5143213..cd8603c9d41b8ca2195f4121c5d3db706e4c1a56 100644 (file)
--- a/unbound-default_trust_anchor.patch
+++ b/unbound-default_trust_anchor.patch
@@ -8,5 +8,5 @@ diff -dur unbound-1.4.22.orig/doc/example.conf.in unbound-1.4.22/doc/example.con
 -      # auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
 +      auto-trust-anchor-file: "@UNBOUND_ROOTKEY_FILE@"
  
-       # File with DLV trusted keys. Same format as trust-anchor-file.
-       # There can be only one DLV configured, it is trusted from root down.
+       # trust anchor signaling sends a RFC8145 key tag query after priming.
+       # trust-anchor-signaling: yes

diff --git a/unbound-sh.patch b/unbound-sh.patch
index b9bf9e6d7efd1284521b9ddcf1b5e48c41bed031..2dac974536d35cb7d5f04da1a14cec501f04de7c 100644 (file)
--- a/unbound-sh.patch
+++ b/unbound-sh.patch
@@ -1,7 +1,7 @@
 --- unbound-1.5.6/configure.ac.orig    2015-10-06 12:29:20.000000000 +0200
 +++ unbound-1.5.6/configure.ac 2015-11-02 16:42:08.808434766 +0100
 @@ -479,7 +479,7 @@
-               AC_ERROR([Python version >= 2.4.0 is required])
+               AC_MSG_ERROR([Python version >= 2.4.0 is required])
        fi
  
 -      [PY_MAJOR_VERSION="`$PYTHON -c \"import sys; print(sys.version_info[0])\"`"]