From f8a9072f30574d6f467685a008458b409ade30d0 Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Mon, 18 May 2020 22:11:14 -0400
Subject: [PATCH] debian's 32_exim4.dpatch

Meant to be rebased on top. Debian patch info:

Description: Accommodate source for installing exim as exim4.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Forwarded: not-needed
Last-Update: 2018-12-12
---
 src/OS/Makefile-Linux        | 4 ++--
 src/src/exicyclog.src        | 2 +-
 src/src/exim_checkaccess.src | 2 +-
 src/src/eximon.src           | 2 +-
 src/src/exinext.src          | 4 ++--
 src/src/exiqgrep.src         | 2 +-
 src/src/exiwhat.src          | 2 +-
 src/src/globals.c            | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/OS/Makefile-Linux b/src/OS/Makefile-Linux
index dfb2fa8e7..eaf2bbc5e 100644
--- a/src/OS/Makefile-Linux
+++ b/src/OS/Makefile-Linux
@@ -31,9 +31,9 @@ XLFLAGS=-L$(X11)/lib
 X11_LD_LIB=$(X11)/lib
 
 EXIWHAT_PS_ARG=ax
-EXIWHAT_EGREP_ARG='/exim( |$$)'
+EXIWHAT_EGREP_ARG='/exim4( |$$)'
 EXIWHAT_MULTIKILL_CMD=killall
-EXIWHAT_MULTIKILL_ARG=exim
+EXIWHAT_MULTIKILL_ARG=exim4
 EXIWHAT_KILL_SIGNAL=-USR1
 
 # End
diff --git a/src/src/exicyclog.src b/src/src/exicyclog.src
index 20bf9fcd4..754c9edb8 100644
--- a/src/src/exicyclog.src
+++ b/src/src/exicyclog.src
@@ -149,7 +149,7 @@ done
 
 st='	 '
 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
 
 spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
 
diff --git a/src/src/exim_checkaccess.src b/src/src/exim_checkaccess.src
index 360f307ba..d79afe8dd 100755
--- a/src/src/exim_checkaccess.src
+++ b/src/src/exim_checkaccess.src
@@ -52,7 +52,7 @@ done
 # a tab to keep the tab in one place.
 
 exim_path=`perl -ne 'chop;if (/^\s*exim_path\s*=\s*(.*)/){print "$1\n";last;}' $config`
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
 
 
 #########################################################################
diff --git a/src/src/eximon.src b/src/src/eximon.src
index 6293a7cc2..0266a0260 100644
--- a/src/src/eximon.src
+++ b/src/src/eximon.src
@@ -79,7 +79,7 @@ config=${EXIMON_EXIM_CONFIG-$config}
 
 st='	 '
 EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
-if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim; fi
+if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim4; fi
 
 SPOOL_DIRECTORY=`$EXIM_PATH -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
 LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[  ]*//'`
diff --git a/src/src/exinext.src b/src/src/exinext.src
index 913801867..22887c2c9 100644
--- a/src/src/exinext.src
+++ b/src/src/exinext.src
@@ -97,7 +97,7 @@ if [ "$exim_path" = "" ]; then
   exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
 fi
 
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
 spool_directory=`$exim_path $eximmacdef -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
 qualify_domain=`$exim_path $eximmacdef -C $config -bP qualify_domain | sed 's/.*=[  ]*//'`
 
@@ -181,7 +181,7 @@ perl - $exim_path "$eximmacdef" $argone $spool_directory $qualify_domain $config
 
   # Run exim_dumpdb to get out the retry data and pick off what we want
 
-  open(DATA, "${exim}_dumpdb $spool retry |") ||
+  open(DATA, "/usr/sbin/exim_dumpdb $spool retry |") ||
     die "can't run exim_dumpdb";
 
   while (<DATA>)
diff --git a/src/src/exiqgrep.src b/src/src/exiqgrep.src
index c8762df47..bd95ae836 100644
--- a/src/src/exiqgrep.src
+++ b/src/src/exiqgrep.src
@@ -24,7 +24,7 @@ use Getopt::Std;
 use File::Basename;
 
 # Have this variable point to your exim binary.
-my $exim = 'BIN_DIRECTORY/exim';
+my $exim = 'BIN_DIRECTORY/exim4';
 my $eargs = '-bpu';
 my %id;
 my %opt;
diff --git a/src/src/exiwhat.src b/src/src/exiwhat.src
index a1f748edd..da7a278cd 100644
--- a/src/src/exiwhat.src
+++ b/src/src/exiwhat.src
@@ -98,7 +98,7 @@ fi
 
 st='	 '
 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
 spool_directory=`$exim_path -C $config -bP spool_directory | sed "s/.*=[ ]*//"`
 process_log_path=`$exim_path -C $config -bP process_log_path | sed "s/.*=[ ]*//"`
 
diff --git a/src/src/globals.c b/src/src/globals.c
index ba772c631..46782f4e2 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -896,7 +896,7 @@ const uschar *event_name         = NULL;	/* event name variable */
 
 
 gid_t   exim_gid               = EXIM_GID;
-uschar *exim_path              = US BIN_DIRECTORY "/exim"
+uschar *exim_path              = US BIN_DIRECTORY "/exim4"
                         "\0<---------------Space to patch exim_path->";
 uid_t   exim_uid               = EXIM_UID;
 int     expand_level	       = 0;		/* Nesting depth, indent for debug */
-- 
2.25.1