[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  c680f77fb181483d6d6ceee8c60eac6e568898c0 (commit)
      from  a76265574398944d686d2d0de9bacca162f555ca (commit)


- Log -----------------------------------------------------------------
commit c680f77fb181483d6d6ceee8c60eac6e568898c0
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 12 04:23:15 2016 +0100

    Adjust transfer::Text::Template.pm for alternate directory name
    
    On VMS, periods in directory names weren't allowed.  To counter that,
    unpackers such as VMSTAR convert periods in directory names to
    underscores.  We need to count that in and add an alternative library
    path for Text::Template.
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 external/perl/transfer/Text/Template.pm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/external/perl/transfer/Text/Template.pm b/external/perl/transfer/Text/Template.pm
index 3779df9..d018e6b 100644
--- a/external/perl/transfer/Text/Template.pm
+++ b/external/perl/transfer/Text/Template.pm
@@ -5,9 +5,11 @@
 BEGIN {
     use File::Spec::Functions;
     use File::Basename;
-    use lib catdir(dirname(__FILE__), "..", "..",
-                   "Text-Template-1.46", "lib");
+    use lib catdir(dirname(__FILE__), "..", "..", "Text-Template-1.46", "lib");
+    # Some unpackers on VMS convert periods in directory names to underscores
+    use lib catdir(dirname(__FILE__), "..", "..", "Text-Template-1_46", "lib");
     use Text::Template;
     shift @INC;                 # Takes away the effect of use lib
+    shift @INC;                 # Takes away the effect of use lib
 }
 1;