-Description: Accomodate source for installing exim as exim4.
+Description: Accommodate source for installing exim as exim4.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Forwarded: not-needed
-Last-Update: 2013-09-28
+Last-Update: 2018-12-12
--- a/OS/Makefile-Linux
+++ b/OS/Makefile-Linux
# End
--- a/src/exicyclog.src
+++ b/src/exicyclog.src
-@@ -144,7 +144,7 @@ done
+@@ -149,7 +149,7 @@ done
st=' '
exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
#########################################################################
--- a/src/eximon.src
+++ b/src/eximon.src
-@@ -72,7 +72,7 @@ config=${EXIMON_EXIM_CONFIG-$config}
+@@ -79,7 +79,7 @@ config=${EXIMON_EXIM_CONFIG-$config}
st=' '
EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[ ]*//'`
--- a/src/exinext.src
+++ b/src/exinext.src
-@@ -90,7 +90,7 @@ if [ "$exim_path" = "" ]; then
+@@ -97,7 +97,7 @@ if [ "$exim_path" = "" ]; then
exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
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/.*=[ ]*//'`
-@@ -171,7 +171,7 @@ perl - $exim_path "$eximmacdef" $argone
+@@ -181,7 +181,7 @@ perl - $exim_path "$eximmacdef" $argone
# Run exim_dumpdb to get out the retry data and pick off what we want
while (<DATA>)
--- a/src/exiqgrep.src
+++ b/src/exiqgrep.src
-@@ -21,7 +21,7 @@ use strict;
- use Getopt::Std;
+@@ -24,7 +24,7 @@ use Getopt::Std;
+ use File::Basename;
# Have this variable point to your exim binary.
-my $exim = 'BIN_DIRECTORY/exim';
my %opt;
--- a/src/exiwhat.src
+++ b/src/exiwhat.src
-@@ -88,7 +88,7 @@ fi
+@@ -98,7 +98,7 @@ fi
st=' '
exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
--- a/src/globals.c
+++ b/src/globals.c
-@@ -705,7 +705,7 @@ const uschar *event_name = NULL;
+@@ -906,7 +906,7 @@ const uschar *event_name = NULL;
+
gid_t exim_gid = EXIM_GID;
- BOOL exim_gid_set = TRUE; /* This gid is always set */
-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;
- BOOL exim_uid_set = TRUE; /* This uid is always set */
+ int expand_level = 0; /* Nesting depth, indent for debug */