From 02721dcdf5dfcf96f62f6c657c9989b9ef991fa7 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Wed, 1 Nov 2017 12:32:13 +0000
Subject: [PATCH] Use back-compatible variable for perl version The modern $^V
 is not present in some buildfarm animals' perl versions.

---
 src/src/exigrep.src          | 2 +-
 src/src/exim_checkaccess.src | 2 +-
 src/src/eximstats.src        | 2 +-
 src/src/exipick.src          | 2 +-
 src/src/exiqgrep.src         | 2 +-
 src/src/exiqsumm.src         | 2 +-
 src/src/transport-filter.src | 2 +-
 test/runtest                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/src/exigrep.src b/src/src/exigrep.src
index 118cd91b9..9e5c7d8b7 100644
--- a/src/src/exigrep.src
+++ b/src/src/exigrep.src
@@ -233,7 +233,7 @@ GetOptions(
       'version'        => sub {
             print basename($0) . ": $0\n",
                 "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-                "perl(runtime): $^V\n";
+                "perl(runtime): $]\n";
             exit 0;
       },
 ) and @ARGV or pod2usage;
diff --git a/src/src/exim_checkaccess.src b/src/src/exim_checkaccess.src
index 81f6ebf70..360f307ba 100755
--- a/src/src/exim_checkaccess.src
+++ b/src/src/exim_checkaccess.src
@@ -71,7 +71,7 @@ use IPC::Open2;
 if ($ARGV[0] eq '--version') {
     print basename($0) . ": $0\n",
           "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-          "perl(runtime): $^V\n";
+          "perl(runtime): $]\n";
           exit 0;
 }
 
diff --git a/src/src/eximstats.src b/src/src/eximstats.src
index 99f4c195f..76cfe7e97 100644
--- a/src/src/eximstats.src
+++ b/src/src/eximstats.src
@@ -560,7 +560,7 @@ use POSIX;
 if ($ARGV[0] eq '--version') {
     print basename($0) . ": $0\n",
         "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-        "perl(runtime): $^V\n";
+        "perl(runtime): $]\n";
         exit 0;
 }
 
diff --git a/src/src/exipick.src b/src/src/exipick.src
index d486b4289..b6c28ef23 100644
--- a/src/src/exipick.src
+++ b/src/src/exipick.src
@@ -88,7 +88,7 @@ GetOptions(
   'version'     => sub {
         print basename($0) . ": $0\n",
             "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-            "perl(runtime): $^V\n";
+            "perl(runtime): $]\n";
             exit 0;
   },
 ) || exit(1);
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index c26da684b..c4f7c4b58 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -49,7 +49,7 @@ if ($^O eq 'darwin') { # aka MacOS X
 if ($ARGV[0] eq '--version') {
     print basename($0) . ": $0\n",
         "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-        "perl(runtime): $^V\n";
+        "perl(runtime): $]\n";
         exit 0;
 }
 
diff --git a/src/src/exiqsumm.src b/src/src/exiqsumm.src
index 97cacdd63..551ca97ca 100644
--- a/src/src/exiqsumm.src
+++ b/src/src/exiqsumm.src
@@ -48,7 +48,7 @@ use File::Basename;
 if ($ARGV[0] eq '--version') {
     print basename($0) . ": $0\n",
         "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-        "perl(runtime): $^V\n";
+        "perl(runtime): $]\n";
         exit 0;
 }
 
diff --git a/src/src/transport-filter.src b/src/src/transport-filter.src
index 256bf7c39..db00d877f 100644
--- a/src/src/transport-filter.src
+++ b/src/src/transport-filter.src
@@ -18,7 +18,7 @@ use File::Basename;
 if ($ARGV[0] eq '--version') {
     print basename($0) . ": $0\n",
         "build: EXIM_RELEASE_VERSIONEXIM_VARIANT_VERSION\n",
-        "perl(runtime): $^V\n";
+        "perl(runtime): $]\n";
         exit 0;
 }
 
diff --git a/test/runtest b/test/runtest
index b29be7fce..57e2d8a10 100755
--- a/test/runtest
+++ b/test/runtest
@@ -3364,7 +3364,7 @@ if (system("cp $parm_exim_dir/eximstats eximdir") != 0)
 
 # Collect some version information
 print '-' x 78, "\n";
-print "Perl version for runtest: $^V\n";
+print "Perl version for runtest: $]\n";
 foreach (map { "./eximdir/$_" } qw(exigrep exinext eximstats)) {
   # fold (or unfold?) multiline output into a one-liner
   print join(', ', map { chomp; $_ } `$_ --version`), "\n";
-- 
2.25.1