CVS commit: pkgsrc/net/iana-etc

["Jan Schaumann" <jschauma%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jschauma
Date:           Mon Nov 28 17:05:08 UTC 2022

Modified Files:
        pkgsrc/net/iana-etc: Makefile distinfo
        pkgsrc/net/iana-etc/patches: patch-protocols.gawk

Log Message:
upper-case aliases if they're identical to the protocol name

This addresses PR44311 (11 years later :-), which was never completely fixed,
as the regeneration of the protocols files reinstated the lowercased (identical)
alias for the "manet" protocol.  As a result, when importing the protocols file,
one had to know that one needed to manually update the entry so as not to break
things.


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/iana-etc/Makefile \
    pkgsrc/net/iana-etc/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/iana-etc/patches/patch-protocols.gawk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/iana-etc/Makefile
diff -u pkgsrc/net/iana-etc/Makefile:1.8 pkgsrc/net/iana-etc/Makefile:1.9
--- pkgsrc/net/iana-etc/Makefile:1.8    Mon Nov 28 02:15:03 2022
+++ pkgsrc/net/iana-etc/Makefile        Mon Nov 28 17:05:08 2022
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.8 2022/11/28 02:15:03 jschauma Exp $
+# $NetBSD: Makefile,v 1.9 2022/11/28 17:05:08 jschauma Exp $
 #
 
 DISTNAME=      iana-etc-2.30
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    net
 MASTER_SITES=  http://sethwklein.net/
 EXTRACT_SUFX=  .tar.bz2
Index: pkgsrc/net/iana-etc/distinfo
diff -u pkgsrc/net/iana-etc/distinfo:1.8 pkgsrc/net/iana-etc/distinfo:1.9
--- pkgsrc/net/iana-etc/distinfo:1.8    Mon Nov 28 02:15:03 2022
+++ pkgsrc/net/iana-etc/distinfo        Mon Nov 28 17:05:08 2022
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.8 2022/11/28 02:15:03 jschauma Exp $
+$NetBSD: distinfo,v 1.9 2022/11/28 17:05:08 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) = 33ec3417f2155146d32b17204dccef534b95e54d
+SHA1 (patch-protocols.gawk) = 9f0062a2b60ecedfa44ff93486a78455828245ea
 SHA1 (patch-services.gawk) = a4ecb6826480366ef45c73b0356e2eeec230c6f0

Index: pkgsrc/net/iana-etc/patches/patch-protocols.gawk
diff -u pkgsrc/net/iana-etc/patches/patch-protocols.gawk:1.1 pkgsrc/net/iana-etc/patches/patch-protocols.gawk:1.2
--- pkgsrc/net/iana-etc/patches/patch-protocols.gawk:1.1        Mon Nov 28 02:15:03 2022
+++ pkgsrc/net/iana-etc/patches/patch-protocols.gawk    Mon Nov 28 17:05:08 2022
@@ -1,9 +1,10 @@
-$NetBSD: patch-protocols.gawk,v 1.1 2022/11/28 02:15:03 jschauma Exp $
+$NetBSD: patch-protocols.gawk,v 1.2 2022/11/28 17:05:08 jschauma Exp $
 
+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        2022-11-27 21:04:38.855183965 -0500
-+++ protocols.gawk     2022-11-27 21:05:09.916463115 -0500
+--- protocols.gawk     2022-11-28 11:49:15.381735930 -0500
++++ protocols.gawk.orig        2006-11-14 13:20:26.000000000 -0500
 @@ -14,7 +14,7 @@
      } else {
        strip = 0
@@ -13,3 +14,13 @@ o Protocol numbers are authoritatively s
        format = "%-12s %3s %-12s # %s\n"
        header_printed = 0
      }
+@@ -26,6 +26,9 @@
+       header_printed = 1;
+     }
+     sub(/^[ \t]*/, "", f[3])
++    if (tolower(f[2]) == f[2]) {
++        f[2] = toupper(f[2])
++    }
+     printf format, tolower(f[2]), f[1], f[2], f[3]
+     next
+ }