diff options
| author | jschauma <jschauma@pkgsrc.org> | 2022-11-28 19:26:41 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2022-11-28 19:26:41 +0000 |
| commit | a1af833e4120176341186362af330705d00b628e (patch) | |
| tree | 4fc0a4906e94219bd905130124733f0b6081c3d7 /net/iana-etc | |
| parent | 774c89ddc20e0ed11926effb6659bf1104d33be6 (diff) | |
| download | pkgsrc-a1af833e4120176341186362af330705d00b628e.tar.gz | |
ensure manual changes are retained upon regeneration
in rev1.29 of /etc/protocols, carp(4) was added as an alias for VRRP;
in rev1.21 of /etc/protocols, pfsync was added
Both changes tend to get nuked when we regenerate the file, so patch
those changes in here.
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, 24 insertions, 8 deletions
diff --git a/net/iana-etc/Makefile b/net/iana-etc/Makefile index b3cdb24363c..cd32d6f5e64 100644 --- a/net/iana-etc/Makefile +++ b/net/iana-etc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2022/11/28 17:44:41 jschauma Exp $ +# $NetBSD: Makefile,v 1.11 2022/11/28 19:26:41 jschauma Exp $ # DISTNAME= iana-etc-2.30 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= net MASTER_SITES= http://sethwklein.net/ EXTRACT_SUFX= .tar.bz2 diff --git a/net/iana-etc/distinfo b/net/iana-etc/distinfo index 2a016e091cf..a15c4080409 100644 --- a/net/iana-etc/distinfo +++ b/net/iana-etc/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2022/11/28 17:44:41 jschauma Exp $ +$NetBSD: distinfo,v 1.11 2022/11/28 19:26: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) = f8f0e6b91a007cc3dc6137d734839d7ea531fb40 +SHA1 (patch-protocols.gawk) = 98e4935214f3b29f4025bb31f392f7bc42a63433 SHA1 (patch-services.gawk) = a4ecb6826480366ef45c73b0356e2eeec230c6f0 diff --git a/net/iana-etc/patches/patch-protocols.gawk b/net/iana-etc/patches/patch-protocols.gawk index e86872e0e13..9c2743b7798 100644 --- a/net/iana-etc/patches/patch-protocols.gawk +++ b/net/iana-etc/patches/patch-protocols.gawk @@ -1,11 +1,13 @@ -$NetBSD: patch-protocols.gawk,v 1.3 2022/11/28 17:44:41 jschauma Exp $ +$NetBSD: patch-protocols.gawk,v 1.4 2022/11/28 19:26:41 jschauma Exp $ +o Add pfsync +o Add carp(4) as an alias to VRRP 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.orig 2006-11-14 13:20:26.000000000 -0500 -+++ protocols.gawk 2022-11-28 12:33:08.350923778 -0500 ++++ protocols.gawk 2022-11-28 14:17:27.061991822 -0500 @@ -14,7 +14,7 @@ } else { strip = 0 @@ -15,7 +17,7 @@ o Protocol numbers are authoritatively sourced from IANA format = "%-12s %3s %-12s # %s\n" header_printed = 0 } -@@ -26,7 +26,19 @@ +@@ -26,7 +26,32 @@ header_printed = 1; } sub(/^[ \t]*/, "", f[3]) @@ -32,7 +34,21 @@ o Protocol numbers are authoritatively sourced from IANA + if (tolower(f[2]) == "iptm") { + f[2] = "#iptm" + } ++ ++ # Add carp(4) as an alias for VRRP as used by the BSDs. ++ if (tolower(f[2]) == "vrrp") { ++ alias = "VRRP carp" ++ } + printf format, tolower(f[2]), f[1], alias, f[3] ++ next } - !strip { print "# " $0 } +-!strip { print "# " $0 } ++ ++!strip { ++ print "# " $0 ++ # pfsync is not registered by IANA, but used by the BSDs: ++ if (/nassigned/) { ++ printf format, "pfsync", "240", "PFSYNC", "PF Synchronization" ++ } ++} |