perl paranoia about @INC

(cherry picked from commit 4d3d955f2791199b35704c3e9784dc99fd229696)
Signed-off-by: Phil Pennock <pdp@exim.org>

diff --git a/src/src/convert4r3.src b/src/src/convert4r3.src
index 810b3374fc778ebfc9ee54a4fc2f6de071ad3287..632eb70d761e7e7f3b0637c92ad71ce1bf4e5878 100755 (executable)
--- a/src/src/convert4r3.src
+++ b/src/src/convert4r3.src
@@ -8,6 +8,7 @@
 # It is assumed that the input is a valid Exim configuration file.
 
 use warnings;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 
 ##################################################
 #             Analyse one line                   #

diff --git a/src/src/convert4r4.src b/src/src/convert4r4.src
index 8075602cb637ac73939f5b167f54b09bbd4be978..fff4e478bc3f649222b24e6f3bde71b50ce8cb64 100755 (executable)
--- a/src/src/convert4r4.src
+++ b/src/src/convert4r4.src
@@ -7,6 +7,7 @@
 # It is assumed that the input is a valid Exim 3 configuration file.
 
 use warnings;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 
 # These are lists of main options which are abolished in Exim 4.
 # The first contains options that are used to construct new options.

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index e8857126e77f9beb546960b3d4425173ac987249..faa5cb73b53a1bbdfd3cd75fcba9eb7003289f6d 100644 (file)
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -2,6 +2,7 @@
 
 use warnings;
 use strict;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 
 # Copyright (c) 2007-2015 University of Cambridge.
 # See the file NOTICE for conditions of use and distribution.

diff --git a/src/src/exim_checkaccess.src b/src/src/exim_checkaccess.src
index 84d03c0b354d85d3fa54d03898db4420a286b9f3..a780a298a4209ec0e22cf14d978022c45fd2b1ca 100755 (executable)
--- a/src/src/exim_checkaccess.src
+++ b/src/src/exim_checkaccess.src
@@ -63,6 +63,7 @@ if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
 
 PERL_COMMAND - $exim_path $args <<'End'
 
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use FileHandle;
 use IPC::Open2;
 

diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index 7e74db8852f201001422daf7558a6bbefb9d8f04..a2113f1068949fc661f000041638124a9c015a94 100644 (file)
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -549,6 +549,7 @@ Merging of xls files is not (yet) possible. Be free to implement :)
 
 use warnings;
 use integer;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use strict;
 use IO::File;
 

diff --git a/src/src/exinext.src b/src/src/exinext.src
index 182e39574c4a53af024989ffe6b1e33179611d5a..9c427350b29ab28bd9fff6470730ad7ed1f2ab03 100644 (file)
--- a/src/src/exinext.src
+++ b/src/src/exinext.src
@@ -115,6 +115,9 @@ fi
 
 perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain $config <<'End'
 
+  # We don't import anything, but guard against future changes which do
+  BEGIN { pop @INC if $INC[-1] eq '.' };
+
   # Name the arguments
 
   $exim = $ARGV[0];

diff --git a/src/src/exipick.src b/src/src/exipick.src
index 1672c7fe6bdde81613d69ef61fe1008c848df00c..4999d843f2d3877bc870b61f2aae213e50c31c92 100644 (file)
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -12,6 +12,7 @@ my $charset = 'ISO-8859-1';
 #       http://www.exim.org/eximwiki/ToolExipickManPage
 
 use strict;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use Getopt::Long;
 
 my($p_name)   = $0 =~ m|/?([^/]+)$|;

diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index ae617c4e1c16330ab77edb48e06dcf82e8e55dfd..d900e99337a49be8709277bae1eb0d203f34aa22 100644 (file)
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -18,6 +18,7 @@
 # Version 1.2
 
 use strict;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use Getopt::Std;
 
 # Have this variable point to your exim binary.

diff --git a/src/src/exiqsumm.src b/src/src/exiqsumm.src
index c8b522ef503bd0a97e8bab79e35ac12d2d4682fe..99a304fefc359b2b4ee0ed9016b800646a33c568 100644 (file)
--- a/src/src/exiqsumm.src
+++ b/src/src/exiqsumm.src
@@ -42,6 +42,7 @@
 # Slightly modified sub from eximstats
 
 use warnings;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 
 sub print_volume_rounded {
 my($x) = pop @_;

diff --git a/src/src/transport-filter.src b/src/src/transport-filter.src
index 2558bd7ec102bfe273c72df5133727c52e25f058..3f250e6578aa1a40a30a3e6990761bee87976930 100644 (file)
--- a/src/src/transport-filter.src
+++ b/src/src/transport-filter.src
@@ -12,6 +12,7 @@
 #############################################################################
 
 use warnings;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 
 # If the filter is called with any arguments, insert them into the message
 # as X-Arg headers, just to verify what they are.

diff --git a/src/util/cramtest.pl b/src/util/cramtest.pl
index cb70eb40461fc7c66e3b4eb72bc7e9e6b9e87b88..48f989a0cd7c98df4b6e6bca884df76abb003a87 100755 (executable)
--- a/src/util/cramtest.pl
+++ b/src/util/cramtest.pl
@@ -24,6 +24,8 @@
 #       Vadim Vygonets <vadik-exim@vygo.net>.  All rights reserved.
 # Public domain is OK with me.
 
+BEGIN { pop @INC if $INC[-1] eq '.' };
+
 use MIME::Base64;
 use Digest::MD5;
 

diff --git a/src/util/mkcdb.pl b/src/util/mkcdb.pl
index 16827c63b6794553adaf7efbfe0bc5fca1d876a9..691849dcd1fbb3d7df71d4b17f618ae41b18885d 100755 (executable)
--- a/src/util/mkcdb.pl
+++ b/src/util/mkcdb.pl
@@ -15,6 +15,7 @@
 
 use strict;
 
+BEGIN { pop @INC if $INC[-1] eq '.' };
 $ENV{'PATH'} = "";
 umask(022);
 

diff --git a/src/util/ocsp_fetch.pl b/src/util/ocsp_fetch.pl
index 0d214d62aa34c5657a1329273d35a6b79af1da4d..08ca4cbe4c22e5a1e5a67da52c2156c86efe42f9 100755 (executable)
--- a/src/util/ocsp_fetch.pl
+++ b/src/util/ocsp_fetch.pl
@@ -2,6 +2,7 @@
 # Copyright (C) 2012 Wizards Internet Ltd
 # License GPLv2: GNU GPL version 2 <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>
 use strict;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use Getopt::Std;
 $Getopt::Std::STANDARD_HELP_VERSION=1;
 use IO::Handle;

diff --git a/src/util/proxy_protocol_client.pl b/src/util/proxy_protocol_client.pl
index feae3ca90f8762aa833323c18e9679b2c0663bcc..67a171d5d179278a17dff62c513cc3606b04020f 100644 (file)
--- a/src/util/proxy_protocol_client.pl
+++ b/src/util/proxy_protocol_client.pl
@@ -21,6 +21,7 @@
 #
 use strict;
 use warnings;
+BEGIN { pop @INC if $INC[-1] eq '.' };
 use IO::Select;
 use IO::Socket;
 use Getopt::Long;

diff --git a/src/util/ratelimit.pl b/src/util/ratelimit.pl
index d7fd43ab1b07d15ab1c96d9bd1eda096347be59f..e212fa2415ddf6500bbbbaf0cdb08515ba0b4ba4 100644 (file)
--- a/src/util/ratelimit.pl
+++ b/src/util/ratelimit.pl
@@ -2,6 +2,8 @@
 
 use strict;
 
+BEGIN { pop @INC if $INC[-1] eq '.' };
+
 sub usage () {
   print <<END;
 usage: ratelimit.pl [options] <period> <regex> <logfile>