Re: CVS commit: src/etc

[christos%astron.com@localhost (Christos Zoulas)]

In article <20170116093926.99CA3FBAE%cvs.NetBSD.org@localhost>,
Hauke Fath <source-changes-d%NetBSD.org@localhost> wrote:
>-=-=-=-=-=-
>
>Module Name:	src
>Committed By:	hauke
>Date:		Mon Jan 16 09:39:26 UTC 2017
>
>Modified Files:
>	src/etc: protocols
>
>Log Message:
>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.

This is not how this used to work; you need to add those entries to the
local portion. If that does not work, we need to figure out how to
merge them automatically.

christos