sync

13 files changed, 33 insertions, 46 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index b2a0c060a73..4b1fe8868c5 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -47,10 +47,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1438,7 +1438,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 425b6ca8c0f..ac87fbacb16 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -42,10 +42,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1453,7 +1453,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 23b53a34e73..8dcceab719e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -41,10 +41,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1449,7 +1449,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index cbef69763b8..3fb88e0299e 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1351,7 +1351,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index e35e2889560..0359b835a27 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -48,10 +48,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1440,7 +1440,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 13fbc3d9fad..12a1f37c812 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -43,10 +43,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1460,7 +1460,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 47e16019244..84e9ea48d2b 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -50,10 +50,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1439,7 +1439,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index df664690957..21e90a0ff63 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -41,10 +41,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1453,7 +1453,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 508c14db9a7..d61418a7dfc 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -46,10 +46,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1379,7 +1379,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index da4ab1801bc..2a35b74a59e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -42,10 +42,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1037,7 +1037,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index d4cb281beec..b98ccff0d25 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -43,10 +43,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1038,7 +1038,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 8bbd1ffbcbf..3266d63cf27 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -41,10 +41,10 @@
 ./usr/lib/libg2c.so.6.0
 ./usr/lib/libgssapi.so.1.0
 ./usr/lib/libiberty.so.4.2
-./usr/lib/libkadm.so.6.0
-./usr/lib/libkafs.so.8.0
+./usr/lib/libkadm.so.7.0
+./usr/lib/libkafs.so.9.0
 ./usr/lib/libkdb.so.6.0
-./usr/lib/libkrb.so.9.0
+./usr/lib/libkrb.so.10.0
 ./usr/lib/libkrb5.so.4.0
 ./usr/lib/libkvm.so.6.0
 ./usr/lib/libm.so.0.1
@@ -1411,7 +1411,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/netinet6/ip6_var.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index c71ad2ac2b2..6768d965f31 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -978,7 +978,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/in6.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/in6_gif.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/in6_ifattach.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/in6_prefix.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/in6_var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/ip6_mroute.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/netinet6/ip6_var.ph