From: deraadt <deraadt@openbsd.org>
Date: Sun, 13 Jul 2014 21:49:02 +0000 (+0000)
Subject: sync
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8ef0745a996bf1b46867ec9b388433f8d28758f7;p=openbsd

sync
---

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 682e068e472..8a35b3adb5b 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,8 @@
+./etc/nginx/mime.types
+./etc/netstart
+./etc/rc
 ./altroot
+./etc/disktab
 ./bin
 ./bin/[
 ./bin/cat
@@ -123,6 +127,9 @@
 ./etc/rc.d/ftpd
 ./etc/rc.d/ftpproxy
 ./etc/rc.d/hostapd
+./etc/ldap/core.schema
+./etc/ldap/inetorgperson.schema
+./etc/ldap/nis.schema
 ./etc/rc.d/hotplugd
 ./etc/rc.d/identd
 ./etc/rc.d/ifstated
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index e27fb7b3cd4..8b4318bb0fe 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1445,6 +1445,7 @@
 ./usr/include/sys/unpcb.h
 ./usr/include/sys/user.h
 ./usr/include/sys/utsname.h
+./usr/include/sys/uuid.h
 ./usr/include/sys/varargs.h
 ./usr/include/sys/videoio.h
 ./usr/include/sys/vmmeter.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index bb3ac8547bc..626f764b945 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -8,7 +8,6 @@
 ./etc/csh.logout
 ./etc/daily
 ./etc/dhclient.conf
-./etc/disktab
 ./etc/dumpdates
 ./etc/fbtab
 ./etc/ftpusers
@@ -21,9 +20,6 @@
 ./etc/iked/pubkeys/ipv6
 ./etc/iked/pubkeys/ufqdn
 ./etc/ksh.kshrc
-./etc/ldap/core.schema
-./etc/ldap/inetorgperson.schema
-./etc/ldap/nis.schema
 ./etc/localtime
 ./etc/locate.rc
 ./etc/login.conf
@@ -57,12 +53,10 @@
 ./etc/monthly
 ./etc/motd
 ./etc/myname
-./etc/netstart
 ./etc/newsyslog.conf
 ./etc/nginx/fastcgi_params
 ./etc/nginx/koi-utf
 ./etc/nginx/koi-win
-./etc/nginx/mime.types
 ./etc/nginx/nginx.conf
 ./etc/nginx/scgi_params
 ./etc/nginx/uwsgi_params
@@ -75,7 +69,6 @@
 ./etc/ppp/options
 ./etc/ppp/pap-secrets
 ./etc/pwd.db
-./etc/rc
 ./etc/rc.conf
 ./etc/rc.local
 ./etc/rc.securelevel