Makefile: Only include one copy of the old signatures.

[dnserr] / Makefile

diff --git a/Makefile b/Makefile
index 81b88c1861493f34c18bc8aa9f1b42ea8a2e60ca..d1c66539ecea9031d9012e97ad09f5c56df9c3f7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 BASE                    = distorted.org.uk
 ZONE                    = dnserr.$(BASE)
 
-KEYGEN                  = dnssec-keygen -aRSASHA256 -b1024 -Kkey/
+KEYGEN                  = dnssec-keygen -aRSASHA256 -b1024 -r/dev/urandom -Kkey/
 SIGNZONE                = dnssec-signzone -S -Kkey/ -dds/
 SIGVALID                = -s20000101000000 -e20300101000000
 SIGOLD                  = -s20000101000000 -e20010101000000
@@ -64,9 +64,13 @@ CLEAN                        += t.oldsig
 dnserr.zone.sig: dnserr.zone.sigold dnserr.zone.signew
        awk '$(OLDSIGMATCH) { print; }' \
                dnserr.zone.sigold >t.oldsig
-       awk '$(OLDSIGMATCH) { system("cat t.oldsig"); next; } \
+       awk '$(OLDSIGMATCH) { \
+               if (!doneoldsig) { system("cat t.oldsig"); doneoldsig = 1; } \
+               next; \
+            } \
                { gsub(/invalid-rrsigx/, "invalid-rrsig"); print; }' \
-       dnserr.zone.signew >$@.new
+               dnserr.zone.signew >$@.new
+       rm t.oldsig
        mv $@.new $@
 
 CLEAN                  += $(TARGETS)