sync

16 files changed, 6 insertions, 18 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 00b3744726e..3a688140399 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1772,7 +1772,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index d0d08bc5f31..a76216be2b6 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1805,7 +1805,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 73cc90b6528..3dab0c1e6fe 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -1790,7 +1790,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 4d882850aca..1090fa4fe65 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1774,7 +1774,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 0a73e757922..34dcba9c1df 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1809,7 +1809,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 9f1a154d724..956ffa5995e 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1731,7 +1731,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 19848d3bc24..12030a51d5a 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1793,7 +1793,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 2128a3a3926..a11a43c204a 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1684,7 +1684,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 91f61794de1..c7b69d44e15 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1774,7 +1774,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index ea3303982a1..7b7fbb0eb30 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1790,7 +1790,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index af5ab22fe1d..5f90d509ad7 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1768,7 +1768,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 12f5638cc97..fde9687f9e6 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -1715,7 +1715,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 9ffc8fbfcde..45a46149cab 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1318,7 +1318,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/gost.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/idea.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/md5.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index fc4d73b07b0..8f498b83d88 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -616,7 +616,7 @@
 ./usr/lib
 ./usr/lib/libc.so.89.2
 ./usr/lib/libc.so.89.2.a
-./usr/lib/libcrypto.so.38.1
+./usr/lib/libcrypto.so.39.0
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -643,11 +643,11 @@
 ./usr/lib/librpcsvc.so.2.0
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.1
-./usr/lib/libssl.so.39.1
+./usr/lib/libssl.so.40.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.11.5
+./usr/lib/libtls.so.12.0
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -2431,6 +2431,7 @@
 ./usr/sbin/syslogc
 ./usr/sbin/syslogd
 ./usr/sbin/sysmerge
+./usr/sbin/syspatch
 ./usr/sbin/tcpdrop
 ./usr/sbin/tcpdump
 ./usr/sbin/tftp-proxy
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 4a6bbaae1ae..b2a62b2a1f1 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1122,7 +1122,6 @@
 ./usr/include/openssl/gost.h
 ./usr/include/openssl/hmac.h
 ./usr/include/openssl/idea.h
-./usr/include/openssl/krb5_asn.h
 ./usr/include/openssl/lhash.h
 ./usr/include/openssl/md4.h
 ./usr/include/openssl/md5.h
@@ -1734,6 +1733,7 @@
 ./usr/share/man/man3/ASN1_STRING_new.3
 ./usr/share/man/man3/ASN1_STRING_print_ex.3
 ./usr/share/man/man3/ASN1_generate_nconf.3
+./usr/share/man/man3/ASN1_time_parse.3
 ./usr/share/man/man3/BF_set_key.3
 ./usr/share/man/man3/BIO.3
 ./usr/share/man/man3/BIO_ctrl.3
@@ -1857,7 +1857,6 @@
 ./usr/share/man/man3/PKCS7_sign.3
 ./usr/share/man/man3/PKCS7_sign_add_signer.3
 ./usr/share/man/man3/PKCS7_verify.3
-./usr/share/man/man3/RAND.3
 ./usr/share/man/man3/RAND_add.3
 ./usr/share/man/man3/RAND_bytes.3
 ./usr/share/man/man3/RAND_cleanup.3
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index e6ffd547831..fb9fc54d51e 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2353,6 +2353,7 @@
 ./usr/share/man/man8/syslogc.8
 ./usr/share/man/man8/syslogd.8
 ./usr/share/man/man8/sysmerge.8
+./usr/share/man/man8/syspatch.8
 ./usr/share/man/man8/talkd.8
 ./usr/share/man/man8/tcpdrop.8
 ./usr/share/man/man8/tcpdump.8