sync

13 files changed, 15 insertions, 10 deletions

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index ffa6a2b6efb..5f313bba022 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -19,7 +19,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index dcdd9620e81..a0072eefb34 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -19,7 +19,7 @@
 ./usr/lib/libkadm.so.4.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.5.0
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.atari b/distrib/sets/lists/base/md.atari
index 8a4ce0a6d44..9721a8b0513 100644
--- a/distrib/sets/lists/base/md.atari
+++ b/distrib/sets/lists/base/md.atari
@@ -13,7 +13,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 786e22153bf..5bd2ed456a1 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -16,7 +16,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index cbbee653999..e050fa69b57 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -24,7 +24,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libm_i387.so.0.1
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 6738af7a1fd..2b8dff1c812 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -17,7 +17,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 12b9675e4dd..e5f00dd0ed4 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -17,7 +17,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 2e6e50ad211..e013fa64be3 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -16,7 +16,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 6420fae5ae3..a3aa0e14723 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -18,7 +18,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 898d58d5db9..d3f6cdddd92 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -14,7 +14,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.0
+./usr/lib/libkrb.so.6.1
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 3f28cc6ae27..c1cd39e7ade 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1800,3 +1800,5 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
+./usr/libexec/smtpd
+./usr/libexec/smtpfwdd
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 62064a6c939..a6dc805ae7e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -2287,3 +2287,4 @@
 ./usr/share/mk/bsd.subdir.mk
 ./usr/share/mk/bsd.sys.mk
 ./var/db/libc.tags
+./usr/include/kerberosIV/krb-protos.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 57f6fddaa18..105482076ad 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -909,3 +909,5 @@
 ./usr/share/man/cat9/splstatclock.0
 ./usr/share/man/cat9/spltty.0
 ./usr/share/man/cat9/splx.0
+./usr/share/man/cat8/smtpd.0
+./usr/share/man/cat8/smtpfwdd.0