diff options
| author | jschauma <jschauma@pkgsrc.org> | 2022-11-28 17:44:41 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2022-11-28 17:44:41 +0000 |
| commit | 2f9c9c40738b4146dff61b5466190ccd106af70a (patch) | |
| tree | 430f2a817881c2b4405fcf939d88abc1f6a2e086 /net/iana-etc | |
| parent | 9d0769ee47ec6c172e0b103f4903a863f52c1209 (diff) | |
| download | pkgsrc-2f9c9c40738b4146dff61b5466190ccd106af70a.tar.gz | |
munge TTP and IPTM into aliases
Some time between 2011 and 2013, IANA assigned protocol 84 to IPTM even
though it had already assigned it to TTP. This was previously merged
manually (e.g., in rev1.25, and rev 1.28), but required the person
regenerating the data to remember to do this. This change here now
makes that change automatic, ugly as it is.
Diffstat (limited to 'net/iana-etc')
| -rw-r--r-- | net/iana-etc/Makefile | 4 | ||||
| -rw-r--r-- | net/iana-etc/distinfo | 4 | ||||
| -rw-r--r-- | net/iana-etc/patches/patch-protocols.gawk | 24 |
3 files changed, 22 insertions, 10 deletions
diff --git a/net/iana-etc/Makefile b/net/iana-etc/Makefile index 56cb28f7989..b3cdb24363c 100644 --- a/net/iana-etc/Makefile +++ b/net/iana-etc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2022/11/28 17:05:08 jschauma Exp $ +# $NetBSD: Makefile,v 1.10 2022/11/28 17:44:41 jschauma Exp $ # DISTNAME= iana-etc-2.30 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MASTER_SITES= http://sethwklein.net/ EXTRACT_SUFX= .tar.bz2 diff --git a/net/iana-etc/distinfo b/net/iana-etc/distinfo index cc1820d25bc..2a016e091cf 100644 --- a/net/iana-etc/distinfo +++ b/net/iana-etc/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.9 2022/11/28 17:05:08 jschauma Exp $ +$NetBSD: distinfo,v 1.10 2022/11/28 17:44:41 jschauma Exp $ BLAKE2s (iana-etc-2.30.tar.bz2) = d946204cdea28867e7780b737c5de36f2b8a79339a7b8d4bd3f37b65fa25b4a3 SHA512 (iana-etc-2.30.tar.bz2) = d841b9c177fb0675bab10c9b0ebc4d3c2b743754c615e3fabcaebb29ffefaf2491278d0e672b99af3cbc9b300138700f56c1026f6d41659783150aea97583936 Size (iana-etc-2.30.tar.bz2) = 205618 bytes SHA1 (patch-Makefile) = 2e4e7e3cc9ba8d96b93020e2f44f377cb2a04073 SHA1 (patch-get.gawk) = 2316b674ae1b2cbbfcdefd9148b5456f9034b4f0 -SHA1 (patch-protocols.gawk) = 9f0062a2b60ecedfa44ff93486a78455828245ea +SHA1 (patch-protocols.gawk) = f8f0e6b91a007cc3dc6137d734839d7ea531fb40 SHA1 (patch-services.gawk) = a4ecb6826480366ef45c73b0356e2eeec230c6f0 diff --git a/net/iana-etc/patches/patch-protocols.gawk b/net/iana-etc/patches/patch-protocols.gawk index 8a94225b74e..e86872e0e13 100644 --- a/net/iana-etc/patches/patch-protocols.gawk +++ b/net/iana-etc/patches/patch-protocols.gawk @@ -1,10 +1,11 @@ -$NetBSD: patch-protocols.gawk,v 1.2 2022/11/28 17:05:08 jschauma Exp $ +$NetBSD: patch-protocols.gawk,v 1.3 2022/11/28 17:44:41 jschauma Exp $ +o Munge TTP/IPTM into aliases. o If an alias is identical to the name, upper case it (PR 44311). o Protocol numbers are authoritatively sourced from IANA ---- protocols.gawk 2022-11-28 11:49:15.381735930 -0500 -+++ protocols.gawk.orig 2006-11-14 13:20:26.000000000 -0500 +--- protocols.gawk.orig 2006-11-14 13:20:26.000000000 -0500 ++++ protocols.gawk 2022-11-28 12:33:08.350923778 -0500 @@ -14,7 +14,7 @@ } else { strip = 0 @@ -14,13 +15,24 @@ o Protocol numbers are authoritatively sourced from IANA format = "%-12s %3s %-12s # %s\n" header_printed = 0 } -@@ -26,6 +26,9 @@ +@@ -26,7 +26,19 @@ header_printed = 1; } sub(/^[ \t]*/, "", f[3]) +- printf format, tolower(f[2]), f[1], f[2], f[3] ++ alias=f[2] + if (tolower(f[2]) == f[2]) { -+ f[2] = toupper(f[2]) ++ alias = toupper(f[2]) + } - printf format, tolower(f[2]), f[1], f[2], f[3] ++ # IANA assigned '84' to both TTP and IPTM; for ++ # /etc/protocols, we munge these into aliases: ++ if (tolower(f[2]) == "ttp") { ++ alias = "TTP iptm IPTM" ++ } ++ if (tolower(f[2]) == "iptm") { ++ f[2] = "#iptm" ++ } ++ printf format, tolower(f[2]), f[1], alias, f[3] next } + !strip { print "# " $0 } |