From: deraadt Date: Mon, 28 Jul 2014 20:35:32 +0000 (+0000) Subject: sync X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=c32fc973401915e1a23c92ce3e0cdb67282468d7;p=openbsd sync --- diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha index b9cf104f541..f2106ade171 100644 --- a/distrib/sets/lists/base/md.alpha +++ b/distrib/sets/lists/base/md.alpha @@ -1935,7 +1935,6 @@ ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index 95faf4aab03..fdde248dafe 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -1964,7 +1964,6 @@ ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish index b20b260c30d..426ab917494 100644 --- a/distrib/sets/lists/base/md.armish +++ b/distrib/sets/lists/base/md.armish @@ -1950,7 +1950,6 @@ ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/arm-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7 index 173fdc57b6c..96fbf7aaa87 100644 --- a/distrib/sets/lists/base/md.armv7 +++ b/distrib/sets/lists/base/md.armv7 @@ -1924,7 +1924,6 @@ ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/arm-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion index 07dc5b1ff70..e348a3df9a4 100644 --- a/distrib/sets/lists/base/md.aviion +++ b/distrib/sets/lists/base/md.aviion @@ -1849,7 +1849,6 @@ ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa index 8886a6b4b2b..7f998fe27f1 100644 --- a/distrib/sets/lists/base/md.hppa +++ b/distrib/sets/lists/base/md.hppa @@ -1937,7 +1937,6 @@ ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64 index 184833cf11b..d8f63ab0a87 100644 --- a/distrib/sets/lists/base/md.hppa64 +++ b/distrib/sets/lists/base/md.hppa64 @@ -1867,7 +1867,6 @@ ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386 index 6547bdf36e4..b474f25effb 100644 --- a/distrib/sets/lists/base/md.i386 +++ b/distrib/sets/lists/base/md.i386 @@ -1970,7 +1970,6 @@ ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/i386-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk index 0a64f7225f3..9ad618681b1 100644 --- a/distrib/sets/lists/base/md.landisk +++ b/distrib/sets/lists/base/md.landisk @@ -1889,7 +1889,6 @@ ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/sh-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson index d4ca73b8661..1e876b65e1e 100644 --- a/distrib/sets/lists/base/md.loongson +++ b/distrib/sets/lists/base/md.loongson @@ -1951,7 +1951,6 @@ ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k index 1bd31927dc8..26fe4b1e9a0 100644 --- a/distrib/sets/lists/base/md.luna88k +++ b/distrib/sets/lists/base/md.luna88k @@ -1849,7 +1849,6 @@ ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc index 50e37fa1bae..52bfe031c84 100644 --- a/distrib/sets/lists/base/md.macppc +++ b/distrib/sets/lists/base/md.macppc @@ -1938,7 +1938,6 @@ ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon index 7c45d997756..c3eafd82791 100644 --- a/distrib/sets/lists/base/md.octeon +++ b/distrib/sets/lists/base/md.octeon @@ -1915,7 +1915,6 @@ ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi index 667ccb847ef..f5fc0c8be01 100644 --- a/distrib/sets/lists/base/md.sgi +++ b/distrib/sets/lists/base/md.sgi @@ -1926,7 +1926,6 @@ ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc index 12aade32871..74397dd52bb 100644 --- a/distrib/sets/lists/base/md.socppc +++ b/distrib/sets/lists/base/md.socppc @@ -1878,7 +1878,6 @@ ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc index ab6e08449c4..8698b45910c 100644 --- a/distrib/sets/lists/base/md.sparc +++ b/distrib/sets/lists/base/md.sparc @@ -1364,7 +1364,6 @@ ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 334d8ee510c..c9ed14305d8 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -1422,7 +1422,6 @@ ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax index 3ac0247c745..73de3c87213 100644 --- a/distrib/sets/lists/base/md.vax +++ b/distrib/sets/lists/base/md.vax @@ -1251,7 +1251,6 @@ ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/vax-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus index e5af0554d4c..47d9f5129e8 100644 --- a/distrib/sets/lists/base/md.zaurus +++ b/distrib/sets/lists/base/md.zaurus @@ -1904,7 +1904,6 @@ ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rsa.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/safestack.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/sha.ph -./usr/libdata/perl5/site_perl/arm-openbsd/openssl/srp.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/srtp.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ssl.ph ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ssl2.ph diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index f8514191d64..37afad8ef90 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1189,7 +1189,6 @@ ./usr/include/openssl/rsa.h ./usr/include/openssl/safestack.h ./usr/include/openssl/sha.h -./usr/include/openssl/srp.h ./usr/include/openssl/srtp.h ./usr/include/openssl/ssl.h ./usr/include/openssl/ssl2.h