exim: update to 4.86

5 files changed, 30 insertions, 30 deletions

diff --git a/exim/.footprint b/exim/.footprint
index fca41fea..34f3ba8e 100644
--- a/exim/.footprint
+++ b/exim/.footprint
@@ -6,15 +6,15 @@ drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/exim
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/exim-4.85-1
+lrwxrwxrwx	root/root	usr/bin/mailq -> ../sbin/exim-4.86-1
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man8/
 -rw-r--r--	root/root	usr/man/man8/exim.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/exicyclog
 -rwxr-xr-x	root/root	usr/sbin/exigrep
-lrwxrwxrwx	root/root	usr/sbin/exim -> exim-4.85-1
--rwsr-xr-x	root/root	usr/sbin/exim-4.85-1
+lrwxrwxrwx	root/root	usr/sbin/exim -> exim-4.86-1
+-rwsr-xr-x	root/root	usr/sbin/exim-4.86-1
 -rwxr-xr-x	root/root	usr/sbin/exim_checkaccess
 -rwxr-xr-x	root/root	usr/sbin/exim_dbmbuild
 -rwxr-xr-x	root/root	usr/sbin/exim_dumpdb
@@ -27,7 +27,7 @@ lrwxrwxrwx	root/root	usr/sbin/exim -> exim-4.85-1
 -rwxr-xr-x	root/root	usr/sbin/exiqgrep
 -rwxr-xr-x	root/root	usr/sbin/exiqsumm
 -rwxr-xr-x	root/root	usr/sbin/exiwhat
-lrwxrwxrwx	root/root	usr/sbin/sendmail -> exim-4.85-1
+lrwxrwxrwx	root/root	usr/sbin/sendmail -> exim-4.86-1
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 drwxr-x---	mail/mail	var/log/exim/
diff --git a/exim/.md5sum b/exim/.md5sum
index 9983a5f8..6689bba4 100644
--- a/exim/.md5sum
+++ b/exim/.md5sum
@@ -1,4 +1,4 @@
-b6fddc1a24ae23d24d925782eeebec8b  exim
-ebae28762b6f125726283dc9434e8709  exim-4.85.tar.bz2
+d0022b47423fae3a46168e84ee0cc3df  exim
+797f248ef3e0c0e2f178e915f88fc4e9  exim-4.86.tar.bz2
 2bd7bff400bcb92f9b3d7cbe141ab5fc  exim-compile_number.patch
-39b61381a24b275e4cae49118c15b935  exim-config.patch
+e3b0be7aca7227dcc8897dd406292779  exim-config.patch
diff --git a/exim/Pkgfile b/exim/Pkgfile
index e9ae6be8..f47a72a8 100644
--- a/exim/Pkgfile
+++ b/exim/Pkgfile
@@ -4,8 +4,8 @@
 # Depends on:  db openssl libpcre tcp_wrappers
 
 name=exim
-version=4.85
-release=2
+version=4.86
+release=1
 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \
         $name $name-config.patch
         $name-compile_number.patch)
diff --git a/exim/exim b/exim/exim
index 44556aee..ef9b9a4d 100644
--- a/exim/exim
+++ b/exim/exim
@@ -25,7 +25,7 @@ reload)
 status)
 	$SSD --status --pidfile $PID
 	case $? in
-	0) echo "$PROG is running" ;;
+	0) echo "$PROG is running with pid $(cat $PID)" ;;
 	1) echo "$PROG is not running but the pid file $PID exists" ;;
 	3) echo "$PROG is not running" ;;
 	4) echo "Unable to determine the program status" ;;
diff --git a/exim/exim-config.patch b/exim/exim-config.patch
index 2896bfcc..7507c2d2 100644
--- a/exim/exim-config.patch
+++ b/exim/exim-config.patch
@@ -1,6 +1,6 @@
-diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
---- exim-4.85.orig/src/EDITME	2015-01-18 14:47:46.495497019 +0100
-+++ exim-4.85/src/EDITME	2015-01-18 14:48:02.728233566 +0100
+diff -Nru exim-4.86.orig/src/EDITME exim-4.86/src/EDITME
+--- exim-4.86.orig/src/EDITME	2015-07-27 08:46:13.476076215 +0200
++++ exim-4.86/src/EDITME	2015-07-27 08:47:38.956320422 +0200
 @@ -72,7 +72,7 @@
  # this would be wanted.
  ###############################################################################
@@ -66,7 +66,7 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -621,14 +621,14 @@
+@@ -628,14 +628,14 @@
  # included in the Exim binary. You will then need to set up the run time
  # configuration to make use of the mechanism(s) selected.
  
@@ -81,9 +81,9 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
 -# AUTH_PLAINTEXT=yes
 +AUTH_PLAINTEXT=yes
  # AUTH_SPA=yes
+ # AUTH_TLS=yes
  
- 
-@@ -732,10 +732,10 @@
+@@ -740,10 +740,10 @@
  # leave these settings commented out.
  
  # This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -96,7 +96,7 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  # TLS_LIBS=-lssl -lcrypto
  
  # Uncomment the first and either the second or the third of these if you
-@@ -814,7 +814,7 @@
+@@ -822,7 +822,7 @@
  # %s. This will be replaced by one of the strings "main", "panic", or "reject"
  # to form the final file names. Some installations may want something like this:
  
@@ -105,7 +105,7 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  
  # which results in files with names /var/log/exim_mainlog, etc. The directory
  # in which the log files are placed must exist; Exim does not try to create
-@@ -863,7 +863,7 @@
+@@ -871,7 +871,7 @@
  # files. Both the name of the command and the suffix that it adds to files
  # need to be defined here. See also the EXICYCLOG_MAX configuration.
  
@@ -114,16 +114,16 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  COMPRESS_SUFFIX=gz
  
  
-@@ -871,7 +871,7 @@
- # If the exigrep utility is fed compressed log files, it tries to uncompress
- # them using this command.
- 
+@@ -886,7 +886,7 @@
+ # ZCAT_COMMAND=zcat
+ #
+ # Or specify the full pathname:
 -ZCAT_COMMAND=/usr/bin/zcat
 +ZCAT_COMMAND=/bin/zcat
  
- 
  #------------------------------------------------------------------------------
-@@ -981,9 +981,9 @@
+ # Compiling in support for embedded Perl: If you want to be able to
+@@ -995,9 +995,9 @@
  # You may well also have to specify a local "include" file and an additional
  # library for TCP wrappers, so you probably need something like this:
  #
@@ -135,7 +135,7 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  #
  # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
  # as well.
-@@ -1016,7 +1016,7 @@
+@@ -1030,7 +1030,7 @@
  # aliases). The following setting can be changed to specify a different
  # location for the system alias file.
  
@@ -144,7 +144,7 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -1066,13 +1066,13 @@
+@@ -1080,13 +1080,13 @@
  # haven't got Perl, Exim will still build and run; you just won't be able to
  # use those utilities.
  
@@ -165,7 +165,7 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  
  
  #------------------------------------------------------------------------------
-@@ -1272,7 +1272,7 @@
+@@ -1286,7 +1286,7 @@
  # (process id) to a file so that it can easily be identified. The path of the
  # file can be specified here. Some installations may want something like this:
  
@@ -174,9 +174,9 @@ diff -Nru exim-4.85.orig/src/EDITME exim-4.85/src/EDITME
  
  # If PID_FILE_PATH is not defined, Exim writes a file in its spool directory
  # using the name "exim-daemon.pid".
-diff -Nru exim-4.85.orig/src/configure.default exim-4.85/src/configure.default
---- exim-4.85.orig/src/configure.default	2015-01-18 14:47:46.505496651 +0100
-+++ exim-4.85/src/configure.default	2015-01-18 14:48:02.728233566 +0100
+diff -Nru exim-4.86.orig/src/configure.default exim-4.86/src/configure.default
+--- exim-4.86.orig/src/configure.default	2015-07-27 08:46:13.472743002 +0200
++++ exim-4.86/src/configure.default	2015-07-27 08:46:45.974901757 +0200
 @@ -54,7 +54,7 @@
  # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
  # are all colon-separated lists: