fix iana update check for gzipped file.

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

diff --git a/Makefile.in b/Makefile.in
index c0042b3504b45ccba6052a6d19e676c1f5b5e16f..e3a2fd61dba238a420e8f6b7b657c39d12207c15 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -477,8 +477,8 @@ endif
 
 iana_update:
        curl -o port-numbers.tmp http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml
-       awk '/<record>/ {p=0;} /<protocol>udp/ {p=1;} /<protocol>[^u]/ {p=0;} /Decomissioned|Decommissioned|Removed|De-registered|unassigned|Unassigned|Reserved/ {u=1;} /<number>/ { if(u==1) {u=0;} else { if(p==1) { match($$0,/[0-9]+/); print substr($$0, RSTART, RLENGTH) ","}}}' port-numbers.tmp | sort -nu > util/iana_ports.inc  
-       rm -f port-numbers.tmp portslist.tmp
+       zcat port-numbers.tmp | awk '/<record>/ {p=0;} /<protocol>udp/ {p=1;} /<protocol>[^u]/ {p=0;} /Decomissioned|Decommissioned|Removed|De-registered|unassigned|Unassigned|Reserved/ {u=1;} /<number>/ { if(u==1) {u=0;} else { if(p==1) { match($$0,/[0-9]+/); print substr($$0, RSTART, RLENGTH) ","}}}' | sort -nu > util/iana_ports.inc  
+       rm -f port-numbers.tmp
 
 # Automatic dependencies.
 $(BUILD)%.d: $(srcdir)/%.c

diff --git a/doc/Changelog b/doc/Changelog
index e0bc1142d248b65bd18bf8b40c8a14879bbd2deb..da80c6a47a9f374700fbe304c5a0dad5278aee4a 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,7 @@
 26 October 2011: Wouter
        - iana portlist updated.
        - Infra cache stores information about ping and lameness per IP, zone.
+       - fix iana_update target for gzipped file on iana site.
 
 24 October 2011: Wouter
        - Fix resolve of partners.extranet.microsoft.com with a fix for the