From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Tue, 21 Oct 2008 09:02:34 +0000 (+0000)
Subject: fixup update anchors to sort keys.
X-Git-Tag: release-1.1.0~36
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64959c809781ed3f38448f7256cb0ac60cca77e5;p=thirdparty%2Funbound.git

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 ba001c0ca..2b2bb9cc0 100755
--- 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 f836dc35b..5fed53902 100644
--- 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.