From: Richard Levitte <levitte@openssl.org>
Date: Thu, 4 Feb 2016 18:41:56 +0000 (+0100)
Subject: Change the transfer perl module so the real module gets properly registered
X-Git-Tag: OpenSSL_1_1_0-pre3~273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1cc98f75bfaf16a3a1038cf36cb053f330e4ac30;p=thirdparty%2Fopenssl.git

Change the transfer perl module so the real module gets properly registered

This is an important move if scripts want to refer to the loaded
module without having perl think it needs to be loaded (again).

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

diff --git a/external/perl/transfer/Text/Template.pm b/external/perl/transfer/Text/Template.pm
index 13ed1eb1f71..3779df9fe9f 100644
--- a/external/perl/transfer/Text/Template.pm
+++ b/external/perl/transfer/Text/Template.pm
@@ -5,8 +5,9 @@
 BEGIN {
     use File::Spec::Functions;
     use File::Basename;
-    use lib catdir(dirname(__FILE__), "..", "..");
-    my $texttemplate = catfile("Text-Template-1.46", "lib", "Text", "Template.pm");
-    require $texttemplate;
+    use lib catdir(dirname(__FILE__), "..", "..",
+                   "Text-Template-1.46", "lib");
+    use Text::Template;
+    shift @INC;                 # Takes away the effect of use lib
 }
 1;