Mon Nov 28 02:15:03 2022 UTC ()
update reference link to point to IANA

This whole package should probably be updated to source data directly from
IANA, but for now just update the previously dead link to refer people to
IANA's source of truth.

Bump pkgrevision.


(jschauma)
diff -r1.7 -r1.8 pkgsrc/net/iana-etc/Makefile
diff -r1.7 -r1.8 pkgsrc/net/iana-etc/distinfo
diff -r0 -r1.1 pkgsrc/net/iana-etc/patches/patch-protocols.gawk
diff -r1.2 -r1.3 pkgsrc/net/iana-etc/patches/patch-services.gawk
cvs diff -r1.7 -r1.8 pkgsrc/net/iana-etc/Makefile (expand / switch to unified diff)

--- pkgsrc/net/iana-etc/Makefile 2019/06/15 15:18:22 1.7
+++ pkgsrc/net/iana-etc/Makefile 2022/11/28 02:15:03 1.8
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.7 2019/06/15 15:18:22 christos Exp $ 1# $NetBSD: Makefile,v 1.8 2022/11/28 02:15:03 jschauma Exp $
2# 2#
3 3
4DISTNAME= iana-etc-2.30 4DISTNAME= iana-etc-2.30
5PKGREVISION= 1 5PKGREVISION= 2
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= http://sethwklein.net/ 7MASTER_SITES= http://sethwklein.net/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= christos@NetBSD.org 10MAINTAINER= christos@NetBSD.org
11HOMEPAGE= http://sethwklein.net/ 11HOMEPAGE= http://sethwklein.net/
12COMMENT= Tools to process the IANA source files into services and protocols 12COMMENT= Tools to process the IANA source files into services and protocols
13LICENSE= osl 13LICENSE= osl
14 14
15USE_TOOLS+= gmake gawk 15USE_TOOLS+= gmake gawk
16 16
17# does not install files, so don't bother bulk building it 17# does not install files, so don't bother bulk building it
18NOT_FOR_BULK_PLATFORM= *-*-* 18NOT_FOR_BULK_PLATFORM= *-*-*
cvs diff -r1.7 -r1.8 pkgsrc/net/iana-etc/distinfo (expand / switch to unified diff)

--- pkgsrc/net/iana-etc/distinfo 2021/10/26 11:05:47 1.7
+++ pkgsrc/net/iana-etc/distinfo 2022/11/28 02:15:03 1.8
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1$NetBSD: distinfo,v 1.7 2021/10/26 11:05:47 nia Exp $ 1$NetBSD: distinfo,v 1.8 2022/11/28 02:15:03 jschauma Exp $
2 2
3BLAKE2s (iana-etc-2.30.tar.bz2) = d946204cdea28867e7780b737c5de36f2b8a79339a7b8d4bd3f37b65fa25b4a3 3BLAKE2s (iana-etc-2.30.tar.bz2) = d946204cdea28867e7780b737c5de36f2b8a79339a7b8d4bd3f37b65fa25b4a3
4SHA512 (iana-etc-2.30.tar.bz2) = d841b9c177fb0675bab10c9b0ebc4d3c2b743754c615e3fabcaebb29ffefaf2491278d0e672b99af3cbc9b300138700f56c1026f6d41659783150aea97583936 4SHA512 (iana-etc-2.30.tar.bz2) = d841b9c177fb0675bab10c9b0ebc4d3c2b743754c615e3fabcaebb29ffefaf2491278d0e672b99af3cbc9b300138700f56c1026f6d41659783150aea97583936
5Size (iana-etc-2.30.tar.bz2) = 205618 bytes 5Size (iana-etc-2.30.tar.bz2) = 205618 bytes
6SHA1 (patch-Makefile) = 2e4e7e3cc9ba8d96b93020e2f44f377cb2a04073 6SHA1 (patch-Makefile) = 2e4e7e3cc9ba8d96b93020e2f44f377cb2a04073
7SHA1 (patch-get.gawk) = 2316b674ae1b2cbbfcdefd9148b5456f9034b4f0 7SHA1 (patch-get.gawk) = 2316b674ae1b2cbbfcdefd9148b5456f9034b4f0
8SHA1 (patch-services.gawk) = 7f7cc91fdcb2b4393585001614477cd25c44b0a6 8SHA1 (patch-protocols.gawk) = 33ec3417f2155146d32b17204dccef534b95e54d
 9SHA1 (patch-services.gawk) = a4ecb6826480366ef45c73b0356e2eeec230c6f0
File Added: pkgsrc/net/iana-etc/patches/patch-protocols.gawk
$NetBSD: patch-protocols.gawk,v 1.1 2022/11/28 02:15:03 jschauma Exp $

o Protocol numbers are authoritatively sourced from IANA

--- protocols.gawk.orig	2022-11-27 21:04:38.855183965 -0500
+++ protocols.gawk	2022-11-27 21:05:09.916463115 -0500
@@ -14,7 +14,7 @@
     } else {
 	strip = 0
 	print "# See also: protocols(5)" \
-	    ", http://www.sethwklein.net/projects/iana-etc/\n#"
+	    ", https://www.iana.org/assignments/protocol-numbers/\n#"
 	format = "%-12s %3s %-12s # %s\n"
 	header_printed = 0
     }
cvs diff -r1.2 -r1.3 pkgsrc/net/iana-etc/patches/patch-services.gawk (expand / switch to unified diff)

--- pkgsrc/net/iana-etc/patches/patch-services.gawk 2012/08/25 13:01:42 1.2
+++ pkgsrc/net/iana-etc/patches/patch-services.gawk 2022/11/28 02:15:03 1.3
@@ -1,19 +1,29 @@ @@ -1,19 +1,29 @@
1$NetBSD: patch-services.gawk,v 1.2 2012/08/25 13:01:42 christos Exp $ 1$NetBSD: patch-services.gawk,v 1.3 2022/11/28 02:15:03 jschauma Exp $
2 2
 3o Service numbers are authoritatively sourced from IANA
3o New services file has <port> <protocol> instead of <port>/<protocol> 4o New services file has <port> <protocol> instead of <port>/<protocol>
4 5
5--- services.gawk 2008-03-05 19:51:45.000000000 +0200 6--- services.gawk.orig 2008-03-05 12:51:45.000000000 -0500
6+++ services.gawk 2012-08-25 13:36:06.000000000 +0300 7+++ services.gawk 2022-11-27 21:03:42.805245025 -0500
 8@@ -11,7 +11,7 @@
 9 } else {
 10 strip = 0
 11 print "# See also: services(5)" \
 12- ", http://www.sethwklein.net/projects/iana-etc/\n#"
 13+ ", https://www.iana.org/assignments/service-names-port-numbers/\n#"
 14 }
 15 while (getline <"port-aliases") {
 16 sub(/#.*/, "")
7@@ -22,15 +22,15 @@ 17@@ -22,15 +22,15 @@
8 } 18 }
9 } 19 }
10 { sub(/\r/, "") } 20 { sub(/\r/, "") }
11-# 1:name 2:ws 3:port 4:range 5:proto 6:comment 21-# 1:name 2:ws 3:port 4:range 5:proto 6:comment
12-match($0, /(^[[:alnum:]][^ \t]+)([ \t]+)([0-9]+)(-[0-9]+)?\/([^ \t]+)(.*)/, f) \ 22-match($0, /(^[[:alnum:]][^ \t]+)([ \t]+)([0-9]+)(-[0-9]+)?\/([^ \t]+)(.*)/, f) \
13+# 1:name 2:ws 3:port 4:range 6:proto 7:comment 23+# 1:name 2:ws 3:port 4:range 6:proto 7:comment
14+match($0, /(^[[:alnum:]][^ \t]+)([ \t]+)([0-9]+)(-[0-9]+)?([ \t]+)(dccp|sctp|tcp|udp)(.*)/, f) \ 24+match($0, /(^[[:alnum:]][^ \t]+)([ \t]+)([0-9]+)(-[0-9]+)?([ \t]+)(dccp|sctp|tcp|udp)(.*)/, f) \
15 && f[3] != "0" { 25 && f[3] != "0" {
16 # port 0 means unallocated, per port-numbers 26 # port 0 means unallocated, per port-numbers
17 name = f[1] 27 name = f[1]
18 whitespace = f[2] 28 whitespace = f[2]
19 port = f[3] 29 port = f[3]