Import Debian changes 4.89-2+deb9u4

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

diff --git a/debian/patches/32_exim4.dpatch b/debian/patches/32_exim4.dpatch
index 84b39a1..5098991 100755 (executable)
--- a/debian/patches/32_exim4.dpatch
+++ b/debian/patches/32_exim4.dpatch
@@ -4,8 +4,8 @@ Origin: vendor
 Forwarded: not-needed
 Last-Update: 2013-09-28
 
---- exim4-4.82~rc1.orig/OS/Makefile-Linux
-+++ exim4-4.82~rc1/OS/Makefile-Linux
+--- a/OS/Makefile-Linux
++++ b/OS/Makefile-Linux
 @@ -28,9 +28,9 @@ XLFLAGS=-L$(X11)/lib
  X11_LD_LIB=$(X11)/lib
  
@@ -18,8 +18,8 @@ Last-Update: 2013-09-28
  EXIWHAT_KILL_SIGNAL=-USR1
  
  # End
---- exim4-4.82~rc1.orig/src/exicyclog.src
-+++ exim4-4.82~rc1/src/exicyclog.src
+--- a/src/exicyclog.src
++++ b/src/exicyclog.src
 @@ -144,7 +144,7 @@ done
  
  st='   '
@@ -29,8 +29,8 @@ Last-Update: 2013-09-28
  
  spool_directory=`$exim_path -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
  
---- exim4-4.82~rc1.orig/src/exim_checkaccess.src
-+++ exim4-4.82~rc1/src/exim_checkaccess.src
+--- a/src/exim_checkaccess.src
++++ b/src/exim_checkaccess.src
 @@ -52,7 +52,7 @@ done
  # a tab to keep the tab in one place.
  
@@ -40,8 +40,8 @@ Last-Update: 2013-09-28
  
  
  #########################################################################
---- exim4-4.82~rc1.orig/src/eximon.src
-+++ exim4-4.82~rc1/src/eximon.src
+--- a/src/eximon.src
++++ b/src/eximon.src
 @@ -72,7 +72,7 @@ config=${EXIMON_EXIM_CONFIG-$config}
  
  st='   '
@@ -51,8 +51,8 @@ Last-Update: 2013-09-28
  
  SPOOL_DIRECTORY=`$EXIM_PATH -C $config -bP spool_directory | sed 's/.*=[  ]*//'`
  LOG_FILE_PATH=`$EXIM_PATH -C $config -bP log_file_path | sed 's/.*=[  ]*//'`
---- exim4-4.82~rc1.orig/src/exinext.src
-+++ exim4-4.82~rc1/src/exinext.src
+--- a/src/exinext.src
++++ b/src/exinext.src
 @@ -90,7 +90,7 @@ if [ "$exim_path" = "" ]; then
    exim_path=`grep "^[$st]*exim_path" $config | sed "s/.*=[$st]*//"`
  fi
@@ -71,8 +71,8 @@ Last-Update: 2013-09-28
      die "can't run exim_dumpdb";
  
    while (<DATA>)
---- exim4-4.82~rc1.orig/src/exiqgrep.src
-+++ exim4-4.82~rc1/src/exiqgrep.src
+--- a/src/exiqgrep.src
++++ b/src/exiqgrep.src
 @@ -21,7 +21,7 @@ use strict;
  use Getopt::Std;
  
@@ -82,8 +82,8 @@ Last-Update: 2013-09-28
  my $eargs = '-bpu';
  my %id;
  my %opt;
---- exim4-4.82~rc1.orig/src/exiwhat.src
-+++ exim4-4.82~rc1/src/exiwhat.src
+--- a/src/exiwhat.src
++++ b/src/exiwhat.src
 @@ -88,7 +88,7 @@ fi
  
  st='   '
@@ -93,9 +93,9 @@ Last-Update: 2013-09-28
  spool_directory=`$exim_path -C $config -bP spool_directory | sed "s/.*=[ ]*//"`
  process_log_path=`$exim_path -C $config -bP process_log_path | sed "s/.*=[ ]*//"`
  
---- 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
+--- a/src/globals.c
++++ b/src/globals.c
+@@ -705,7 +705,7 @@ const uschar *event_name         = NULL;
  
  gid_t   exim_gid               = EXIM_GID;
  BOOL    exim_gid_set           = TRUE;          /* This gid is always set */