[src/trunk]: src/etc Add carp as an alias for vrrp - after all, we do not shi...

[hauke <hauke%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9b9658940297
branches:  trunk
changeset: 820932:9b9658940297
user:      hauke <hauke%NetBSD.org@localhost>
date:      Mon Jan 16 09:39:26 2017 +0000

description:
Add carp as an alias for vrrp - after all, we do not ship vrrp, but we
do ship carp(4).

Restore the pfsync entry that was added with 1.20, then wiped out by
the 1.21 import. Please merge any wholesale imports properly.

Remove http://www.sethwklein.net/projects/iana-etc/ which 404s.

Should fix PR bin/51568

diffstat:

 etc/protocols |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 40d866287e42 -r 9b9658940297 etc/protocols
--- a/etc/protocols     Mon Jan 16 09:28:40 2017 +0000
+++ b/etc/protocols     Mon Jan 16 09:39:26 2017 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: protocols,v 1.28 2015/11/18 16:16:36 christos Exp $
-# See also: protocols(5), http://www.sethwklein.net/projects/iana-etc/
+# $NetBSD: protocols,v 1.29 2017/01/16 09:39:26 hauke Exp $
+# See also: protocols(5)
 #
 #    Last Updated
 #            2015-10-06
@@ -204,7 +204,7 @@
 snp          109 SNP          # Sitara Networks Protocol                    [Manickam_R_Sridhar]
 compaq-peer  110 Compaq-Peer  # Compaq Peer Protocol                        [Victor_Volpe]
 ipx-in-ip    111 IPX-in-IP    # IPX in IP                                   [CJ_Lee]
-vrrp         112 VRRP         # Virtual Router Redundancy                   [RFC5798]
+vrrp         112 VRRP carp    # Virtual Router Redundancy                   [RFC5798]
 #                               Protocol
 pgm          113 PGM          # PGM Reliable Transport                      [Tony_Speakman]
 #                               Protocol
@@ -243,7 +243,9 @@
 wesp         141 WESP         # Wrapped Encapsulating                       [RFC5840]
 #                               Security Payload
 rohc         142 ROHC         # Robust Header Compression                   [RFC5858]
-#    143-252                    Unassigned                                  [Internet_Assigned_Numbers_Authority]
+#    143-239                    Unassigned                                  [Internet_Assigned_Numbers_Authority]
+pfsync       240 PFSYNC       # PF Synchronization
+#    241-252                    Unassigned                                  [Internet_Assigned_Numbers_Authority]
 #      253                      Use for experimentation and        Y        [RFC3692]
 #                               testing
 #      254                      Use for experimentation and        Y        [RFC3692]