sync

13 files changed, 50 insertions, 18 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c40c1c8fa10..1d37f0ce246 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -35,7 +35,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -61,7 +61,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1806,6 +1806,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 6774388a3a0..af90a87b258 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -29,7 +29,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -55,7 +55,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1816,6 +1816,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index d62f409f093..40db0f24fe3 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1722,6 +1722,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 80c31f8bbc4..d0b3695275d 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -36,7 +36,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -62,7 +62,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1807,6 +1807,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 66ce919a42c..fe474f16e7a 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -30,7 +30,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -56,7 +56,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1825,6 +1825,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d800827d216..733107fb962 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -38,7 +38,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -64,7 +64,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1846,6 +1846,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 013e5d1e5b9..173b50383ee 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -29,7 +29,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -55,7 +55,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1820,6 +1820,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 752a814ce05..8f317ddcb75 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -613,6 +613,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/readpassphrase.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sectok.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/semaphore.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ssl/aes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ssl/conf_api.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 4a2fab43932..8cd596d4bb0 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -34,7 +34,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -60,7 +60,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.1.0
@@ -1794,6 +1794,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index e477a4987ee..85ebb3f9f4b 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -31,7 +31,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -57,7 +57,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1241,6 +1241,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index bc780ae2da2..21da4f56a1f 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -32,7 +32,7 @@
 ./usr/lib/lib45.so.2.0
 ./usr/lib/libacl.so.6.0
 ./usr/lib/libasn1.so.3.0
-./usr/lib/libc.so.29.1
+./usr/lib/libc.so.30.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
 ./usr/lib/libcurses.so.9.0
@@ -58,7 +58,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.0
-./usr/lib/libpthread.so.1.1
+./usr/lib/libpthread.so.2.0
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -1242,6 +1242,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 9120e33fdb6..0f32f11aaa6 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1179,6 +1179,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/setjmp.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sgtty.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sha1.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/sha2.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/signal.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/skey.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/skipjack.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index bf6a3df8229..f9a9d55231f 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1263,6 +1263,7 @@
 ./usr/include/setjmp.h
 ./usr/include/sgtty.h
 ./usr/include/sha1.h
+./usr/include/sha2.h
 ./usr/include/signal.h
 ./usr/include/skey.h
 ./usr/include/skipjack.h
@@ -2409,6 +2410,24 @@
 ./usr/share/man/cat3/SHA1_Final.0
 ./usr/share/man/cat3/SHA1_Init.0
 ./usr/share/man/cat3/SHA1_Update.0
+./usr/share/man/cat3/SHA256_Data.0
+./usr/share/man/cat3/SHA256_End.0
+./usr/share/man/cat3/SHA256_File.0
+./usr/share/man/cat3/SHA256_Final.0
+./usr/share/man/cat3/SHA256_Init.0
+./usr/share/man/cat3/SHA256_Update.0
+./usr/share/man/cat3/SHA384_Data.0
+./usr/share/man/cat3/SHA384_End.0
+./usr/share/man/cat3/SHA384_File.0
+./usr/share/man/cat3/SHA384_Final.0
+./usr/share/man/cat3/SHA384_Init.0
+./usr/share/man/cat3/SHA384_Update.0
+./usr/share/man/cat3/SHA512_Data.0
+./usr/share/man/cat3/SHA512_End.0
+./usr/share/man/cat3/SHA512_File.0
+./usr/share/man/cat3/SHA512_Final.0
+./usr/share/man/cat3/SHA512_Init.0
+./usr/share/man/cat3/SHA512_Update.0
 ./usr/share/man/cat3/SIMPLEQ_EMPTY.0
 ./usr/share/man/cat3/SIMPLEQ_END.0
 ./usr/share/man/cat3/SIMPLEQ_ENTRY.0
@@ -4327,6 +4346,7 @@
 ./usr/share/man/cat3/setvbuf.0
 ./usr/share/man/cat3/sevenbit.0
 ./usr/share/man/cat3/sha1.0
+./usr/share/man/cat3/sha2.0
 ./usr/share/man/cat3/show_panel.0
 ./usr/share/man/cat3/sigaddset.0
 ./usr/share/man/cat3/sigblock.0