[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4500a4cd4d89ba338ad796d39ccb9d94794cc0d7 (commit)
       via  dca99383c2836d538c6d0129bb42401d86c8775b (commit)
      from  dd9589740d54b81c5aef6c7f5fa28f68f23fb27f (commit)


- Log -----------------------------------------------------------------
commit 4500a4cd4d89ba338ad796d39ccb9d94794cc0d7
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 8 16:44:48 2016 +0100

    Use File::Path::rmtree rather than File::Path::remove_tree
    
    Just like File::Path::make_path, File::Path::remove_tree didn't show
    up before File::Path 2.06 / perl v5.10.1, so we prefer the legacy
    function here as well.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

commit dca99383c2836d538c6d0129bb42401d86c8775b
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Feb 8 16:27:15 2016 +0100

    Use File::Path::mkpath rather than File::Path::make_path
    
    File::Path::make_path didn't show up before File::Path 2.06 / perl v5.10.1.
    Because we're trying to stay compatible with perl v5.10.0 and up,
    it's better to use the legacy interface.
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure                    | 10 +++++-----
 test/testlib/OpenSSL/Test.pm |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Configure b/Configure
index 0595e71..9954858 100755
--- a/Configure
+++ b/Configure
@@ -11,7 +11,7 @@ require 5.000;
 use strict;
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
-use File::Path qw/make_path/;
+use File::Path qw/mkpath/;
 use Cwd qw/:DEFAULT realpath/;
 
 # see INSTALL for instructions.
@@ -1172,7 +1172,7 @@ if ($target{build_scheme}->[0] eq "unified") {
         my $dir = shift;
 
         # Required, because realpath only works properly with existing dirs
-        make_path($dir);
+        mkpath($dir);
 
         my $res = realpath($dir);
         return $res;
@@ -1216,7 +1216,7 @@ if ($target{build_scheme}->[0] eq "unified") {
         my $sourced = catdir($srcdir, $_->[0]);
         my $buildd = catdir($blddir, $_->[0]);
 
-        make_path($buildd);
+        mkpath($buildd);
 
         my $f = $_->[1];
         # The basic things we're trying to build
@@ -1688,11 +1688,11 @@ print "THIRTY_TWO_BIT mode\n" if $config{b32};
 print "BN_LLONG mode\n" if $config{bn_ll};
 print "RC4 uses $config{rc4_int}\n" if $config{rc4_int} != $def_int;
 
-make_path(catdir($blddir, "include/openssl"));
+mkpath(catdir($blddir, "include/openssl"));
 run_dofile(catfile($blddir, "include/openssl/opensslconf.h"),
            catfile($srcdir, "include/openssl/opensslconf.h.in"));
 
-make_path(catdir($blddir, "crypto/include/internal"));
+mkpath(catdir($blddir, "crypto/include/internal"));
 foreach my $alg ( 'bn' ) {
     run_dofile(catfile($blddir, "crypto/include/internal/${alg}_conf.h"),
                catfile($srcdir, "crypto/include/internal/${alg}_conf.h.in"));
diff --git a/test/testlib/OpenSSL/Test.pm b/test/testlib/OpenSSL/Test.pm
index 297de86..80b9a2f 100644
--- a/test/testlib/OpenSSL/Test.pm
+++ b/test/testlib/OpenSSL/Test.pm
@@ -46,7 +46,7 @@ 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 2.00 qw/remove_tree mkpath/;
+use File::Path 2.00 qw/rmtree mkpath/;
 
 
 # The name of the test.  This is set by setup() and is used in the other
@@ -189,7 +189,7 @@ sub indir {
     __cwd($reverse);
 
     if ($opts{cleanup}) {
-	remove_tree($subdir, { safe => 0 });
+	rmtree($subdir, { safe => 0 });
     }
 }
 
@@ -674,7 +674,7 @@ sub __cwd {
     return undef unless chdir($dir);
 
     if ($opts{cleanup}) {
-	remove_tree(".", { safe => 0, keep_root => 1 });
+	rmtree(".", { safe => 0, keep_root => 1 });
     }
 
     # For each of these directory variables, figure out where they are relative