commit 6545d45405550fb432c8b06959a4f7965b256aa9 Author: Juergen Daubert <jue@jue.li> Date: Sun Jan 18 15:35:18 2015 +0100 exim: update to 4.85 diff --git a/exim/.footprint b/exim/.footprint index 30781e4..fca41fe 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.84-1 +lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.85-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.84-1 --rwsr-xr-x root/root usr/sbin/exim-4.84-1 +lrwxrwxrwx root/root usr/sbin/exim -> exim-4.85-1 +-rwsr-xr-x root/root usr/sbin/exim-4.85-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.84-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.84-1 +lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.85-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 d8f5b0d..bfc9064 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,4 +1,4 @@ e00ba95600b51e47d8fedb0ed24d2bf3 exim -3d14522e604b687b9e515f5aa739b2c0 exim-4.84.tar.bz2 -2941f9a7044c38b7bca496b843e10584 exim-compile_number.patch -10b49e3305c2dda37d6d840f6f4280ee exim-config.patch +ebae28762b6f125726283dc9434e8709 exim-4.85.tar.bz2 +2bd7bff400bcb92f9b3d7cbe141ab5fc exim-compile_number.patch +39b61381a24b275e4cae49118c15b935 exim-config.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index d49c471..4fab824 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db openssl libpcre tcp_wrappers name=exim -version=4.84 +version=4.85 release=1 source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2 \ $name $name-config.patch diff --git a/exim/exim-compile_number.patch b/exim/exim-compile_number.patch index a68c25b..ad57a92 100644 --- a/exim/exim-compile_number.patch +++ b/exim/exim-compile_number.patch @@ -1,7 +1,7 @@ -diff -rupN exim-4.83.orig/OS/Makefile-Base exim-4.83/OS/Makefile-Base ---- exim-4.83.orig/OS/Makefile-Base 2014-07-23 15:39:50.700697125 +0200 -+++ exim-4.83/OS/Makefile-Base 2014-07-23 15:41:06.597953279 +0200 -@@ -457,7 +457,7 @@ PHDRS = ../config.h ../dbfunctions.h ../ +diff -Nru exim-4.85.orig/OS/Makefile-Base exim-4.85/OS/Makefile-Base +--- exim-4.85.orig/OS/Makefile-Base 2015-01-18 14:47:46.505496651 +0100 ++++ exim-4.85/OS/Makefile-Base 2015-01-18 14:50:45.929003558 +0100 +@@ -457,7 +457,7 @@ # Update Exim's version information and build the version object. @@ -10,12 +10,12 @@ diff -rupN exim-4.83.orig/OS/Makefile-Base exim-4.83/OS/Makefile-Base @../scripts/reversion cnumber.h: version.h -diff -rupN exim-4.83.orig/src/version.sh exim-4.83/src/version.sh ---- exim-4.83.orig/src/version.sh 2014-07-23 15:39:50.650698931 +0200 -+++ exim-4.83/src/version.sh 2014-07-23 15:41:59.726032700 +0200 +diff -Nru exim-4.85.orig/src/version.sh exim-4.85/src/version.sh +--- exim-4.85.orig/src/version.sh 2015-01-18 14:47:46.498830230 +0100 ++++ exim-4.85/src/version.sh 2015-01-18 14:50:45.929003558 +0100 @@ -1,4 +1,4 @@ # automatically generated file - see ../scripts/reversion - EXIM_RELEASE_VERSION="4.83" + EXIM_RELEASE_VERSION="4.85" EXIM_VARIANT_VERSION="" -EXIM_COMPILE_NUMBER="1" +EXIM_COMPILE_NUMBER="0" diff --git a/exim/exim-config.patch b/exim/exim-config.patch index 00c2595..2896bfc 100644 --- a/exim/exim-config.patch +++ b/exim/exim-config.patch @@ -1,6 +1,6 @@ -diff -Nru exim-4.82.orig/src/EDITME exim-4.82/src/EDITME ---- exim-4.82.orig/src/EDITME 2013-10-28 15:29:04.748094429 +0100 -+++ exim-4.82/src/EDITME 2013-10-28 15:31:08.607086723 +0100 +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 @@ -72,7 +72,7 @@ # this would be wanted. ############################################################################### @@ -66,7 +66,7 @@ diff -Nru exim-4.82.orig/src/EDITME exim-4.82/src/EDITME #------------------------------------------------------------------------------ -@@ -605,14 +605,14 @@ +@@ -621,14 +621,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. @@ -83,7 +83,7 @@ diff -Nru exim-4.82.orig/src/EDITME exim-4.82/src/EDITME # AUTH_SPA=yes -@@ -716,10 +716,10 @@ +@@ -732,10 +732,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.82.orig/src/EDITME exim-4.82/src/EDITME # TLS_LIBS=-lssl -lcrypto # Uncomment the first and either the second or the third of these if you -@@ -798,7 +798,7 @@ +@@ -814,7 +814,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.82.orig/src/EDITME exim-4.82/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 -@@ -847,7 +847,7 @@ +@@ -863,7 +863,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,7 +114,7 @@ diff -Nru exim-4.82.orig/src/EDITME exim-4.82/src/EDITME COMPRESS_SUFFIX=gz -@@ -855,7 +855,7 @@ +@@ -871,7 +871,7 @@ # If the exigrep utility is fed compressed log files, it tries to uncompress # them using this command. @@ -123,7 +123,7 @@ diff -Nru exim-4.82.orig/src/EDITME exim-4.82/src/EDITME #------------------------------------------------------------------------------ -@@ -965,9 +965,9 @@ +@@ -981,9 +981,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.82.orig/src/EDITME exim-4.82/src/EDITME # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -1000,7 +1000,7 @@ +@@ -1016,7 +1016,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.82.orig/src/EDITME exim-4.82/src/EDITME #------------------------------------------------------------------------------ -@@ -1050,13 +1050,13 @@ +@@ -1066,13 +1066,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.82.orig/src/EDITME exim-4.82/src/EDITME #------------------------------------------------------------------------------ -@@ -1256,7 +1256,7 @@ +@@ -1272,7 +1272,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.82.orig/src/EDITME exim-4.82/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.82.orig/src/configure.default exim-4.82/src/configure.default ---- exim-4.82.orig/src/configure.default 2013-10-28 15:29:04.748094429 +0100 -+++ exim-4.82/src/configure.default 2013-10-28 15:31:08.607086723 +0100 +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 @@ -54,7 +54,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: