- iana ports fetched via https.

- iana portlist updated.

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

diff --git a/Makefile.in b/Makefile.in
index ff46581eb6d857637fda56fd6fe36dc67b4301ec..bcead2088927840b540bec40174e0ccd1bc72b0f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -552,7 +552,7 @@ uninstall:  $(PYTHONMOD_UNINSTALL) $(PYUNBOUND_UNINSTALL) $(UNBOUND_EVENT_UNINSTA
        @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 --compressed
+       curl -o port-numbers.tmp https://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
 

diff --git a/doc/Changelog b/doc/Changelog
index dba0888f97dbf2dac9f828500477d521b6ae48ee..0b06707ba5a314aba4110a42735ba6a88cc008c2 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,5 +1,7 @@
 07 March 2016: Wouter
        - Fix #747: assert in outnet_serviced_query_stop.
+       - iana ports fetched via https.
+       - iana portlist update.
 
 03 March 2016: Wouter
        - configure tests for the weak attribute support by the compiler.

diff --git a/util/iana_ports.inc b/util/iana_ports.inc
index 807f94848177b069c5c6f9527b31a8325a296d00..98c843f45eef91c7c6b0052893bd4566671b20a9 100644 (file)
--- a/util/iana_ports.inc
+++ b/util/iana_ports.inc
@@ -3904,6 +3904,7 @@
 4599,
 4600,
 4601,
+4621,
 4658,
 4659,
 4660,