From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 17 Aug 2011 15:12:39 +0000 (+0000)
Subject: iana portlist updated.
X-Git-Tag: release-1.4.13rc1~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=09375e16e7797391c49dd5d018d98e4332266899;p=thirdparty%2Funbound.git

iana portlist updated.
new xml format at iana.


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

diff --git a/Makefile.in b/Makefile.in
index 28377bbed..c0042b350 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -476,9 +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/port-numbers
-	awk '/Unassigned|Reserved/ {next;} { match($$0, "[0-9]+/udp"); if (RLENGTH > 0) print substr($$0, RSTART, RLENGTH - 4) ","}' port-numbers.tmp | sort -nu > portslist.tmp
-	cat portslist.tmp > util/iana_ports.inc
+	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
 
 # Automatic dependencies.
diff --git a/doc/Changelog b/doc/Changelog
index 27d32d4f1..0a61362fa 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 17 August 2011: Wouter
 	- Fix validation of . DS query.
+	- new xml format at IANA, new awk for iana_update.
+	- iana portlist updated.
 
 10 August 2011: Wouter
 	- Fix python site-packages path to /usr/lib64.
diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index 94e259932..7a1e6f69e 100644
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -680,7 +680,6 @@
 991,
 992,
 993,
-994,
 995,
 996,
 997,
@@ -2329,7 +2328,6 @@
 2690,
 2691,
 2692,
-2693,
 2694,
 2695,
 2696,
@@ -2538,7 +2536,6 @@
 2902,
 2903,
 2904,
-2905,
 2906,
 2907,
 2908,
@@ -4332,7 +4329,7 @@
 5991,
 5992,
 5999,
-6063,
+6000,
 6064,
 6065,
 6066,
@@ -4463,7 +4460,6 @@
 6627,
 6628,
 6657,
-6669,
 6670,
 6671,
 6672,
@@ -4471,7 +4467,7 @@
 6678,
 6679,
 6689,
-6697,
+6696,
 6701,
 6702,
 6703,
@@ -4609,7 +4605,6 @@
 7570,
 7588,
 7624,
-7626,
 7627,
 7628,
 7629,