sync

3 files changed, 19 insertions, 4 deletions

diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 49e301d9bf9..6ab6dfa01d9 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1256,6 +1256,7 @@
 ./usr/sbin/dhcrelay
 ./usr/sbin/dig
 ./usr/sbin/dnsquery
+./usr/sbin/editmap
 ./usr/sbin/edquota
 ./usr/sbin/ext_srvtab
 ./usr/sbin/faithd
@@ -1805,6 +1806,7 @@
 ./usr/share/sendmail/cf/generic-linux.mc
 ./usr/share/sendmail/cf/generic-nextstep3.3.mc
 ./usr/share/sendmail/cf/generic-osf1.mc
+./usr/share/sendmail/cf/generic-solaris.mc
 ./usr/share/sendmail/cf/generic-solaris2.mc
 ./usr/share/sendmail/cf/generic-sunos4.1.mc
 ./usr/share/sendmail/cf/generic-ultrix4.mc
@@ -1816,10 +1818,12 @@
 ./usr/share/sendmail/cf/mailspool.cs.mc
 ./usr/share/sendmail/cf/nettan.mc
 ./usr/share/sendmail/cf/openbsd-lists.mc
+./usr/share/sendmail/cf/openbsd-localhost.mc
 ./usr/share/sendmail/cf/openbsd-proto.mc
 ./usr/share/sendmail/cf/python.cs.mc
 ./usr/share/sendmail/cf/s2k-osf1.mc
 ./usr/share/sendmail/cf/s2k-ultrix4.mc
+./usr/share/sendmail/cf/submit.mc
 ./usr/share/sendmail/cf/tcpproto.mc
 ./usr/share/sendmail/cf/ucbarpa.mc
 ./usr/share/sendmail/cf/ucbvax.mc
@@ -1840,30 +1844,38 @@
 ./usr/share/sendmail/feature/access_db.m4
 ./usr/share/sendmail/feature/allmasquerade.m4
 ./usr/share/sendmail/feature/always_add_domain.m4
+./usr/share/sendmail/feature/authinfo.m4
 ./usr/share/sendmail/feature/bestmx_is_local.m4
 ./usr/share/sendmail/feature/bitdomain.m4
 ./usr/share/sendmail/feature/blacklist_recipients.m4
+./usr/share/sendmail/feature/compat_check.m4
 ./usr/share/sendmail/feature/delay_checks.m4
 ./usr/share/sendmail/feature/dnsbl.m4
 ./usr/share/sendmail/feature/domaintable.m4
+./usr/share/sendmail/feature/enhdnsbl.m4
 ./usr/share/sendmail/feature/generics_entire_domain.m4
 ./usr/share/sendmail/feature/genericstable.m4
 ./usr/share/sendmail/feature/ldap_routing.m4
 ./usr/share/sendmail/feature/limited_masquerade.m4
 ./usr/share/sendmail/feature/local_lmtp.m4
+./usr/share/sendmail/feature/local_no_masquerade.m4
 ./usr/share/sendmail/feature/local_procmail.m4
+./usr/share/sendmail/feature/lookupdotdomain.m4
 ./usr/share/sendmail/feature/loose_relay_check.m4
 ./usr/share/sendmail/feature/mailertable.m4
 ./usr/share/sendmail/feature/masquerade_entire_domain.m4
 ./usr/share/sendmail/feature/masquerade_envelope.m4
+./usr/share/sendmail/feature/msp.m4
 ./usr/share/sendmail/feature/no_default_msa.m4
 ./usr/share/sendmail/feature/nocanonify.m4
 ./usr/share/sendmail/feature/nodns.m4
 ./usr/share/sendmail/feature/notsticky.m4
 ./usr/share/sendmail/feature/nouucp.m4
 ./usr/share/sendmail/feature/nullclient.m4
+./usr/share/sendmail/feature/preserve_local_plus_detail.m4
+./usr/share/sendmail/feature/preserve_luser_host.m4
 ./usr/share/sendmail/feature/promiscuous_relay.m4
-./usr/share/sendmail/feature/rbl.m4
+./usr/share/sendmail/feature/queuegroup.m4
 ./usr/share/sendmail/feature/redirect.m4
 ./usr/share/sendmail/feature/relay_based_on_MX.m4
 ./usr/share/sendmail/feature/relay_entire_domain.m4
@@ -1897,13 +1909,12 @@
 ./usr/share/sendmail/mailer/usenet.m4
 ./usr/share/sendmail/mailer/uucp.m4
 ./usr/share/sendmail/ostype
-./usr/share/sendmail/ostype/aix2.m4
+./usr/share/sendmail/ostype/a-ux.m4
 ./usr/share/sendmail/ostype/aix3.m4
 ./usr/share/sendmail/ostype/aix4.m4
 ./usr/share/sendmail/ostype/aix5.m4
 ./usr/share/sendmail/ostype/altos.m4
 ./usr/share/sendmail/ostype/amdahl-uts.m4
-./usr/share/sendmail/ostype/aux.m4
 ./usr/share/sendmail/ostype/bsd4.3.m4
 ./usr/share/sendmail/ostype/bsd4.4.m4
 ./usr/share/sendmail/ostype/bsdi.m4
@@ -2027,7 +2038,7 @@
 ./usr/share/vi/catalog/english
 ./usr/share/vi/catalog/french
 ./usr/share/vi/catalog/german
-./usr/share/vi/catalog/ru_SU.KOI8-R
+./usr/share/vi/catalog/ru_RU.KOI8-R
 ./usr/share/vi/catalog/spanish
 ./usr/share/vi/catalog/swedish
 ./usr/share/zoneinfo
@@ -2612,6 +2623,7 @@
 ./var/run
 ./var/rwho
 ./var/spool
+./var/spool/clientmqueue
 ./var/spool/ftp
 ./var/spool/ftp/bin
 ./var/spool/ftp/etc
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index f001f265664..71f1aee8f73 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -47,7 +47,9 @@
 ./etc/mail/aliases
 ./etc/mail/aliases.db
 ./etc/mail/helpfile
+./etc/mail/localhost.cf
 ./etc/mail/sendmail.cf
+./etc/mail/submit.cf
 ./etc/mailer.conf
 ./etc/man.conf
 ./etc/master.passwd
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 87ddd6d8b29..f87170ff803 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1562,6 +1562,7 @@
 ./usr/share/man/cat8/dmesg.0
 ./usr/share/man/cat8/dump.0
 ./usr/share/man/cat8/dumpfs.0
+./usr/share/man/cat8/editmap.0
 ./usr/share/man/cat8/edquota.0
 ./usr/share/man/cat8/ext_srvtab.0
 ./usr/share/man/cat8/faithd.0