From 8c4f17b33b068547ee8791c89f32d2453e666096 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Mon, 30 Jan 2017 17:27:15 +0000 Subject: [PATCH] Avoid using "-w" option in perl script shebang lines, being incompatible with "env perl" --- src/src/convert4r3.src | 3 ++- src/src/convert4r4.src | 3 ++- src/src/exigrep.src | 3 ++- src/src/eximstats.src | 3 ++- src/src/exiqsumm.src | 4 +++- src/src/transport-filter.src | 3 ++- test/README | 4 ++-- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/src/convert4r3.src b/src/src/convert4r3.src index 0ccaf6cee..810b3374f 100755 --- a/src/src/convert4r3.src +++ b/src/src/convert4r3.src @@ -1,4 +1,4 @@ -#! PERL_COMMAND -w +#! PERL_COMMAND # This is a Perl script that reads an Exim run-time configuration file and # checks for settings that were valid prior to release 3.00 but which were @@ -7,6 +7,7 @@ # It is assumed that the input is a valid Exim configuration file. +use warnings; ################################################## # Analyse one line # diff --git a/src/src/convert4r4.src b/src/src/convert4r4.src index 4455fb7fe..8075602cb 100755 --- a/src/src/convert4r4.src +++ b/src/src/convert4r4.src @@ -1,4 +1,4 @@ -#! PERL_COMMAND -w +#! PERL_COMMAND # This is a Perl script that reads an Exim run-time configuration file for # Exim 3. It makes what changes it can for Exim 4, and also output commentary @@ -6,6 +6,7 @@ # It is assumed that the input is a valid Exim 3 configuration file. +use warnings; # 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 05193971d..e8857126e 100644 --- a/src/src/exigrep.src +++ b/src/src/exigrep.src @@ -1,5 +1,6 @@ -#! PERL_COMMAND -w +#! PERL_COMMAND +use warnings; use strict; # Copyright (c) 2007-2015 University of Cambridge. diff --git a/src/src/eximstats.src b/src/src/eximstats.src index 7f220a201..7e74db885 100644 --- a/src/src/eximstats.src +++ b/src/src/eximstats.src @@ -1,4 +1,4 @@ -#!PERL_COMMAND -w +#!PERL_COMMAND # Copyright (c) 2001-2016 University of Cambridge. # See the file NOTICE for conditions of use and distribution. @@ -547,6 +547,7 @@ Merging of xls files is not (yet) possible. Be free to implement :) =cut +use warnings; use integer; use strict; use IO::File; diff --git a/src/src/exiqsumm.src b/src/src/exiqsumm.src index 7d2a933f6..c8b522ef5 100644 --- a/src/src/exiqsumm.src +++ b/src/src/exiqsumm.src @@ -1,4 +1,4 @@ -#! PERL_COMMAND -w +#! PERL_COMMAND # Mail Queue Summary # Christoph Lameter, 21 May 1997 @@ -41,6 +41,8 @@ # Slightly modified sub from eximstats +use warnings; + sub print_volume_rounded { my($x) = pop @_; if ($x < 10000) diff --git a/src/src/transport-filter.src b/src/src/transport-filter.src index 92a3b9dc4..2558bd7ec 100644 --- a/src/src/transport-filter.src +++ b/src/src/transport-filter.src @@ -1,4 +1,4 @@ -#! PERL_COMMAND -w +#! PERL_COMMAND # This is a Perl script to demonstrate the possibilities of on-the-fly # delivery filtering in Exim. It is presented with a message on its standard @@ -11,6 +11,7 @@ # Philip Hazel, May 1997 ############################################################################# +use warnings; # 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/test/README b/test/README index 38972042f..8453d317b 100644 --- a/test/README +++ b/test/README @@ -151,8 +151,8 @@ RUNNING THE TEST SUITE (2) cd into the exim-testsuite-x.xx directory. -(3) Run "autoconf" then "./configure" and then "make". This builds a few - auxiliary programs that are written in C. +(3) Run "./configure" and then "make". This builds a few auxiliary programs that + are written in C. (4) echo $PWD/test-config >> your_TRUSTED_CONFIG_LIST_filename Typically that is .../exim/test/trusted_configs -- 2.30.2