sync

22 files changed, 26 insertions, 1 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 7210e6ad826..4c5ca85a29b 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -2461,6 +2461,7 @@
 ./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 927f81bfb9f..3cfffc9853d 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -2488,6 +2488,7 @@
 ./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 c8e7da2663a..6bb787c8bc7 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -28,6 +28,8 @@
 ./etc/firmware/tusb3410
 ./etc/firmware/tusb3410-license
 ./etc/firmware/udl_huffman
+./etc/firmware/uyap
+./etc/firmware/uyap-license
 ./etc/firmware/zd1211
 ./etc/firmware/zd1211-license
 ./etc/firmware/zd1211b
@@ -2477,6 +2479,7 @@
 ./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 cad34c234aa..8e55da9a299 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -2278,6 +2278,7 @@
 ./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 1951eb732aa..a786da7858e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -2410,6 +2410,7 @@
 ./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 acb8ca8ec4c..c7cc33b0d43 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -2460,6 +2460,7 @@
 ./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 d2572a46f6f..90dfdc0c847 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -2460,6 +2460,7 @@
 ./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 79ce2a56311..a4c680813da 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -2496,6 +2496,7 @@
 ./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 68a99bfae99..1284eb1f7f4 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -2471,6 +2471,7 @@
 ./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 ccac5d2c6e6..cd95b05e24d 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -2476,6 +2476,7 @@
 ./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 3b61872cbda..48deebba63f 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -2271,5 +2271,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/sbin/wsconscfg
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index be70a84fa51..9a06908a779 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -2414,6 +2414,7 @@
 ./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 99e919b5ae1..8c0360a3453 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -2503,6 +2503,7 @@
 ./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 c10e98ecd65..73cc41e050f 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -2410,6 +2410,7 @@
 ./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 99fd82f0334..5b611c7f603 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -2321,6 +2321,7 @@
 ./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 8b91dc33439..bac1a6f4379 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -26,6 +26,7 @@
 ./etc/firmware/tusb3410
 ./etc/firmware/tusb3410-license
 ./etc/firmware/udl_huffman
+./etc/firmware/uyap-license
 ./etc/firmware/zd1211
 ./etc/firmware/zd1211-license
 ./etc/firmware/zd1211b
@@ -2476,6 +2477,7 @@
 ./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 6e57887aebe..f5286f24437 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -2504,6 +2504,7 @@
 ./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 61b5722cba0..38a37c8e1c1 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -2492,6 +2492,7 @@
 ./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 b9cd5383326..787afe1e764 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -2395,6 +2395,7 @@
 ./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 b132343d70f..ce383f6ac50 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -2466,6 +2466,7 @@
 ./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 fc242a055fa..d8531935986 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -26,6 +26,8 @@
 ./etc/firmware/tusb3410
 ./etc/firmware/tusb3410-license
 ./etc/firmware/udl_huffman
+./etc/firmware/uyap
+./etc/firmware/uyap-license
 ./etc/firmware/zd1211
 ./etc/firmware/zd1211-license
 ./etc/firmware/zd1211b
@@ -2476,6 +2478,7 @@
 ./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 028e37a29ed..d0c88e6d143 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -2058,7 +2058,6 @@
 ./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