diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-12 10:50:21 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-12 10:50:21 -0300 |
| commit | 77eec019b9f8ee02a2888a36bdab6153105864ec (patch) | |
| tree | 6cb284daefe14c96a1d1af4644f800623746fde0 /community/exim | |
| parent | 52905437ad86d91ec0fa307f8322f6a5f265e505 (diff) | |
| parent | 5c25d28847bcae8c3c51c1babcb09d36c7fbddba (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/amyedit/PKGBUILD
extra/gtksourceview-sharp-2.0/PKGBUILD
extra/gtksourceview/PKGBUILD
testing/vi/PKGBUILD
Diffstat (limited to 'community/exim')
| -rw-r--r-- | community/exim/475format.patch | 31 | ||||
| -rwxr-xr-x | community/exim/newaliases | 2 |
2 files changed, 0 insertions, 33 deletions
diff --git a/community/exim/475format.patch b/community/exim/475format.patch deleted file mode 100644 index aef38e8d6..000000000 --- a/community/exim/475format.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/exim/newaliases b/community/exim/newaliases deleted file mode 100755 index c7b0e383d..000000000 --- a/community/exim/newaliases +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -/usr/sbin/exim_dbmbuild /etc/mail/aliases /var/spool/exim/db/aliases && chown exim.exim /var/spool/exim/db/aliases |