Import Debian changes 4.89-2+deb9u4

[hcoop/debian/exim4.git] / debian / patches / 67_unnecessaryCopt.diff

diff --git a/debian/patches/67_unnecessaryCopt.diff b/debian/patches/67_unnecessaryCopt.diff
index 7561579..4a819ef 100644 (file)
--- a/debian/patches/67_unnecessaryCopt.diff
+++ b/debian/patches/67_unnecessaryCopt.diff
@@ -2,11 +2,11 @@ Description: Stop using exim's -C option in utility scripts (exiwhat
   et al.) since this breaks with ALT_CONFIG_PREFIX.
 Author: Andreas Metzler <ametzler@downhill.at.eu.org>
 Forwarded: http://bugs.exim.org/show_bug.cgi?id=1045
-Last-Update: 2010-12-12
+Last-Update: 2014-12-01
 
---- exim4-4.72.orig/src/exicyclog.src
-+++ exim4-4.72/src/exicyclog.src
-@@ -147,10 +147,10 @@ st='      '
+--- a/src/exicyclog.src
++++ b/src/exicyclog.src
+@@ -146,10 +146,10 @@ st='      '
  exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
  if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
  
@@ -19,9 +19,9 @@ Last-Update: 2010-12-12
  fi
  
  # If log_file_path contains only "syslog" then no Exim log files are in use.
---- exim4-4.72.orig/src/eximon.src
-+++ exim4-4.72/src/eximon.src
-@@ -68,8 +68,8 @@ st='  '
+--- a/src/eximon.src
++++ b/src/eximon.src
+@@ -74,8 +74,8 @@ st='  '
  EXIM_PATH=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
  if test "$EXIM_PATH" = ""; then EXIM_PATH=BIN_DIRECTORY/exim4; fi
  
@@ -32,9 +32,9 @@ Last-Update: 2010-12-12
  
  # If log_file_path is "syslog" then logging is only to syslog, and the monitor
  # is unable to display a log tail unless EXIMON_LOG_FILE_PATH is set to tell
---- exim4-4.72.orig/src/exinext.src
-+++ exim4-4.72/src/exinext.src
-@@ -92,8 +92,8 @@ if [ "$exim_path" = "" ]; then
+--- a/src/exinext.src
++++ b/src/exinext.src
+@@ -91,8 +91,8 @@ if [ "$exim_path" = "" ]; then
  fi
  
  if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi
@@ -45,7 +45,7 @@ Last-Update: 2010-12-12
  
  # Now do the job. Perl uses $ so frequently that we don't want to have to
  # escape them all from the shell, so pass in shell variable values as
-@@ -135,7 +135,7 @@ perl - $exim_path "$eximmacdef" $argone
+@@ -134,7 +134,7 @@ perl - $exim_path "$eximmacdef" $argone
    # Run Exim to get a list of hosts for the given domain; for
    # each one construct the appropriate retry key.
  
@@ -54,9 +54,9 @@ Last-Update: 2010-12-12
      die "can't run exim to route $address";
  
    while (<LIST>)
---- exim4-4.72.orig/src/exiwhat.src
-+++ exim4-4.72/src/exiwhat.src
-@@ -90,8 +90,8 @@ fi
+--- a/src/exiwhat.src
++++ b/src/exiwhat.src
+@@ -89,8 +89,8 @@ fi
  st='   '
  exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
  if test "$exim_path" = ""; then exim_path=BIN_DIRECTORY/exim4; fi