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

diff --git a/src/OS/Makefile-Linux b/src/OS/Makefile-Linux
index dfb2fa8e7046ef70e038f50630083b96361b5953..eaf2bbc5ec054fb42a38ab4d8bb1b7a04ab4d075 100644 (file)
--- 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 20bf9fcd4ead3f9262bc73896fd18cf32aafc3bf..754c9edb8a9b498f2e87db560edc58b388a1e26b 100644 (file)
--- 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 360f307ba5e6806cfbda613eece0b18fc56cdfd7..d79afe8dde5685164eb3aca005d26f72e3928afa 100755 (executable)
--- 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 6293a7cc2e11dbf25eac5199f67adc35ffded392..0266a0260d47ace4f96e52d5a45659f2c58e1107 100644 (file)
--- 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 91380186747240b0c31d0bfa6a5e992970c68216..22887c2c99b786f46730d07ec2942f1532bf7383 100644 (file)
--- 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 c8762df479da01279db8d73d9a4a1ad3a57ecd93..bd95ae83642a0ed4d9a8c3af905a5feba1f8580d 100644 (file)
--- 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 a1f748edd570ed75df0955448adcfca2e001adc5..da7a278cd39fd5e72af35e44e7184e12e3050a95 100644 (file)
--- 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 ba772c631cf2759106285248dc5aecdc874cd481..46782f4e2b934410acb18e174803953e06f23754 100644 (file)
--- 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 */