From: Richard Levitte <levitte@openssl.org>
Date: Tue, 28 Apr 2015 18:39:09 +0000 (+0200)
Subject: Add version numbers on some modules we use.
X-Git-Tag: OpenSSL_1_1_0-pre1~668
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb921436f3dc03daf4a7ac1fec9f1e458772e17b;p=thirdparty%2Fopenssl.git

Add version numbers on some modules we use.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/test/recipes/00-check_testexes.t b/test/recipes/00-check_testexes.t
index 5f8f1138ccb..6f3ced323ff 100644
--- a/test/recipes/00-check_testexes.t
+++ b/test/recipes/00-check_testexes.t
@@ -3,7 +3,7 @@
 use strict;
 
 use File::Spec::Functions;
-use Test::More;
+use Test::More 0.96;
 
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
diff --git a/test/recipes/10-test_bn.t b/test/recipes/10-test_bn.t
index 6dce97327b4..2c42cacf6ad 100644
--- a/test/recipes/10-test_bn.t
+++ b/test/recipes/10-test_bn.t
@@ -5,7 +5,7 @@ use warnings;
 
 use Math::BigInt;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_bn");
diff --git a/test/recipes/15-test_dsa.t b/test/recipes/15-test_dsa.t
index 897e4480cb1..809579c7b9f 100644
--- a/test/recipes/15-test_dsa.t
+++ b/test/recipes/15-test_dsa.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_dsa");
diff --git a/test/recipes/15-test_ec.t b/test/recipes/15-test_ec.t
index 6619a480d33..2de47c1304e 100644
--- a/test/recipes/15-test_ec.t
+++ b/test/recipes/15-test_ec.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_ec");
diff --git a/test/recipes/15-test_rsa.t b/test/recipes/15-test_rsa.t
index 9b17fbef9da..c686a66a50c 100644
--- a/test/recipes/15-test_rsa.t
+++ b/test/recipes/15-test_rsa.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_rsa");
diff --git a/test/recipes/20-test_enc.t b/test/recipes/20-test_enc.t
index 813e20120e4..e423152f1ed 100644
--- a/test/recipes/20-test_enc.t
+++ b/test/recipes/20-test_enc.t
@@ -7,7 +7,7 @@ use File::Spec::Functions qw/catfile/;
 use File::Copy;
 use File::Compare qw/compare_text/;
 use File::Basename;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_enc");
diff --git a/test/recipes/25-test_crl.t b/test/recipes/25-test_crl.t
index 3bcd2d1e4a4..42a59419b4d 100644
--- a/test/recipes/25-test_crl.t
+++ b/test/recipes/25-test_crl.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_crl");
diff --git a/test/recipes/25-test_gen.t b/test/recipes/25-test_gen.t
index 2f50ee4cb30..4387bf5886d 100644
--- a/test/recipes/25-test_gen.t
+++ b/test/recipes/25-test_gen.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_gen");
diff --git a/test/recipes/25-test_pkcs7.t b/test/recipes/25-test_pkcs7.t
index 586c9180fb3..7dc1eb79274 100644
--- a/test/recipes/25-test_pkcs7.t
+++ b/test/recipes/25-test_pkcs7.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_pkcs7");
diff --git a/test/recipes/25-test_req.t b/test/recipes/25-test_req.t
index 50c18a9c1bb..5e4ea476d90 100644
--- a/test/recipes/25-test_req.t
+++ b/test/recipes/25-test_req.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_req");
diff --git a/test/recipes/25-test_sid.t b/test/recipes/25-test_sid.t
index 710eab429ac..d09ae56d520 100644
--- a/test/recipes/25-test_sid.t
+++ b/test/recipes/25-test_sid.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_sid");
diff --git a/test/recipes/25-test_verify.t b/test/recipes/25-test_verify.t
index 032a932b46f..a88097c1eef 100644
--- a/test/recipes/25-test_verify.t
+++ b/test/recipes/25-test_verify.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec::Functions qw/canonpath/;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
 
 setup("test_verify");
diff --git a/test/recipes/25-test_x509.t b/test/recipes/25-test_x509.t
index 5098db46f00..b11feb07ae6 100644
--- a/test/recipes/25-test_x509.t
+++ b/test/recipes/25-test_x509.t
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use File::Spec;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_x509");
diff --git a/test/recipes/30-test_engine.t b/test/recipes/30-test_engine.t
index 420c19a868f..c2e636754e3 100644
--- a/test/recipes/30-test_engine.t
+++ b/test/recipes/30-test_engine.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test;
 
 setup("test_engine");
diff --git a/test/recipes/30-test_evp.t b/test/recipes/30-test_evp.t
index bd135f8dd05..eedd78c2356 100644
--- a/test/recipes/30-test_evp.t
+++ b/test/recipes/30-test_evp.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
 setup("test_evp");
diff --git a/test/recipes/30-test_evp_extra.t b/test/recipes/30-test_evp_extra.t
index 60e2d38c5b5..385e0545542 100644
--- a/test/recipes/30-test_evp_extra.t
+++ b/test/recipes/30-test_evp_extra.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test;
 
 setup("test_evp_extra");
diff --git a/test/recipes/80-test_ca.t b/test/recipes/80-test_ca.t
index 6278672e8cc..446427f01f6 100644
--- a/test/recipes/80-test_ca.t
+++ b/test/recipes/80-test_ca.t
@@ -5,8 +5,8 @@ use warnings;
 
 use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile devnull/;
-use File::Path qw/remove_tree/;
-use Test::More;
+use File::Path 2.00 qw/remove_tree/;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT cmdstr top_file quotify/;
 
 setup("test_ca");
diff --git a/test/recipes/80-test_cms.t b/test/recipes/80-test_cms.t
index 1775ac40676..32a68ed1b3a 100644
--- a/test/recipes/80-test_cms.t
+++ b/test/recipes/80-test_cms.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/catfile/;
 use File::Compare qw/compare_text/;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_dir top_file/;
 
 setup("test_cms");
diff --git a/test/recipes/80-test_ocsp.t b/test/recipes/80-test_ocsp.t
index cc4e56f08a0..02e7aa2f88d 100644
--- a/test/recipes/80-test_ocsp.t
+++ b/test/recipes/80-test_ocsp.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/devnull catfile/;
 use File::Copy;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT with pipe top_dir/;
 
 setup("test_ocsp");
diff --git a/test/recipes/80-test_ssl.t b/test/recipes/80-test_ssl.t
index 6b3a15766ea..380e54ac697 100644
--- a/test/recipes/80-test_ssl.t
+++ b/test/recipes/80-test_ssl.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec;
 use File::Copy;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT with top_file/;
 
 setup("test_ssl");
diff --git a/test/recipes/80-test_tsa.t b/test/recipes/80-test_tsa.t
index 132209713f3..524c0e92f83 100644
--- a/test/recipes/80-test_tsa.t
+++ b/test/recipes/80-test_tsa.t
@@ -6,7 +6,7 @@ use warnings;
 use POSIX;
 use File::Spec::Functions qw/splitdir curdir catfile/;
 use File::Compare;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT cmdstr top_file/;
 
 setup("test_tsa");
diff --git a/test/recipes/90-test_gost2814789.t b/test/recipes/90-test_gost2814789.t
index b09e062cc7b..72613e1cc37 100644
--- a/test/recipes/90-test_gost2814789.t
+++ b/test/recipes/90-test_gost2814789.t
@@ -2,7 +2,7 @@
 
 use strict;
 use warnings;
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test qw/:DEFAULT top_dir/;
 
 setup("test_gost2814789");
diff --git a/test/recipes/tconversion.pl b/test/recipes/tconversion.pl
index 94039e932b2..32eda36dac0 100644
--- a/test/recipes/tconversion.pl
+++ b/test/recipes/tconversion.pl
@@ -5,7 +5,7 @@ use warnings;
 
 use File::Compare qw/compare_text/;
 use File::Copy;
-use Test::More;
+use Test::More 0.96;
 use lib 'testlib';
 use OpenSSL::Test qw/:DEFAULT top_file/;
 
diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index ad8b04dff90..644f4dd6a5a 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -15,8 +15,8 @@ use File::Copy;
 use File::Spec::Functions qw/file_name_is_absolute curdir canonpath splitdir
                              catdir catfile splitpath catpath devnull abs2rel
                              rel2abs/;
-use File::Path qw/remove_tree mkpath/;
-use Test::More;
+use File::Path 2.00 qw/remove_tree mkpath/;
+use Test::More 0.96;
 
 
 my $test_name = undef;
diff --git a/test/testlib/OpenSSL/Test/Simple.pm b/test/testlib/OpenSSL/Test/Simple.pm
index 94f6cf935b2..be86ca2cb25 100644
--- a/test/testlib/OpenSSL/Test/Simple.pm
+++ b/test/testlib/OpenSSL/Test/Simple.pm
@@ -10,7 +10,7 @@ $VERSION = "0.1";
 @EXPORT = qw(simple_test);
 
 
-use Test::More;
+use Test::More 0.96;
 use OpenSSL::Test;
 
 # args: