diff options
Diffstat (limited to 'debian/patches/32_exim4.dpatch')
| -rwxr-xr-x | debian/patches/32_exim4.dpatch | 126 |
1 files changed, 126 insertions, 0 deletions
diff --git a/debian/patches/32_exim4.dpatch b/debian/patches/32_exim4.dpatch new file mode 100755 index 0000000..face006 --- /dev/null +++ b/debian/patches/32_exim4.dpatch @@ -0,0 +1,126 @@ +#! /bin/sh -e +## 32_exim4.dpatch by Andreas Metzler +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: The main binary is installed as /usr/sbin/exim4 + +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -urNad /tmp/exim4-4.32/OS/Makefile-Linux exim4-4.32/OS/Makefile-Linux +--- /tmp/exim4-4.32/OS/Makefile-Linux Fri Apr 16 13:16:03 2004 ++++ exim4-4.32/OS/Makefile-Linux Fri Apr 16 13:16:04 2004 +@@ -23,7 +23,7 @@ + EXIWHAT_PS_ARG=ax + EXIWHAT_EGREP_ARG='/exim( |$$)' + EXIWHAT_MULTIKILL_CMD=killall +-EXIWHAT_MULTIKILL_ARG=exim ++EXIWHAT_MULTIKILL_ARG=exim4 + EXIWHAT_KILL_SIGNAL=-USR1 + + # End +diff -urNad /tmp/exim4-4.32/src/exicyclog.src exim4-4.32/src/exicyclog.src +--- /tmp/exim4-4.32/src/exicyclog.src Wed Mar 31 14:44:15 2004 ++++ exim4-4.32/src/exicyclog.src Fri Apr 16 13:16:04 2004 +@@ -115,7 +115,7 @@ + + 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 -urNad /tmp/exim4-4.32/src/exim_checkaccess.src exim4-4.32/src/exim_checkaccess.src +--- /tmp/exim4-4.32/src/exim_checkaccess.src Wed Mar 31 14:44:15 2004 ++++ exim4-4.32/src/exim_checkaccess.src Fri Apr 16 13:16:04 2004 +@@ -53,7 +53,7 @@ + + 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 + + + ######################################################################### +diff -urNad /tmp/exim4-4.32/src/eximon.src exim4-4.32/src/eximon.src +--- /tmp/exim4-4.32/src/eximon.src Wed Mar 31 14:44:15 2004 ++++ exim4-4.32/src/eximon.src Fri Apr 16 13:16:04 2004 +@@ -64,7 +64,7 @@ + + 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 -urNad /tmp/exim4-4.32/src/exinext.src exim4-4.32/src/exinext.src +--- /tmp/exim4-4.32/src/exinext.src Fri Apr 16 12:38:56 2004 ++++ exim4-4.32/src/exinext.src Fri Apr 16 13:16:04 2004 +@@ -90,7 +90,7 @@ + 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/.*=[ ]*//'` + +@@ -169,7 +169,7 @@ + + # 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 -urNad /tmp/exim4-4.32/src/exiqgrep.src exim4-4.32/src/exiqgrep.src +--- /tmp/exim4-4.32/src/exiqgrep.src Wed Mar 31 14:44:15 2004 ++++ exim4-4.32/src/exiqgrep.src Fri Apr 16 13:16:04 2004 +@@ -21,7 +21,7 @@ + use Getopt::Std; + + # 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 -urNad /tmp/exim4-4.32/src/exiwhat.src exim4-4.32/src/exiwhat.src +--- /tmp/exim4-4.32/src/exiwhat.src Wed Mar 31 14:44:15 2004 ++++ exim4-4.32/src/exiwhat.src Fri Apr 16 13:16:04 2004 +@@ -82,7 +82,7 @@ + + 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 -urNad /tmp/exim4-4.32/src/globals.c exim4-4.32/src/globals.c +--- /tmp/exim4-4.32/src/globals.c Fri Apr 16 12:38:56 2004 ++++ exim4-4.32/src/globals.c Fri Apr 16 13:16:04 2004 +@@ -436,7 +436,7 @@ + + 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 */ |