5 files changed, 52 insertions, 4 deletions
diff --git a/community-testing/exim/475format.patch b/community-testing/exim/475format.patch
new file mode 100644
index 000000000..aef38e8d6
--- /dev/null
+++ b/community-testing/exim/475format.patch
@@ -0,0 +1,31 @@
+From: Tom Kistner <tom@tahini.csx.cam.ac.uk>
+Date: Sat, 30 Apr 2011 12:20:17 +0000 (+0100)
+Subject: Bugzilla #1106: Don't pass DKIM compound log line as format string
+X-Git-Tag: exim-4_76_RC1~2
+X-Git-Url: http://git.exim.org/exim.git/commitdiff_plain/337e3505b0e6cd4309db6bf6062b33fa56e06cf8
+
+Bugzilla #1106: Don't pass DKIM compound log line as format string
+---
+
+diff --git a/src/src/dkim.c b/src/src/dkim.c
+index e25ff8c..2318cc3 100644
+--- a/src/src/dkim.c
++++ b/src/src/dkim.c
+@@ -108,7 +108,7 @@ void dkim_exim_verify_finish(void) {
+     /* Log a line for each signature */
+     uschar *logmsg = string_append(NULL, &size, &ptr, 5,
+ 
+-      string_sprintf( "DKIM: d=%s s=%s c=%s/%s a=%s ",
++      string_sprintf( "d=%s s=%s c=%s/%s a=%s ",
+                       sig->domain,
+                       sig->selector,
+                       (sig->canon_headers == PDKIM_CANON_SIMPLE)?"simple":"relaxed",
+@@ -176,7 +176,7 @@ void dkim_exim_verify_finish(void) {
+     }
+ 
+     logmsg[ptr] = '\0';
+-    log_write(0, LOG_MAIN, (char *)logmsg);
++    log_write(0, LOG_MAIN, "DKIM: %s", logmsg);
+ 
+     /* Build a colon-separated list of signing domains (and identities, if present) in dkim_signers */
+     dkim_signers = string_append(dkim_signers,
diff --git a/community-testing/exim/PKGBUILD b/community-testing/exim/PKGBUILD
index d8b81e37b..27aabe852 100644
--- a/community-testing/exim/PKGBUILD
+++ b/community-testing/exim/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 45865 2011-04-30 05:58:54Z angvp $
+# $Id: PKGBUILD 46480 2011-05-07 19:12:24Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org>
 # Maintainer: judd <jvinet@zeroflux.org>
 pkgname=exim
 pkgver=4.75
-pkgrel=1
+pkgrel=2
 pkgdesc="A Message Transfer Agent"
 arch=(i686 x86_64)
 url="http://www.exim.org/"
@@ -11,6 +11,7 @@ license=('GPL')
 backup=(etc/mail/aliases etc/mail/exim.conf \
         etc/logrotate.d/exim etc/conf.d/exim)
 install=exim.install
+changelog=exim.changelog
 depends=('db' 'pcre' 'pam' 'tcp_wrappers' 'openssl' 'libldap')
 makedepends=('sudo')
 provides=('smtp-server')
@@ -23,6 +24,7 @@ source=(ftp://mirrors.24-7-solutions.net/pub/exim/ftp/exim/exim4/exim-${pkgver}.
         exim.logrotate 
         exim.conf.d
         exim.Makefile
+        475format.patch
         )
 md5sums=('427fb74bbd2afbea759e6da38f25af17'
          '4874006f0585253ddab027d441009757'
@@ -30,13 +32,15 @@ md5sums=('427fb74bbd2afbea759e6da38f25af17'
          '9aed772e87223213e8da9ca5e7376869'
          'd788c26f86a9d72a0aebb3b849fe74f2'
          'b75fe4c6e960a59a25b5f51e8f61ba3a'
-         '63e22266168e5eddd42b6e2d1dc5caf5')
+         '61e76543476f52f136c1d6c80ac1c5a1'
+         '4d5e58f07896db227ea24bea57972bd1')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   sed -i 's|tail -1|tail -n -1|g' scripts/Configure-config.h
   # Make some configuration changes
   cp ${srcdir}/${pkgname}.Makefile Local/Makefile
+  patch -p2 < ${srcdir}/475format.patch
   make
 }
 
diff --git a/community-testing/exim/exim.Makefile b/community-testing/exim/exim.Makefile
index 44fbe10f4..125f87dfb 100644
--- a/community-testing/exim/exim.Makefile
+++ b/community-testing/exim/exim.Makefile
@@ -924,7 +924,7 @@ USE_TCP_WRAPPERS=yes
 # aliases). The following setting can be changed to specify a different
 # location for the system alias file.
 
-SYSTEM_ALIASES_FILE=/home/angvp/pkgs/community/exim/trunk/pkg/etc/mail/aliases
+SYSTEM_ALIASES_FILE=/etc/mail/aliases
 
 
 #------------------------------------------------------------------------------
diff --git a/community-testing/exim/exim.changelog b/community-testing/exim/exim.changelog
new file mode 100644
index 000000000..afb4f843c
--- /dev/null
+++ b/community-testing/exim/exim.changelog
@@ -0,0 +1,12 @@
+2010-05-07 Angel Velasquez <angvp@archlinux.org>
+    * Adding patch for security issue see: http://goo.gl/QBict
+
+2010-05-06 Angel Velasquez <angvp@archlinux.org>
+    * Setting sticky id to deliver mail. Closes FS#24109 
+
+2010-04-30 Angel Velasquez <angvp@archlinux.org>
+    * exim 4.75
+    * Config updated with the aliases path. Closes FS#22743
+    * Removed sed hackings and added a exim.Makefile . Closes FS#22744
+    * Replaced creation of the user at build time. Closes FS#22745
+
diff --git a/community-testing/exim/exim.install b/community-testing/exim/exim.install
index cf05fe4e4..8ed329559 100644
--- a/community-testing/exim/exim.install
+++ b/community-testing/exim/exim.install
@@ -9,6 +9,7 @@ post_install() {
   passwd -l exim > /dev/null
   chown root.exim /var/spool/exim /var/log/exim
   chown exim.exim /var/spool/exim/db
+  chmod u+s /usr/sbin/exim
 }
 
 # arg 1:  the new package version