[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  4e351ca92e3a1f447cef3d2e330f13941f9412c6 (commit)
       via  f7dce50f21c13520d36f51bed83d19d3eb0bf698 (commit)
       via  e9bc5706744213a1a6748dbbcd1b43a6ad4ca09e (commit)
      from  3550d9159f0c89b2ae1c01e81e31649d1b357d06 (commit)


- Log -----------------------------------------------------------------
commit 4e351ca92e3a1f447cef3d2e330f13941f9412c6
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jul 9 21:10:10 2018 +0200

    util/dofile.pl: require Text::Template 1.46 or newer
    
    The reason is that we override Text::Template::append_text_to_output(),
    and it didn't exist before Text::Template 1.46.
    
    Fixes #6641
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6682)

commit f7dce50f21c13520d36f51bed83d19d3eb0bf698
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jul 9 21:09:30 2018 +0200

    Existing transfer modules must have a package and a $VERSION
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6682)

commit e9bc5706744213a1a6748dbbcd1b43a6ad4ca09e
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Jul 9 21:07:25 2018 +0200

    Make 'with_fallback' use 'use' instead of 'require'
    
    This enables us to require module versions, and to fall back to a
    bundled version if the system version is too low.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/6682)

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

Summary of changes:
 external/perl/transfer/Text/Template.pm | 3 +++
 util/dofile.pl                          | 2 +-
 util/perl/with_fallback.pm              | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/external/perl/transfer/Text/Template.pm b/external/perl/transfer/Text/Template.pm
index 7dbfe3f..fa2acc3 100644
--- a/external/perl/transfer/Text/Template.pm
+++ b/external/perl/transfer/Text/Template.pm
@@ -7,6 +7,9 @@
 
 # Quick transfer to the downloaded Text::Template
 
+package transfer::Text::Template;
+$VERSION = 1.46;
+
 BEGIN {
     use File::Spec::Functions;
     use File::Basename;
diff --git a/util/dofile.pl b/util/dofile.pl
index b0e2068..c3bc9ba 100644
--- a/util/dofile.pl
+++ b/util/dofile.pl
@@ -40,7 +40,7 @@ package OpenSSL::Template;
 use File::Basename;
 use File::Spec::Functions;
 use lib "$FindBin::Bin/perl";
-use with_fallback qw(Text::Template);
+use with_fallback "Text::Template 1.46";
 
 #use parent qw/Text::Template/;
 use vars qw/@ISA/;
diff --git a/util/perl/with_fallback.pm b/util/perl/with_fallback.pm
index 2af1d5f..fc5638d 100644
--- a/util/perl/with_fallback.pm
+++ b/util/perl/with_fallback.pm
@@ -8,15 +8,17 @@
 package with_fallback;
 
 sub import {
+    shift;
+
     use File::Basename;
     use File::Spec::Functions;
     foreach (@_) {
-	eval "require $_";
+	eval "use $_";
 	if ($@) {
 	    unshift @INC, catdir(dirname(__FILE__),
                                  "..", "..", "external", "perl");
 	    my $transfer = "transfer::$_";
-	    eval "require $transfer";
+	    eval "use $transfer";
 	    shift @INC;
 	    warn $@ if $@;
 	}