sync

9 files changed, 24 insertions, 5 deletions

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 375421b71fe..87ec714f12f 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -712,3 +712,21 @@
 ./sbin/wicontrol
 ./usr/share/misc/pcvtfonts/koi8-8x10
 ./usr/libdata/perl5/site_perl/i386-openbsd/stdbool.ph
+./usr/lib/apache/modules/libproxy.so
+./usr/lib/apache/modules/mod_auth_anon.so
+./usr/lib/apache/modules/mod_auth_db.so
+./usr/lib/apache/modules/mod_auth_dbm.so
+./usr/lib/apache/modules/mod_auth_digest.so
+./usr/lib/apache/modules/mod_cern_meta.so
+./usr/lib/apache/modules/mod_define.so
+./usr/lib/apache/modules/mod_digest.so
+./usr/lib/apache/modules/mod_info.so
+./usr/lib/apache/modules/mod_log_agent.so
+./usr/lib/apache/modules/mod_log_referer.so
+./usr/lib/apache/modules/mod_mime_magic.so
+./usr/lib/apache/modules/mod_mmap_static.so
+./usr/lib/apache/modules/mod_rewrite.so
+./usr/lib/apache/modules/mod_speling.so
+./usr/lib/apache/modules/mod_unique_id.so
+./usr/lib/apache/modules/mod_usertrack.so
+./usr/lib/apache/modules/mod_vhost_alias.so
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index ee7a0d7708a..58077747a0f 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,3 +1,4 @@
+./usr/sbin/suexec
 ./altroot
 ./bin
 ./bin/[
@@ -2665,3 +2666,4 @@
 ./usr/sbin/apxs
 ./usr/sbin/logresolve
 ./usr/sbin/rotatelogs
+./usr/lib/apache/include/xml
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index 9149c9e2162..03325aa823c 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -111,7 +111,6 @@
 ./usr/lib/libkadm_pic.a
 ./usr/lib/libkafs_pic.a
 ./usr/lib/libkdb_pic.a
-./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 1406336dd55..0ff779cb4b8 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -106,7 +106,6 @@
 ./usr/lib/libkadm_pic.a
 ./usr/lib/libkafs_pic.a
 ./usr/lib/libkdb_pic.a
-./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 64346eced26..f63fbafa037 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -104,7 +104,6 @@
 ./usr/lib/libkeycap.a
 ./usr/lib/libkeycap_p.a
 ./usr/lib/libkeycap_pic.a
-./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 85341a522cb..11fbe10b9c4 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -115,7 +115,6 @@
 ./usr/lib/libkadm_pic.a
 ./usr/lib/libkafs_pic.a
 ./usr/lib/libkdb_pic.a
-./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 43c037e6d29..57456875212 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -94,7 +94,6 @@
 ./usr/lib/libkadm_pic.a
 ./usr/lib/libkafs_pic.a
 ./usr/lib/libkdb_pic.a
-./usr/lib/libkeynote_pic.a
 ./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index de8391aad8d..7ce66ad8d15 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -2878,3 +2878,6 @@
 ./usr/include/ssl/ssl_locl.h
 ./usr/include/ssl/tmdiff.h
 ./usr/include/ssl/x509v3.h
+./usr/include/dev/pci/if_skreg.h
+./usr/include/dev/pci/pciide_pdc202xx_reg.h
+./usr/include/dev/pci/xmaciireg.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index fff8077337f..b98f30c33dc 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1689,3 +1689,4 @@
 ./usr/share/man/cat1/ssh-keygen.0
 ./usr/share/man/cat1/ssh.0
 ./usr/share/man/cat8/sshd.0
+./usr/share/man/cat4/sk.0