sync

18 files changed, 12 insertions, 33 deletions

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index f0bdfdb6985..99eaef49cb9 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -20,7 +20,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -31,7 +31,6 @@
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 2d14ae3409b..32a8502e01e 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -28,7 +28,6 @@
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
 ./usr/lib/libutil.so.4.2
diff --git a/distrib/sets/lists/base/md.atari b/distrib/sets/lists/base/md.atari
index 65ac97798c1..71932bf969e 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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -22,7 +22,6 @@
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.0.4
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.27.1
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 81c3222ed1e..d33aa33811c 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -25,7 +25,6 @@
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 32279d6f07c..02cfc46fd5e 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -21,7 +21,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.6.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libm_i387.so.0.1
@@ -33,7 +33,6 @@
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 8c957710436..499b534f8d8 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -29,7 +29,6 @@
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 06660faf10a..a29008e9e1f 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -25,7 +25,6 @@
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.pc532 b/distrib/sets/lists/base/md.pc532
index 462dcbed44b..296cc32f9da 100644
--- a/distrib/sets/lists/base/md.pc532
+++ b/distrib/sets/lists/base/md.pc532
@@ -13,7 +13,7 @@
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.4.0
 ./usr/lib/libkdb.so.5.0
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -22,7 +22,6 @@
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.0.4
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.27.1
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 46ee846ce11..3ccb391a055 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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -26,7 +26,6 @@
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
 ./usr/lib/libutil.so.4.2
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 7d41e38f1ee..3e872fd428a 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -28,7 +28,6 @@
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 0942094d4a8..7d9edf3b47d 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.2
+./usr/lib/libkrb.so.7.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.1
@@ -23,7 +23,6 @@
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
 ./usr/lib/libskey.so.0.4
-./usr/lib/libss.so.4.0
 ./usr/lib/libstdc++.so.27.1
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index cd7342d3172..0395f45af2f 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -126,7 +126,6 @@
 ./usr/lib/libresolv_pic.a
 ./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
-./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 4bf0c736f48..eeb70d21c38 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -126,7 +126,6 @@
 ./usr/lib/libresolv_pic.a
 ./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
-./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 30725e9eb9d..600f7e5a521 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -127,7 +127,6 @@
 ./usr/lib/libresolv_pic.a
 ./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
-./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index cf3a9aea4bd..a2c7f2c0c75 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -131,7 +131,6 @@
 ./usr/lib/libresolv_pic.a
 ./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
-./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 1a3a60a79d9..00fa5d623e9 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -127,7 +127,6 @@
 ./usr/lib/libresolv_pic.a
 ./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
-./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index b4f18a2b2cb..30d204a6127 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -115,7 +115,6 @@
 ./usr/lib/libresolv_pic.a
 ./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
-./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index e438c0bf634..4a68dccb3d0 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -117,6 +117,7 @@
 ./usr/include/dev/ic/opl3sa3.h
 ./usr/include/dev/ic/pdqreg.h
 ./usr/include/dev/ic/pdqvar.h
+./usr/include/dev/ic/s3_617.h
 ./usr/include/dev/ic/smc90cx6reg.h
 ./usr/include/dev/ic/smc93cx6var.h
 ./usr/include/dev/ic/uhareg.h
@@ -837,9 +838,6 @@
 ./usr/include/signal.h
 ./usr/include/skey.h
 ./usr/include/soundcard.h
-./usr/include/ss
-./usr/include/ss/ss.h
-./usr/include/ss/ss_err.h
 ./usr/include/stab.h
 ./usr/include/stdarg.h
 ./usr/include/stddef.h
@@ -1075,8 +1073,6 @@
 ./usr/lib/librx_p.a
 ./usr/lib/libskey.a
 ./usr/lib/libskey_p.a
-./usr/lib/libss.a
-./usr/lib/libss_p.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libtelnet.a