From e29f67bfe424192ab7f61b75d4b601811fe3d59d Mon Sep 17 00:00:00 2001
From: deraadt <>
Date: Fri, 11 Jul 2014 16:59:03 +0000
Subject: [PATCH] handle the movement of the first few files to /etc/examples. 
 They are still managed by changelist, as long as the marker is + and they are
 in the correct distrib/sets/* files Bit of help from ajacoutot

---
 src/etc/Makefile   | 16 ++++++++--------
 src/etc/changelist | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/etc/Makefile b/src/etc/Makefile
index f24fcec6..dcaf0ac1 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.357 2014/04/29 21:30:20 dcoppa Exp $
+#	$OpenBSD: Makefile,v 1.358 2014/07/11 16:59:03 deraadt Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -38,7 +38,10 @@ BIN1=	changelist csh.cshrc csh.login csh.logout daily dhcpd.conf \
 	remote rpc services shells syslog.conf weekly \
 	etc.${MACHINE}/login.conf \
 	etc.${MACHINE}/disktab dhclient.conf mailer.conf ntpd.conf \
-	moduli pf.os sensorsd.conf ifstated.conf mixerctl.conf
+	moduli pf.os sensorsd.conf mixerctl.conf
+
+EXAMPLES=chio.conf dvmrpd.conf hostapd.conf ifstated.conf ldpd.conf \
+	ospf6d.conf ospfd.conf
 
 .if ${MACHINE} != "aviion" 
 BIN1+=	wsconsctl.conf
@@ -109,14 +112,8 @@ distribution-etc-root-var: distrib-dirs
 	${INSTALL} -c -o root -g wheel -m 600 master.passwd ${DESTDIR}/etc
 	pwd_mkdb -p -d ${DESTDIR}/etc /etc/master.passwd
 	${INSTALL} -c -o root -g wheel -m 600 bgpd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 ospfd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 ospf6d.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ripd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 dvmrpd.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 ldpd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 pf.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g operator -m 644 chio.conf ${DESTDIR}/etc
-	${INSTALL} -c -o root -g wheel -m 600 hostapd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 relayd.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 iked.conf ${DESTDIR}/etc
 	${INSTALL} -c -o root -g wheel -m 600 ipsec.conf ${DESTDIR}/etc
@@ -173,6 +170,9 @@ distribution-etc-root-var: distrib-dirs
 		    ${DESTDIR}/etc/ppp; \
 		${INSTALL} -c -o root -g wheel -m 600 pap-secrets \
 		    ${DESTDIR}/etc/ppp
+	cd examples; \
+		${INSTALL} -c -o root -g wheel -m 644 ${EXAMPLES} \
+		    ${DESTDIR}/etc/examples
 	cd signify; \
 		${INSTALL} -c -o root -g wheel -m 644 *.pub \
 		    ${DESTDIR}/etc/signify
diff --git a/src/etc/changelist b/src/etc/changelist
index 8c341418..3bf44bc5 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.87 2014/04/29 21:30:20 dcoppa Exp $
+#	$OpenBSD: changelist,v 1.88 2014/07/11 16:59:03 deraadt Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -14,7 +14,7 @@
 /etc/boot.conf
 /etc/bootparams
 /etc/changelist
-/etc/chio.conf
++/etc/chio.conf
 /etc/crontab
 /etc/csh.cshrc
 /etc/csh.login
@@ -26,7 +26,7 @@
 /etc/dhcpd.conf
 /etc/disktab
 /etc/distfile
-/etc/dvmrpd.conf
++/etc/dvmrpd.conf
 /etc/ethers
 /etc/exports
 /etc/fbtab
@@ -40,7 +40,7 @@
 +/etc/hostname.*
 /etc/hosts
 /etc/hosts.lpd
-/etc/ifstated.conf
++/etc/ifstated.conf
 +/etc/iked.conf
 /etc/inetd.conf
 +/etc/ipsec.conf
@@ -50,7 +50,7 @@
 +/etc/isakmpd/private/local.key
 /etc/ksh.kshrc
 /etc/ldapd.conf
-/etc/ldpd.conf
++/etc/ldpd.conf
 /etc/locate.rc
 /etc/login.conf
 /etc/lynx.cfg
@@ -95,8 +95,8 @@
 /etc/npppd/npppd.conf
 +/etc/npppd/npppd-users
 /etc/ntpd.conf
-/etc/ospf6d.conf
-/etc/ospfd.conf
++/etc/ospf6d.conf
++/etc/ospfd.conf
 /etc/passwd
 /etc/pf.conf
 /etc/pf.os