sync

22 files changed, 1 insertions, 21 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 4c5ca85a29b..7210e6ad826 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -2461,7 +2461,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/alpha-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 3cfffc9853d..927f81bfb9f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -2488,7 +2488,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/amd64-openbsd
 ./usr/mdec/biosboot
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 6bb787c8bc7..866fb08eb6f 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -2479,7 +2479,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/arm-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 8e55da9a299..cad34c234aa 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -2278,7 +2278,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/wctype.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zlib.ph
-./usr/libexec/ssh-pkcs11-helper
 ./usr/local/libdata/perl5/site_perl/m88k-openbsd
 ./usr/mdec/a2coff
 ./usr/mdec/netboot
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index a786da7858e..1951eb732aa 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -2410,7 +2410,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
 ./usr/mdec/bootct
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index c7cc33b0d43..acb8ca8ec4c 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -2460,7 +2460,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/hppa-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 90dfdc0c847..d2572a46f6f 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -2460,7 +2460,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/hppa64-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index a4c680813da..79ce2a56311 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -2496,7 +2496,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/i386-openbsd
 ./usr/mdec/biosboot
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 1284eb1f7f4..68a99bfae99 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -2471,7 +2471,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/sh-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index cd95b05e24d..ccac5d2c6e6 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -2476,7 +2476,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/mips64el-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 48deebba63f..3b61872cbda 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -2271,6 +2271,5 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/wctype.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zlib.ph
-./usr/libexec/ssh-pkcs11-helper
 ./usr/local/libdata/perl5/site_perl/m88k-openbsd
 ./usr/sbin/wsconscfg
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 9a06908a779..be70a84fa51 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -2414,7 +2414,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
 ./usr/sbin/wsconscfg
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 8c0360a3453..99e919b5ae1 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -2503,7 +2503,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/powerpc-openbsd
 ./usr/mdec/boot.mac
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 73cc41e050f..c10e98ecd65 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -2410,7 +2410,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
 ./usr/mdec/bootsd
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 5b611c7f603..99fd82f0334 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -2321,7 +2321,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/powerpc-openbsd
 ./usr/mdec/bootsd
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index bac1a6f4379..8bc0f47aa04 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -2477,7 +2477,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/arm-openbsd
 ./usr/mdec/zboot
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index f5286f24437..6e57887aebe 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -2504,7 +2504,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/mips64-openbsd
 ./usr/mdec/boot-IP27
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 38a37c8e1c1..61b5722cba0 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -2492,7 +2492,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/powerpc-openbsd
 ./usr/mdec/boot
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 787afe1e764..b9cd5383326 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -2395,7 +2395,6 @@
 ./usr/libdata/perl5/sparc-openbsd/5.10.1/threads.pm
 ./usr/libdata/perl5/sparc-openbsd/5.10.1/threads/shared.pm
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/sparc-openbsd
 ./usr/mdec/binstall
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index ce383f6ac50..b132343d70f 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -2466,7 +2466,6 @@
 ./usr/libdata/perl5/sparc64-openbsd/5.10.1/threads.pm
 ./usr/libdata/perl5/sparc64-openbsd/5.10.1/threads/shared.pm
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/sparc64-openbsd
 ./usr/mdec/bootblk
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index d8531935986..66ac0fe1663 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -2478,7 +2478,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zlib.ph
 ./usr/libexec/ld.so
-./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/arm-openbsd
 ./usr/mdec/zboot
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index d0c88e6d143..028e37a29ed 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -2058,6 +2058,7 @@
 ./usr/libexec/spamlogd
 ./usr/libexec/spellprog
 ./usr/libexec/ssh-keysign
+./usr/libexec/ssh-pkcs11-helper
 ./usr/libexec/tcpd
 ./usr/libexec/tftp-proxy
 ./usr/libexec/tftpd