iana update and gzip compression.

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

diff --git a/Makefile.in b/Makefile.in
index e3a2fd61dba238a420e8f6b7b657c39d12207c15..12da827de4b4a03d3df9ff87db45c9437ad00f05 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -476,8 +476,8 @@ endif
        @echo "You still need to remove "`dirname $(DESTDIR)$(configfile)`" , $(DESTDIR)$(configfile) by hand"
 
 iana_update:
-       curl -o port-numbers.tmp http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml
-       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  
+       curl -o port-numbers.tmp http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xml --compressed
+       if file port-numbers.tmp | grep 'gzip' >/dev/null; then zcat port-numbers.tmp; else cat port-numbers.tmp; fi | 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.

diff --git a/doc/Changelog b/doc/Changelog
index a3917f165685e178a8e5ba493e1e06cc6be65b11..c01a7b19de750e9e971b66620d5a9ec6bc6c5b92 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - lame-ttl and lame-size options no longer exist, it is integrated
          with the host info.  They are ignored (with verbose warning) if
          encountered to keep the config file backwards compatible.
+       - fix iana-update for changing gzip compression of results.
 
 26 October 2011: Wouter
        - iana portlist updated.