From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 26 Oct 2011 16:00:58 +0000 (+0000)
Subject: fix iana update check for gzipped file.
X-Git-Tag: release-1.4.14rc1~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b47af529e4b3413c27666a8ac50fb5cce52499c;p=thirdparty%2Funbound.git

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 c0042b350..e3a2fd61d 100644
--- 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 e0bc1142d..da80c6a47 100644
--- 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