[hcoop/debian/exim4.git] / debian / patches / 32_exim4.dpatch

Description: Accommodate source for installing exim as exim4.
Author: Andreas Metzler <ametzler@debian.org>
Origin: vendor
Forwarded: not-needed
Last-Update: 2018-12-12

--- a/OS/Makefile-Linux
+++ b/OS/Makefile-Linux
@@ -28,9 +28,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
--- a/src/exicyclog.src
+++ b/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/.*=[  ]*//'`
 
--- a/src/exim_checkaccess.src
+++ b/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
 
 
 #########################################################################
--- a/src/eximon.src
+++ b/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/.*=[  ]*//'`
--- a/src/exinext.src
+++ b/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
 
   # 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>)
--- a/src/exiqgrep.src
+++ b/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;
--- a/src/exiwhat.src
+++ b/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/.*=[ ]*//"`
 
--- a/src/globals.c
+++ b/src/globals.c
@@ -906,7 +906,7 @@ const uschar *event_name         = NULL;
 
 
 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 */
Commit	Line	Data
01e60269	1	Description: Accommodate source for installing exim as exim4.
de45f55a AM	2	Author: Andreas Metzler <ametzler@debian.org>
	3	Origin: vendor
	4	Forwarded: not-needed
01e60269	5	Last-Update: 2018-12-12
de45f55a	6
0baa7b9d SB	7	--- a/OS/Makefile-Linux
0baa7b9d SB	8	+++ b/OS/Makefile-Linux
de45f55a AM	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
0baa7b9d SB	21	--- a/src/exicyclog.src
0baa7b9d SB	22	+++ b/src/exicyclog.src
01e60269	23	@@ -149,7 +149,7 @@ done
de45f55a AM	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
0baa7b9d SB	32	--- a/src/exim_checkaccess.src
0baa7b9d SB	33	+++ b/src/exim_checkaccess.src
de45f55a AM	34	@@ -52,7 +52,7 @@ done
	35	# a tab to keep the tab in one place.
	36
	37	exim_path=`perl -ne 'chop;if (/^\sexim_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	#########################################################################
0baa7b9d SB	43	--- a/src/eximon.src
0baa7b9d SB	44	+++ b/src/eximon.src
01e60269	45	@@ -79,7 +79,7 @@ config=${EXIMON_EXIM_CONFIG-$config}
de45f55a AM	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/.=[ ]//'`
0baa7b9d SB	54	--- a/src/exinext.src
0baa7b9d SB	55	+++ b/src/exinext.src
01e60269	56	@@ -97,7 +97,7 @@ if [ "$exim_path" = "" ]; then
de45f55a AM	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
01e60269	65	@@ -181,7 +181,7 @@ perl - $exim_path "$eximmacdef" $argone
de45f55a AM	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>)
0baa7b9d SB	74	--- a/src/exiqgrep.src
0baa7b9d SB	75	+++ b/src/exiqgrep.src
01e60269 AM	76	@@ -24,7 +24,7 @@ use Getopt::Std;
01e60269 AM	77	use File::Basename;
de45f55a AM	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;
0baa7b9d SB	85	--- a/src/exiwhat.src
0baa7b9d SB	86	+++ b/src/exiwhat.src
01e60269	87	@@ -98,7 +98,7 @@ fi
de45f55a AM	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
0baa7b9d SB	96	--- a/src/globals.c
0baa7b9d SB	97	+++ b/src/globals.c
01e60269 AM	98	@@ -906,7 +906,7 @@ const uschar *event_name = NULL;
01e60269 AM	99
de45f55a AM	100
de45f55a AM	101	gid_t exim_gid = EXIM_GID;
de45f55a AM	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;
01e60269	106	int expand_level = 0; /* Nesting depth, indent for debug */