]>
Commit | Line | Data |
---|---|---|
57acc7b1 JB |
1 | --- setup-2.4.11/iana-etc-2.20/services.gawk.orig 2006-11-14 21:26:22.000000000 +0100 |
2 | +++ setup-2.4.11/iana-etc-2.20/services.gawk 2007-11-25 17:06:06.113293195 +0100 | |
3 | @@ -16,7 +16,7 @@ | |
4 | while (getline <"port-aliases") { | |
5 | sub(/#.*/, "") | |
6 | if (/^[ \t]*$/) { continue } | |
7 | - alias_list[$1] = substr($0, index($0, $2)) | |
8 | + alias_list[$1] = substr($0, index(substr($0, length($1)), $2)+length($1)-1) | |
9 | } | |
10 | } | |
11 | function aliases(n) { | |
12 | @@ -43,6 +43,8 @@ | |
13 | if (length(protocols[0]) == 0) { | |
14 | protocols[0] = "/tcp" | |
15 | protocols[1] = "/udp" | |
16 | + } else if (1 in protocols) { | |
17 | + delete protocols[1] | |
18 | } | |
19 | for (i = start; i <= end; i++) { | |
20 | for (p in protocols) { | |
21 | --- setup-2.4.11/iana-etc-2.20/Makefile.orig 2006-11-14 18:53:41.000000000 +0100 | |
22 | +++ setup-2.4.11/iana-etc-2.20/Makefile 2007-11-25 15:16:05.825164209 +0100 | |
23 | @@ -65,10 +65,10 @@ | |
24 | ||
25 | protocols: protocol-numbers protocols.gawk | |
26 | $(AWK) --re-interval -f protocols.gawk -v strip=$(STRIP) \ | |
27 | - protocol-numbers > protocols | |
28 | + protocol-numbers | unexpand -a > protocols | |
29 | ||
30 | services: port-numbers services.gawk | |
31 | - $(AWK) -f services.gawk -v strip=$(STRIP) port-numbers > services | |
32 | + $(AWK) -f services.gawk -v strip=$(STRIP) port-numbers | unexpand -a > services | |
33 | ||
34 | dist: clean | |
35 | rm -vrf ../iana-etc-`cat VERSION` | |
36 | --- setup-2.4.11/iana-etc-2.20/port-aliases.orig 2006-11-14 17:01:10.000000000 +0100 | |
37 | +++ setup-2.4.11/iana-etc-2.20/port-aliases 2007-11-25 15:59:09.044373483 +0100 | |
38 | @@ -12,3 +12,44 @@ | |
39 | ||
40 | nicname whois | |
41 | ||
42 | +# PLD additions | |
43 | +discard sink null | |
44 | +systat users | |
45 | +qotd quote | |
46 | +chargen ttytst source | |
47 | +smtp mail | |
48 | +time timserver | |
49 | +rlp resource | |
50 | +name nameserver | |
51 | +http www www-http | |
52 | +kerberos krb5 kerberos5 | |
53 | +hostname hostnames | |
54 | +iso-tsap tsap | |
55 | +cso csnet-ns cso-ns | |
56 | +pop2 postoffice pop pop-2 | |
57 | +pop3 pop-3 | |
58 | +sunrpc portmapper | |
59 | +auth tap | |
60 | +nntp untp | |
61 | +imap imap2 | |
62 | +snmptrap snmp-trap | |
63 | +z39.50 z3950 wais | |
64 | +biff comsat | |
65 | +who whod | |
66 | +shell cmd | |
67 | +printer spooler | |
68 | +utime unixtime | |
69 | +router route routed | |
70 | +courier rpc | |
71 | +conference chat | |
72 | +netnews readnews | |
73 | +uucp uucpd | |
74 | +kshell krcmd | |
75 | +new-rwho new-who | |
76 | +rmonitor rmonitord | |
77 | +nntps snntp | |
78 | +kerberos-iv kerberos4 | |
79 | +telnets stelnet | |
80 | +postgresql postgres | |
81 | +jms irrd | |
82 | +sane-port sane |