sync

14 files changed, 1 insertions, 15 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index cfbd5433d40..18adaec55fe 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1750,7 +1750,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index ccf366a990f..2303b55a926 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1783,7 +1783,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 2b79c213b12..571207c232a 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -1768,7 +1768,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 139b9e6b205..e9964755379 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1752,7 +1752,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index c9c3aff9d8e..234940d4abb 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1786,7 +1786,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 29c7247df8e..45e056c4f48 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1709,7 +1709,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 7e582d2b98c..7cf38e50a61 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1771,7 +1771,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 5d2bc43218a..fd49bc8e33c 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1662,7 +1662,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index fda86f46aae..e1720849026 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1752,7 +1752,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index a80318f47a3..0bb9358cbe5 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1768,7 +1768,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index c6b699fc84e..8b3ca9bf975 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1746,7 +1746,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 78db33e4bbf..8d8de13e2f8 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -1693,7 +1693,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 4f44d2e5245..413cd01db8b 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1296,7 +1296,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/cast.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/chacha.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/cmac.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/cms.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/comp.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/conf.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/conf_api.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index d9aae5fd676..b1a9242187e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1100,7 +1100,6 @@
 ./usr/include/openssl/cast.h
 ./usr/include/openssl/chacha.h
 ./usr/include/openssl/cmac.h
-./usr/include/openssl/cms.h
 ./usr/include/openssl/comp.h
 ./usr/include/openssl/conf.h
 ./usr/include/openssl/conf_api.h
@@ -2644,6 +2643,7 @@
 ./usr/share/man/man3/x509.3
 ./usr/share/man/man3/xdr.3
 ./usr/share/man/man3/ypclnt.3
+./usr/share/man/man9/RBT_INIT.9
 ./usr/share/man/man9/SipHash24.9
 ./usr/share/man/man9/VOP_LOOKUP.9
 ./usr/share/man/man9/aml_evalnode.9
@@ -2790,7 +2790,6 @@
 ./usr/share/man/man9/vwaitforio.9
 ./usr/share/man/man9/vwakeup.9
 ./usr/share/man/man9/wdog_register.9
-./usr/share/misc/getopt
 ./usr/share/misc/gprof.callg
 ./usr/share/misc/gprof.flat
 ./usr/share/misc/operator