ports/core (3.0): exim: update to 4.82
commit 8dd4d0ae6368989b01e70ed458121d93f18fd9eb Author: Juergen Daubert <jue@jue.li> Date: Tue Oct 29 16:42:26 2013 +0100 exim: update to 4.82 diff --git a/exim/.footprint b/exim/.footprint index 7e70392..b702a28 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.80.1-1 +lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.82-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.80.1-1 --rwsr-xr-x root/root usr/sbin/exim-4.80.1-1 +lrwxrwxrwx root/root usr/sbin/exim -> exim-4.82-1 +-rwsr-xr-x root/root usr/sbin/exim-4.82-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.80.1-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.80.1-1 +lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.82-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 e581c31..827803a 100644 --- a/exim/.md5sum +++ b/exim/.md5sum @@ -1,4 +1,4 @@ e00ba95600b51e47d8fedb0ed24d2bf3 exim -1a95dc9f02834b1b7430403a75edf162 exim-4.80.1.tar.bz2 -6091cb3cb1a3edd1203df64dbe26c498 exim-compile_number.patch -56111ce31a6f7fa085ed4e6909d52a54 exim-config.patch +feb933baa4db773c2ef76b794c60b647 exim-4.82.tar.bz2 +92fd6587c9c7c80ebc3bac6063943d90 exim-compile_number.patch +10b49e3305c2dda37d6d840f6f4280ee exim-config.patch diff --git a/exim/Pkgfile b/exim/Pkgfile index a94835c..ea6e29e 100644 --- a/exim/Pkgfile +++ b/exim/Pkgfile @@ -4,7 +4,7 @@ # Depends on: db openssl libpcre tcp_wrappers name=exim -version=4.80.1 +version=4.82 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 0558666..2e44052 100644 --- a/exim/exim-compile_number.patch +++ b/exim/exim-compile_number.patch @@ -1,8 +1,6 @@ -# http://bugs.exim.org/show_bug.cgi?id=1164 - -diff -Nru exim-4.80.orig/OS/Makefile-Base exim-4.80/OS/Makefile-Base ---- exim-4.80.orig/OS/Makefile-Base 2012-05-31 15:48:44.513624313 +0200 -+++ exim-4.80/OS/Makefile-Base 2012-05-31 16:23:02.159673311 +0200 +diff -Nru exim-4.82.orig/OS/Makefile-Base exim-4.82/OS/Makefile-Base +--- exim-4.82.orig/OS/Makefile-Base 2013-10-28 15:29:04.754760862 +0100 ++++ exim-4.82/OS/Makefile-Base 2013-10-28 15:29:52.016435763 +0100 @@ -457,7 +457,7 @@ # Update Exim's version information and build the version object. @@ -12,12 +10,12 @@ diff -Nru exim-4.80.orig/OS/Makefile-Base exim-4.80/OS/Makefile-Base @../scripts/reversion cnumber.h: version.h -diff -Nru exim-4.80.orig/src/version.sh exim-4.80/src/version.sh ---- exim-4.80.orig/src/version.sh 2012-05-31 15:48:44.510291099 +0200 -+++ exim-4.80/src/version.sh 2012-05-31 16:23:02.159673311 +0200 +diff -Nru exim-4.82.orig/src/version.sh exim-4.82/src/version.sh +--- exim-4.82.orig/src/version.sh 2013-10-28 15:29:04.751427646 +0100 ++++ exim-4.82/src/version.sh 2013-10-28 15:29:52.016435763 +0100 @@ -1,4 +1,4 @@ # automatically generated file - see ../scripts/reversion - EXIM_RELEASE_VERSION="4.80" + EXIM_RELEASE_VERSION="4.82" EXIM_VARIANT_VERSION="" -EXIM_COMPILE_NUMBER="1" +EXIM_COMPILE_NUMBER="0" diff --git a/exim/exim-config.patch b/exim/exim-config.patch index 08e8ec5..00c2595 100644 --- a/exim/exim-config.patch +++ b/exim/exim-config.patch @@ -1,6 +1,6 @@ -diff -Nru exim-4.80.orig/src/EDITME exim-4.80/src/EDITME ---- exim-4.80.orig/src/EDITME 2012-05-31 15:48:44.506957885 +0200 -+++ exim-4.80/src/EDITME 2012-05-31 15:46:51.000000000 +0200 +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 @@ -72,7 +72,7 @@ # this would be wanted. ############################################################################### @@ -66,7 +66,7 @@ diff -Nru exim-4.80.orig/src/EDITME exim-4.80/src/EDITME #------------------------------------------------------------------------------ -@@ -578,14 +578,14 @@ +@@ -605,14 +605,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.80.orig/src/EDITME exim-4.80/src/EDITME # AUTH_SPA=yes -@@ -689,10 +689,10 @@ +@@ -716,10 +716,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.80.orig/src/EDITME exim-4.80/src/EDITME # TLS_LIBS=-lssl -lcrypto # Uncomment the first and either the second or the third of these if you -@@ -764,7 +764,7 @@ +@@ -798,7 +798,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.80.orig/src/EDITME exim-4.80/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 -@@ -813,7 +813,7 @@ +@@ -847,7 +847,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.80.orig/src/EDITME exim-4.80/src/EDITME COMPRESS_SUFFIX=gz -@@ -821,7 +821,7 @@ +@@ -855,7 +855,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.80.orig/src/EDITME exim-4.80/src/EDITME #------------------------------------------------------------------------------ -@@ -931,9 +931,9 @@ +@@ -965,9 +965,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.80.orig/src/EDITME exim-4.80/src/EDITME # # but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM # as well. -@@ -966,7 +966,7 @@ +@@ -1000,7 +1000,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.80.orig/src/EDITME exim-4.80/src/EDITME #------------------------------------------------------------------------------ -@@ -1016,13 +1016,13 @@ +@@ -1050,13 +1050,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.80.orig/src/EDITME exim-4.80/src/EDITME #------------------------------------------------------------------------------ -@@ -1222,7 +1222,7 @@ +@@ -1256,7 +1256,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.80.orig/src/EDITME exim-4.80/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.80.orig/src/configure.default exim-4.80/src/configure.default ---- exim-4.80.orig/src/configure.default 2012-05-31 15:48:44.506957885 +0200 -+++ exim-4.80/src/configure.default 2012-05-31 15:41:11.000000000 +0200 +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 @@ -54,7 +54,7 @@ # +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They # are all colon-separated lists: @@ -184,5 +184,5 @@ diff -Nru exim-4.80.orig/src/configure.default exim-4.80/src/configure.default -domainlist local_domains = @ +domainlist local_domains = @ : localhost domainlist relay_to_domains = - hostlist relay_from_hosts = 127.0.0.1 - + hostlist relay_from_hosts = localhost + # (We rely upon hostname resolution working for localhost, because the default
participants (1)
-
crux＠crux.nu