From: deraadt Date: Sun, 13 Jul 2014 00:01:54 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=0fd8d013dcfef7a64c1be39d94d7b150305eb96f;p=openbsd sync --- diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index 4eca5d978a5..7727cdf8d15 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -52,8 +52,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 3780631b245..a9d7d386579 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -57,8 +57,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index b28f4919670..c6a154bc17d 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -28,8 +28,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/zd1211 ./etc/firmware/zd1211-license ./etc/firmware/zd1211b diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index 36367d94158..df5468158da 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -55,8 +55,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index 3fc8c21b17a..e33e89f2954 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -55,8 +55,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index a1812f0a261..eb0e6d245f7 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -59,8 +59,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index efa22aac503..34afec99988 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -23,8 +23,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/zd1211 ./etc/firmware/zd1211-license ./etc/firmware/zd1211b diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index 25b3862b5be..6eb2072227b 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -28,8 +28,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/zd1211 ./etc/firmware/zd1211-license ./etc/firmware/zd1211b diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 79f9f9bdd3a..d0a4d3b05ed 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -55,8 +55,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index 4a21e1f8621..1fac891cbc0 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -55,8 +55,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index efda568cbe2..eaf708af6cb 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -49,8 +49,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 45e94d8b0b9..bd3866d880c 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -57,8 +57,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/yds ./etc/firmware/yds-license ./etc/firmware/zd1211 diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index 9c24cfcef50..3a1fa0c594c 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -26,8 +26,6 @@ ./etc/firmware/tusb3410 ./etc/firmware/tusb3410-license ./etc/firmware/udl_huffman -./etc/firmware/uyap -./etc/firmware/uyap-license ./etc/firmware/zd1211 ./etc/firmware/zd1211-license ./etc/firmware/zd1211b diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi index 92e2ebdb223..f9a6803c0d4 100644 --- a/distrib/sets/lists/etc/mi +++ b/distrib/sets/lists/etc/mi @@ -116,7 +116,7 @@ ./var/cron/log ./var/cron/tabs/root ./var/db/locate.database -./var/db/sysmerge/egsum +./var/db/sysmerge/examplessum ./var/db/sysmerge/etcsum ./var/log/authlog ./var/log/daemon diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi index aa35f1f94da..cdb4deb2c22 100644 --- a/distrib/sets/lists/man/mi +++ b/distrib/sets/lists/man/mi @@ -2135,7 +2135,6 @@ ./usr/share/man/man4/uvideo.4 ./usr/share/man/man4/uvisor.4 ./usr/share/man/man4/uvscom.4 -./usr/share/man/man4/uyap.4 ./usr/share/man/man4/vax ./usr/share/man/man4/vax/asc.4 ./usr/share/man/man4/vax/autoconf.4