ok deraadt@ guenther@

ok deraadt@

ok florian@ jung@ sthen@

no objection from deraadt@

from Ryan Kavanagh <rak@debian.org>

They are not interesting, but they are annoying during system upgrades.
ok sthen@ ajacoutot@ henning@ dtucker@

install sample configs to /etc/.
ok claudio deraadt henning mcbride

discussed with jsing and millert

patch originally suggested by mk@; sthen@, naddy@ and ajacoutot@ agree.

so stop it from trying to check itself for changes;
noticed by Mattieu Baptiste <mattieu dot b at gmail dot com>.

While it is a terribly cool idea, it's just awful and since noone has stepped
up to the plate to keep it up with the current vop state, retire it to the
attic.
ok krw@, deraadt@, guenther@, miod@.
comments from jmc@

ok deraadt@

ok jsg@

change without touching {master.,}passwd).
ok phessler@ giovanni@ "not sure if that's an ok but it's at least an o" mk@

yeah sure deraadt@

Update the BSD.x11.dist version to the one in xenocara.

Closes PR 5625
ok ajacoutot@, jakob@

through an optionnal /etc/sysmerge.ignore file
requested by many
man page tweak from jmc@
/etc/changelist addition suggested by sthen@
ok sthen@ jdixon@ jmc@ naddy@

ok deraadt@ beck@ reyk@ phessler@

approved by deraadt@, ok thib@

what the daemon does - it is a relayer that pays attention to the status
of pools of hosts; not a status checkers that happens to do some relaying

ok dlg@

a pre-shared key
ok hshoexer@ cloder@  (some time ago)

ok miod@, henning@

ok krw@

/etc/isamkpd.  Noticed by ajacoutot@lphp.org, thanks!
ok mcbride

ok claudio@

ok beck@

ok derradt@

add a few missing files and sort

ok msf@ hshoexer@ krw@ millert@