sync

11 files changed, 16 insertions, 12 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 3945dd8f02f..4b69dfda9b0 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -51,7 +51,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 5fc4a19ef0b..d190fa9f1a7 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -62,7 +62,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 884350c65d1..c2af4d86701 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -60,7 +60,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index fea0243613e..aa1a1318f8c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -71,7 +71,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 68886bc1bdc..f7cb3b45945 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -60,7 +60,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 54243f627d4..8c65dbc37ef 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -60,7 +60,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index b2261f4a0c8..d0faa82e181 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -48,7 +48,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.4.1
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 9e38bb47d67..f9e1c8d02c1 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -56,7 +56,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index a7ddb612b7a..e45c5870a30 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -4,7 +4,6 @@
 ./dev/scan0
 ./dev/scan1
 ./dev/sound
-./sbin/edlabel
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
@@ -66,7 +65,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 73cd8646bcc..f16f6ea817c 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -3,7 +3,6 @@
 ./dev/vme16
 ./dev/vme24
 ./dev/vme32
-./sbin/edlabel
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
@@ -65,7 +64,7 @@
 ./usr/lib/libpcap.so.1.1
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
-./usr/lib/libsectok.so.2.0
+./usr/lib/libsectok.so.3.0
 ./usr/lib/libskey.so.2.0
 ./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 5c8b7ead96e..c4c02fa2c1d 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -4288,8 +4288,10 @@
 ./usr/share/man/cat9/disk_resetstat.0
 ./usr/share/man/cat9/disk_unbusy.0
 ./usr/share/man/cat9/disklabel.0
+./usr/share/man/cat9/dohooks.0
 ./usr/share/man/cat9/dopowerhooks.0
 ./usr/share/man/cat9/doshutdownhooks.0
+./usr/share/man/cat9/dostartuphooks.0
 ./usr/share/man/cat9/extent.0
 ./usr/share/man/cat9/extent_alloc.0
 ./usr/share/man/cat9/extent_alloc_region.0
@@ -4308,6 +4310,8 @@
 ./usr/share/man/cat9/fusword.0
 ./usr/share/man/cat9/fuword.0
 ./usr/share/man/cat9/gsignal.0
+./usr/share/man/cat9/hook_disestablish.0
+./usr/share/man/cat9/hook_establish.0
 ./usr/share/man/cat9/hz.0
 ./usr/share/man/cat9/hzto.0
 ./usr/share/man/cat9/inittodr.0
@@ -4366,6 +4370,8 @@
 ./usr/share/man/cat9/spltty.0
 ./usr/share/man/cat9/splx.0
 ./usr/share/man/cat9/sprintf.0
+./usr/share/man/cat9/startuphook_disestablish.0
+./usr/share/man/cat9/startuphook_establish.0
 ./usr/share/man/cat9/stathz.0
 ./usr/share/man/cat9/store.0
 ./usr/share/man/cat9/style.0