ports/core (2.7): exim: update to 4.73

01-06-2011, 09:08 AM

commit c232b2f32898b22590e36b431563364f87fca0f0
Author: Juergen Daubert <jue@jue.li>
Date: Thu Jan 6 11:03:52 2011 +0100

[notify] exim: update to 4.73

Fix for CVE-2010-4345, see http://bugs.exim.org/show_bug.cgi?id=1044

diff --git a/exim/.footprint b/exim/.footprint
index c3c06f5..05b06ba 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.72-1
+lrwxrwxrwx root/root usr/bin/mailq -> ../sbin/exim-4.73-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.72-1
--rwsr-xr-x root/root usr/sbin/exim-4.72-1
+lrwxrwxrwx root/root usr/sbin/exim -> exim-4.73-1
+-rwsr-xr-x root/root usr/sbin/exim-4.73-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.72-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.72-1
+lrwxrwxrwx root/root usr/sbin/sendmail -> exim-4.73-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 7992034..b42af94 100644
--- a/exim/.md5sum
+++ b/exim/.md5sum
@@ -1,3 +1,3 @@
e00ba95600b51e47d8fedb0ed24d2bf3 exim
-ccc937b533568e5e8340f181a3b3d2ff exim-4.72.tar.bz2
-d35903c419fa1eca4d059788b6b2e3ee exim-config.patch
+b32fb85c5161ad2fabfe9ba860a1ad2c exim-4.73.tar.bz2
+13824e41e00b8c8035c6694e53aebe5e exim-config.patch
diff --git a/exim/Pkgfile b/exim/Pkgfile
index da2fee5..17f20c8 100644
--- a/exim/Pkgfile
+++ b/exim/Pkgfile
@@ -4,7 +4,7 @@
# Depends on: db openssl libpcre tcp_wrappers

name=exim
-version=4.72
+version=4.73
release=1
source=(ftp://ftp.exim.org/pub/exim/exim4/$name-$version.tar.bz2
$name $name-config.patch)
diff --git a/exim/exim-config.patch b/exim/exim-config.patch
index c01804c..877b9df 100644
--- a/exim/exim-config.patch
+++ b/exim/exim-config.patch
@@ -1,6 +1,6 @@
-diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME
---- exim-4.71.orig/src/EDITME 2009-11-24 15:34:37.000000000 +0100
-+++ exim-4.71/src/EDITME 2009-11-24 15:37:15.000000000 +0100
+diff -Nru exim-4.73.orig/src/EDITME exim-4.73/src/EDITME
+--- exim-4.73.orig/src/EDITME 2011-01-05 19:45:31.046233071 +0100
++++ exim-4.73/src/EDITME 2011-01-05 19:45:45.760710662 +0100
@@ -74,7 +74,7 @@
# this would be wanted.
################################################## #############################
@@ -28,16 +28,16 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME

# It is possible to specify a colon-separated list of files for CONFIGURE_FILE.
# In this case, Exim will use the first of them that exists when it is run.
-@@ -134,7 +134,7 @@
- # owner of a local mailbox.) Specifying these values as root is very strongly
- # discouraged.
+@@ -133,7 +133,7 @@
+ # deliveries. (Local deliveries run as various non-root users, typically as the
+ # owner of a local mailbox.) Specifying these values as root is not supported.

-EXIM_USER=
+EXIM_USER=ref:mail

# If you specify EXIM_USER as a name, this is looked up at build time, and the
# uid number is built into the binary. However, you can specify that this
-@@ -244,7 +244,7 @@
+@@ -243,7 +243,7 @@
# MBX, is included only when requested. If you do not know what this is about,
# leave these settings commented out.

@@ -46,7 +46,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME
# SUPPORT_MAILSTORE=yes
# SUPPORT_MBX=yes

-@@ -262,8 +262,8 @@
+@@ -261,8 +261,8 @@
LOOKUP_LSEARCH=yes
LOOKUP_DNSDB=yes

@@ -57,7 +57,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME
# LOOKUP_IBASE=yes
# LOOKUP_LDAP=yes
# LOOKUP_MYSQL=yes
-@@ -333,7 +333,7 @@
+@@ -332,7 +332,7 @@
# files are defaulted in the OS/Makefile-Default file, but can be overridden in
# local OS-specific make files.

@@ -66,7 +66,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME

#------------------------------------------------------------------------------
-@@ -486,10 +486,10 @@
+@@ -527,10 +527,10 @@
# included in the Exim binary. You will then need to set up the run time
# configuration to make use of the mechanism(s) selected.

@@ -79,7 +79,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME
# AUTH_SPA=yes

-@@ -589,10 +589,10 @@
+@@ -630,10 +630,10 @@
# leave these settings commented out.

# This setting is required for any TLS support (either OpenSSL or GnuTLS)
@@ -92,7 +92,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME

# Uncomment these settings if you are using GnuTLS
# USE_GNUTLS=yes
-@@ -656,7 +656,7 @@
+@@ -697,7 +697,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:

@@ -101,7 +101,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/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
-@@ -705,7 +705,7 @@
+@@ -746,7 +746,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.

@@ -110,7 +110,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME
COMPRESS_SUFFIX=gz

-@@ -713,7 +713,7 @@
+@@ -754,7 +754,7 @@
# If the exigrep utility is fed compressed log files, it tries to uncompress
# them using this command.

@@ -119,7 +119,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME

#------------------------------------------------------------------------------
-@@ -823,9 +823,9 @@
+@@ -864,9 +864,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:
#
@@ -131,7 +131,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME
#
# but of course there may need to be other things in CFLAGS and EXTRALIBS_EXIM
# as well.
-@@ -851,7 +851,7 @@
+@@ -899,7 +899,7 @@
# aliases). The following setting can be changed to specify a different
# location for the system alias file.

@@ -140,7 +140,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME

#------------------------------------------------------------------------------
-@@ -897,13 +897,13 @@
+@@ -945,13 +945,13 @@
# haven't got Perl, Exim will still build and run; you just won't be able to
# use those utilities.

@@ -161,7 +161,7 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/src/EDITME

#------------------------------------------------------------------------------
-@@ -1097,7 +1097,7 @@
+@@ -1145,7 +1145,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:

@@ -170,9 +170,9 @@ diff -Nru exim-4.71.orig/src/EDITME exim-4.71/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.71.orig/src/configure.default exim-4.71/src/configure.default
---- exim-4.71.orig/src/configure.default 2009-11-24 15:34:37.000000000 +0100
-+++ exim-4.71/src/configure.default 2009-11-24 15:34:56.000000000 +0100
+diff -Nru exim-4.73.orig/src/configure.default exim-4.73/src/configure.default
+--- exim-4.73.orig/src/configure.default 2011-01-05 19:45:31.046233071 +0100
++++ exim-4.73/src/configure.default 2011-01-05 19:45:45.760710662 +0100
@@ -56,7 +56,7 @@
# +local_domains, +relay_to_domains, and +relay_from_hosts, respectively. They
# are all colon-separated lists:
_______________________________________________
CRUX mailing list
CRUX@lists.crux.nu
http://lists.crux.nu/mailman/listinfo/crux