diff options
Diffstat (limited to 'debian/patches/32_exim4.dpatch')
| -rwxr-xr-x | debian/patches/32_exim4.dpatch | 66 |
1 files changed, 30 insertions, 36 deletions
diff --git a/debian/patches/32_exim4.dpatch b/debian/patches/32_exim4.dpatch index 5870be3..84b39a1 100755 --- a/debian/patches/32_exim4.dpatch +++ b/debian/patches/32_exim4.dpatch @@ -1,11 +1,12 @@ -## 32_exim4.dpatch by Andreas Metzler +Description: Accomodate source for installing exim as exim4. +Author: Andreas Metzler <ametzler@debian.org> +Origin: vendor +Forwarded: not-needed +Last-Update: 2013-09-28 -## DP: The main binary is installed as /usr/sbin/exim4 - -diff -NurBbp exim-4.71.orig/OS/Makefile-Linux exim-4.71/OS/Makefile-Linux ---- exim-4.71.orig/OS/Makefile-Linux 2009-11-28 10:52:23.000000000 +0100 -+++ exim-4.71/OS/Makefile-Linux 2009-11-28 10:53:07.000000000 +0100 -@@ -24,9 +24,9 @@ XLFLAGS=-L$(X11)/lib +--- exim4-4.82~rc1.orig/OS/Makefile-Linux ++++ exim4-4.82~rc1/OS/Makefile-Linux +@@ -28,9 +28,9 @@ XLFLAGS=-L$(X11)/lib X11_LD_LIB=$(X11)/lib EXIWHAT_PS_ARG=ax @@ -17,10 +18,9 @@ diff -NurBbp exim-4.71.orig/OS/Makefile-Linux exim-4.71/OS/Makefile-Linux EXIWHAT_KILL_SIGNAL=-USR1 # End -diff -NurBbp exim-4.71.orig/src/exicyclog.src exim-4.71/src/exicyclog.src ---- exim-4.71.orig/src/exicyclog.src 2009-11-16 20:50:36.000000000 +0100 -+++ exim-4.71/src/exicyclog.src 2009-11-28 10:53:07.000000000 +0100 -@@ -145,7 +145,7 @@ done +--- exim4-4.82~rc1.orig/src/exicyclog.src ++++ exim4-4.82~rc1/src/exicyclog.src +@@ -144,7 +144,7 @@ done st=' ' exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` @@ -29,10 +29,9 @@ diff -NurBbp exim-4.71.orig/src/exicyclog.src exim-4.71/src/exicyclog.src spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[ ]*//'` -diff -NurBbp exim-4.71.orig/src/exim_checkaccess.src exim-4.71/src/exim_checkaccess.src ---- exim-4.71.orig/src/exim_checkaccess.src 2009-11-16 20:50:36.000000000 +0100 -+++ exim-4.71/src/exim_checkaccess.src 2009-11-28 10:55:19.000000000 +0100 -@@ -53,7 +53,7 @@ done +--- exim4-4.82~rc1.orig/src/exim_checkaccess.src ++++ exim4-4.82~rc1/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` @@ -41,10 +40,9 @@ diff -NurBbp exim-4.71.orig/src/exim_checkaccess.src exim-4.71/src/exim_checkacc ######################################################################### -diff -NurBbp exim-4.71.orig/src/eximon.src exim-4.71/src/eximon.src ---- exim-4.71.orig/src/eximon.src 2004-10-07 12:39:01.000000000 +0200 -+++ exim-4.71/src/eximon.src 2009-11-28 10:53:07.000000000 +0100 -@@ -66,7 +66,7 @@ config=${EXIMON_EXIM_CONFIG-$config} +--- exim4-4.82~rc1.orig/src/eximon.src ++++ exim4-4.82~rc1/src/eximon.src +@@ -72,7 +72,7 @@ config=${EXIMON_EXIM_CONFIG-$config} st=' ' EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` @@ -53,10 +51,9 @@ diff -NurBbp exim-4.71.orig/src/eximon.src exim-4.71/src/eximon.src 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 -NurBbp exim-4.71.orig/src/exinext.src exim-4.71/src/exinext.src ---- exim-4.71.orig/src/exinext.src 2009-11-16 20:50:36.000000000 +0100 -+++ exim-4.71/src/exinext.src 2009-11-28 10:53:07.000000000 +0100 -@@ -91,7 +91,7 @@ if [ "$exim_path" = "" ]; then +--- exim4-4.82~rc1.orig/src/exinext.src ++++ exim4-4.82~rc1/src/exinext.src +@@ -90,7 +90,7 @@ if [ "$exim_path" = "" ]; then exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` fi @@ -65,7 +62,7 @@ diff -NurBbp exim-4.71.orig/src/exinext.src exim-4.71/src/exinext.src spool_directory=`$exim_path $eximmacdef -C $config -bP spool_directory | sed 's/.*=[ ]*//'` qualify_domain=`$exim_path $eximmacdef -C $config -bP qualify_domain | sed 's/.*=[ ]*//'` -@@ -172,7 +172,7 @@ perl - $exim_path "$eximmacdef" $argone +@@ -171,7 +171,7 @@ perl - $exim_path "$eximmacdef" $argone # Run exim_dumpdb to get out the retry data and pick off what we want @@ -74,10 +71,9 @@ diff -NurBbp exim-4.71.orig/src/exinext.src exim-4.71/src/exinext.src die "can't run exim_dumpdb"; while (<DATA>) -diff -NurBbp exim-4.71.orig/src/exiqgrep.src exim-4.71/src/exiqgrep.src ---- exim-4.71.orig/src/exiqgrep.src 2004-10-07 12:39:01.000000000 +0200 -+++ exim-4.71/src/exiqgrep.src 2009-11-28 10:53:07.000000000 +0100 -@@ -22,7 +22,7 @@ use strict; +--- exim4-4.82~rc1.orig/src/exiqgrep.src ++++ exim4-4.82~rc1/src/exiqgrep.src +@@ -21,7 +21,7 @@ use strict; use Getopt::Std; # Have this variable point to your exim binary. @@ -86,10 +82,9 @@ diff -NurBbp exim-4.71.orig/src/exiqgrep.src exim-4.71/src/exiqgrep.src my $eargs = '-bpu'; my %id; my %opt; -diff -NurBbp exim-4.71.orig/src/exiwhat.src exim-4.71/src/exiwhat.src ---- exim-4.71.orig/src/exiwhat.src 2009-11-16 20:50:36.000000000 +0100 -+++ exim-4.71/src/exiwhat.src 2009-11-28 10:53:07.000000000 +0100 -@@ -89,7 +89,7 @@ fi +--- exim4-4.82~rc1.orig/src/exiwhat.src ++++ exim4-4.82~rc1/src/exiwhat.src +@@ -88,7 +88,7 @@ fi st=' ' exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"` @@ -98,10 +93,9 @@ diff -NurBbp exim-4.71.orig/src/exiwhat.src exim-4.71/src/exiwhat.src 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 -NurBbp exim-4.71.orig/src/globals.c exim-4.71/src/globals.c ---- exim-4.71.orig/src/globals.c 2009-11-16 20:50:37.000000000 +0100 -+++ exim-4.71/src/globals.c 2009-11-28 10:53:07.000000000 +0100 -@@ -569,7 +569,7 @@ int errors_sender_rc = EXIT_FA +--- exim4-4.82~rc1.orig/src/globals.c ++++ exim4-4.82~rc1/src/globals.c +@@ -633,7 +633,7 @@ int errors_sender_rc = EXIT_FA gid_t exim_gid = EXIM_GID; BOOL exim_gid_set = TRUE; /* This gid is always set */ |