HCoop / hcoop / debian / exim4.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
Relax chown requirements when check_owner is false
[hcoop/debian/exim4.git] / debian / patches / 32_exim4.dpatch
CommitLineData
de45f55a
AM		 1Description: Accomodate source for installing exim as exim4.
2Author: Andreas Metzler <ametzler@debian.org>
3Origin: vendor
4Forwarded: not-needed
5Last-Update: 2013-09-28
6
7--- exim4-4.82~rc1.orig/OS/Makefile-Linux
8+++ exim4-4.82~rc1/OS/Makefile-Linux
9@@ -28,9 +28,9 @@ XLFLAGS=-L$(X11)/lib
10 X11_LD_LIB=$(X11)/lib
11
12 EXIWHAT_PS_ARG=ax
13-EXIWHAT_EGREP_ARG='/exim( |$$)'
14+EXIWHAT_EGREP_ARG='/exim4( |$$)'
15 EXIWHAT_MULTIKILL_CMD=killall
16-EXIWHAT_MULTIKILL_ARG=exim
17+EXIWHAT_MULTIKILL_ARG=exim4
18 EXIWHAT_KILL_SIGNAL=-USR1
19
20 # End
21--- exim4-4.82~rc1.orig/src/exicyclog.src
22+++ exim4-4.82~rc1/src/exicyclog.src
23@@ -144,7 +144,7 @@ done
24
25 st=' '
26 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
27-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
28+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
29
30 spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[ ]*//'`
31
32--- exim4-4.82~rc1.orig/src/exim_checkaccess.src
33+++ exim4-4.82~rc1/src/exim_checkaccess.src
34@@ -52,7 +52,7 @@ done
35 # a tab to keep the tab in one place.
36
37 exim_path=`perl -ne 'chop;if (/^\s*exim_path\s*=\s*(.*)/){print "$1\n";last;}' $config`
38-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
39+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
40
41
42 #########################################################################
43--- exim4-4.82~rc1.orig/src/eximon.src
44+++ exim4-4.82~rc1/src/eximon.src
45@@ -72,7 +72,7 @@ config=${EXIMON_EXIM_CONFIG-$config}
46
47 st=' '
48 EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
49-if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim; fi
50+if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim4; fi
51
52 SPOOL_DIRECTORY=`$EXIM_PATH -C $config -bP spool_directory | sed 's/.*=[ ]*//'`
53 LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[ ]*//'`
54--- exim4-4.82~rc1.orig/src/exinext.src
55+++ exim4-4.82~rc1/src/exinext.src
56@@ -90,7 +90,7 @@ if [ "$exim_path" = "" ]; then
57 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
58 fi
59
60-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
61+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
62 spool_directory=`$exim_path $eximmacdef -C $config -bP spool_directory | sed 's/.*=[ ]*//'`
63 qualify_domain=`$exim_path $eximmacdef -C $config -bP qualify_domain | sed 's/.*=[ ]*//'`
64
65@@ -171,7 +171,7 @@ perl - $exim_path "$eximmacdef" $argone
66
67 # Run exim_dumpdb to get out the retry data and pick off what we want
68
69- open(DATA, "${exim}_dumpdb $spool retry |") ||
70+ open(DATA, "/usr/sbin/exim_dumpdb $spool retry |") ||
71 die "can't run exim_dumpdb";
72
73 while (<DATA>)
74--- exim4-4.82~rc1.orig/src/exiqgrep.src
75+++ exim4-4.82~rc1/src/exiqgrep.src
76@@ -21,7 +21,7 @@ use strict;
77 use Getopt::Std;
78
79 # Have this variable point to your exim binary.
80-my $exim = 'BIN_DIRECTORY/exim';
81+my $exim = 'BIN_DIRECTORY/exim4';
82 my $eargs = '-bpu';
83 my %id;
84 my %opt;
85--- exim4-4.82~rc1.orig/src/exiwhat.src
86+++ exim4-4.82~rc1/src/exiwhat.src
87@@ -88,7 +88,7 @@ fi
88
89 st=' '
90 exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
91-if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim; fi
92+if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
93 spool_directory=`$exim_path -C $config -bP spool_directory | sed "s/.*=[ ]*//"`
94 process_log_path=`$exim_path -C $config -bP process_log_path | sed "s/.*=[ ]*//"`
95
96--- exim4-4.82~rc1.orig/src/globals.c
97+++ exim4-4.82~rc1/src/globals.c
98@@ -633,7 +633,7 @@ int errors_sender_rc = EXIT_FA
99
100 gid_t exim_gid = EXIM_GID;
101 BOOL exim_gid_set = TRUE; /* This gid is always set */
102-uschar *exim_path = US BIN_DIRECTORY "/exim"
103+uschar *exim_path = US BIN_DIRECTORY "/exim4"
104 "\0<---------------Space to patch exim_path->";
105 uid_t exim_uid = EXIM_UID;
106 BOOL exim_uid_set = TRUE; /* This uid is always set */
exim4 packaging