fixup update anchors to sort keys.

git-svn-id: file:///svn/unbound/trunk@1315 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/contrib/update-anchor.sh b/contrib/update-anchor.sh
index ba001c0caa4306f5e2d3ea9a8c05a36a06bbb63c..2b2bb9cc093e6b47d155625eb7e30b298dbf3176 100755 (executable)
--- a/contrib/update-anchor.sh
+++ b/contrib/update-anchor.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # update-anchor.sh, update a trust anchor.
-# this file is BSD licensed.
+# Copyright 2008, W.C.A. Wijngaards
+# This file is BSD licensed, see doc/LICENSE.
 
 # which validating lookup to use.
 ubhost=unbound-host
@@ -77,13 +78,13 @@ do_update ( ) {
                        grep ' has DNSKEY record 257' | \
                        sed -e 's/ (secure)$/";/' | \
                        sed -e 's/ has DNSKEY record \([0-9]*\) \([0-9]*\) \([0-9]*\) /. \1 \2 \3 "/' | \
-                       sed -e 's/^\.\././' >> "$tmp2"
+                       sed -e 's/^\.\././' | sort >> "$tmp2"
                else
                        # store all keys in the anchor file
                        grep '(secure)$' $tmpfile | \
                        sed -e 's/ (secure)$/";/' | \
                        sed -e 's/ has DNSKEY record \([0-9]*\) \([0-9]*\) \([0-9]*\) /. \1 \2 \3 "/' | \
-                       sed -e 's/^\.\././' >> "$tmp2"
+                       sed -e 's/^\.\././' | sort >> "$tmp2"
                fi
                echo '};' >> "$tmp2"
        else #not bindformat
@@ -94,13 +95,13 @@ do_update ( ) {
                        grep ' has DNSKEY record 257' | \
                        sed -e 's/ (secure)$//' | \
                        sed -e 's/ has DNSKEY record /. IN DNSKEY /' | \
-                       sed -e 's/^\.\././' > "$tmp2"
+                       sed -e 's/^\.\././' | sort > "$tmp2"
                else
                        # store all keys in the anchor file
                        grep '(secure)$' $tmpfile | \
                        sed -e 's/ (secure)$//' | \
                        sed -e 's/ has DNSKEY record /. IN DNSKEY /' | \
-                       sed -e 's/^\.\././' > "$tmp2"
+                       sed -e 's/^\.\././' | sort > "$tmp2"
                fi
        fi # endif-bindformat
 

diff --git a/doc/Changelog b/doc/Changelog
index f836dc35baa91c411b7a8a9eee0e15a2fe8c54ff..5fed53902d97f6d6c7708a4e4df2c73e53c2aafe 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+21 October 2008: Wouter
+       - fix update-anchors.sh, so it does not report different RR order
+         as an update.  Sorts the keys in the file.  Updated copyright.
+
 20 October 2008: Wouter
        - quench a log message that is debug only.
        - iana portlist updated.