From 3fe900d4ff5e4f5edd8eb4c3d53ebba0bbac1987 Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 16 Jul 2014 14:53:47 +0000 Subject: [PATCH] sync --- distrib/sets/lists/base/md.alpha | 1 + distrib/sets/lists/base/md.amd64 | 1 + distrib/sets/lists/base/md.armish | 1 + distrib/sets/lists/base/md.armv7 | 1 + distrib/sets/lists/base/md.hppa | 1 + distrib/sets/lists/base/md.hppa64 | 1 + distrib/sets/lists/base/md.i386 | 1 + distrib/sets/lists/base/md.landisk | 1 + distrib/sets/lists/base/md.loongson | 1 + distrib/sets/lists/base/md.luna88k | 1 + distrib/sets/lists/base/md.macppc | 1 + distrib/sets/lists/base/md.octeon | 1 + distrib/sets/lists/base/md.sgi | 1 + distrib/sets/lists/base/md.socppc | 1 + distrib/sets/lists/base/md.sparc | 1 + distrib/sets/lists/base/md.sparc64 | 1 + distrib/sets/lists/base/md.vax | 1 + distrib/sets/lists/base/md.zaurus | 1 + distrib/sets/lists/base/mi | 2 ++ distrib/sets/lists/etc/md.alpha | 1 - distrib/sets/lists/etc/md.amd64 | 1 - distrib/sets/lists/etc/md.armish | 1 - distrib/sets/lists/etc/md.armv7 | 1 - distrib/sets/lists/etc/md.hppa | 1 - distrib/sets/lists/etc/md.hppa64 | 1 - distrib/sets/lists/etc/md.i386 | 1 - distrib/sets/lists/etc/md.landisk | 1 - distrib/sets/lists/etc/md.loongson | 1 - distrib/sets/lists/etc/md.luna88k | 1 - distrib/sets/lists/etc/md.macppc | 1 - distrib/sets/lists/etc/md.octeon | 1 - distrib/sets/lists/etc/md.sgi | 1 - distrib/sets/lists/etc/md.socppc | 1 - distrib/sets/lists/etc/md.sparc | 1 - distrib/sets/lists/etc/md.sparc64 | 1 - distrib/sets/lists/etc/md.vax | 1 - distrib/sets/lists/etc/md.zaurus | 1 - distrib/sets/lists/etc/mi | 1 - 38 files changed, 20 insertions(+), 19 deletions(-) diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index d6e60b0dad9..b9cf104f541 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 1040151d309..95faf4aab03 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index a3669c35ff0..b20b260c30d 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/atu-at76c503-i3863-ext ./etc/firmware/atu-at76c503-i3863-int ./etc/firmware/atu-at76c503-rfmd-acc-ext diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index cbdfbfc08a0..173fdc57b6c 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/rum-license ./etc/firmware/rum-rt2573 ./etc/firmware/run-license diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index 3f2373fa984..8886a6b4b2b 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index 9cdcbe07a3e..184833cf11b 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index cba9b5f8316..6547bdf36e4 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index d6470acdf6b..0a64f7225f3 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/atu-at76c503-i3863-ext ./etc/firmware/atu-at76c503-i3863-int ./etc/firmware/atu-at76c503-rfmd-acc-ext diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index 9ad0513e143..d4ca73b8661 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/atu-at76c503-i3863-ext ./etc/firmware/atu-at76c503-i3863-int ./etc/firmware/atu-at76c503-rfmd-acc-ext diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index 68d8438d771..1bd31927dc8 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./sbin/kbd ./sbin/wsconsctl ./usr/lib/gcc-lib/m88k-unknown-openbsd5.6 diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 3dfe5702669..50e37fa1bae 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index 694ca207a2c..0a336984435 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./sbin/kbd ./usr/lib/gcc-lib/mips64-unknown-openbsd5.6 ./usr/lib/libc.so.77.0 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index 5b3068a861d..667ccb847ef 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index f6568089ed6..12aade32871 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/atu-at76c503-i3863-ext diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index 210695c9f85..ab6e08449c4 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/symbol-eprim ./etc/firmware/symbol-esec ./etc/firmware/symbol-license diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 4409d176490..334d8ee510c 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/3c990 ./etc/firmware/3c990-license ./etc/firmware/afb diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax index bf163f503ff..3ac0247c745 100644 --- a/distrib/sets/lists/base/md.vax +++ b/distrib/sets/lists/base/md.vax @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./sbin/kbd ./sbin/wsconsctl ./usr/bin/gccbug diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index 32b3f6c63d6..e5af0554d4c 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -1,3 +1,4 @@ +./etc/examples/wsconsctl.conf ./etc/firmware/atu-at76c503-i3863-ext ./etc/firmware/atu-at76c503-i3863-int ./etc/firmware/atu-at76c503-rfmd-acc-ext diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi index 701d431da1a..3101ef61e29 100644 --- a/distrib/sets/lists/base/mi +++ b/distrib/sets/lists/base/mi @@ -64,10 +64,12 @@ ./etc/examples/ipsec.conf ./etc/examples/ldapd.conf ./etc/examples/ldpd.conf +./etc/examples/mixerctl.conf ./etc/examples/mrouted.conf ./etc/examples/ntpd.conf ./etc/examples/ospf6d.conf ./etc/examples/ospfd.conf +./etc/examples/pf.conf ./etc/examples/printcap ./etc/examples/rbootd.conf ./etc/examples/rc.local diff --git a/distrib/sets/lists/etc/md.alpha b/distrib/sets/lists/etc/md.alpha index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.alpha +++ b/distrib/sets/lists/etc/md.alpha @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.amd64 b/distrib/sets/lists/etc/md.amd64 index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.amd64 +++ b/distrib/sets/lists/etc/md.amd64 @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.armish b/distrib/sets/lists/etc/md.armish index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.armish +++ b/distrib/sets/lists/etc/md.armish @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.armv7 b/distrib/sets/lists/etc/md.armv7 index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.armv7 +++ b/distrib/sets/lists/etc/md.armv7 @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.hppa b/distrib/sets/lists/etc/md.hppa index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.hppa +++ b/distrib/sets/lists/etc/md.hppa @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.hppa64 b/distrib/sets/lists/etc/md.hppa64 index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.hppa64 +++ b/distrib/sets/lists/etc/md.hppa64 @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.i386 b/distrib/sets/lists/etc/md.i386 index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.i386 +++ b/distrib/sets/lists/etc/md.i386 @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.landisk b/distrib/sets/lists/etc/md.landisk index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.landisk +++ b/distrib/sets/lists/etc/md.landisk @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.loongson b/distrib/sets/lists/etc/md.loongson index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.loongson +++ b/distrib/sets/lists/etc/md.loongson @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.luna88k b/distrib/sets/lists/etc/md.luna88k index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.luna88k +++ b/distrib/sets/lists/etc/md.luna88k @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.macppc b/distrib/sets/lists/etc/md.macppc index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.macppc +++ b/distrib/sets/lists/etc/md.macppc @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.octeon b/distrib/sets/lists/etc/md.octeon index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.octeon +++ b/distrib/sets/lists/etc/md.octeon @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.sgi b/distrib/sets/lists/etc/md.sgi index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.sgi +++ b/distrib/sets/lists/etc/md.sgi @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.socppc b/distrib/sets/lists/etc/md.socppc index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.socppc +++ b/distrib/sets/lists/etc/md.socppc @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.sparc b/distrib/sets/lists/etc/md.sparc index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.sparc +++ b/distrib/sets/lists/etc/md.sparc @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.sparc64 b/distrib/sets/lists/etc/md.sparc64 index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.sparc64 +++ b/distrib/sets/lists/etc/md.sparc64 @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.vax b/distrib/sets/lists/etc/md.vax index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.vax +++ b/distrib/sets/lists/etc/md.vax @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/md.zaurus b/distrib/sets/lists/etc/md.zaurus index 772a5110aeb..e69de29bb2d 100644 --- a/distrib/sets/lists/etc/md.zaurus +++ b/distrib/sets/lists/etc/md.zaurus @@ -1 +0,0 @@ -./etc/wsconsctl.conf diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 732bd3300ea..7ac21782c64 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -41,7 +41,6 @@ ./etc/mailer.conf ./etc/man.conf ./etc/master.passwd -./etc/mixerctl.conf ./etc/monthly ./etc/motd ./etc/myname -- 2.20.1