diff options
| author | drochner <drochner@pkgsrc.org> | 2011-05-07 14:32:02 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2011-05-07 14:32:02 +0000 |
| commit | de69eb8385daf11ebbefa214051de9e890aec35d (patch) | |
| tree | 5f413777a59e0937f18e354cf65dacf3c32ee57c /mail/exim | |
| parent | 9ef496041f738ef984b8d8c865fb83c75078c123 (diff) | |
| download | pkgsrc-de69eb8385daf11ebbefa214051de9e890aec35d.tar.gz | |
add patch from upstream to fix format string vulnerability (CVE-2011-1764)
bump PKGREV
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile | 3 | ||||
| -rw-r--r-- | mail/exim/distinfo | 3 | ||||
| -rw-r--r-- | mail/exim/patches/patch-ah | 24 |
3 files changed, 28 insertions, 2 deletions
diff --git a/mail/exim/Makefile b/mail/exim/Makefile index 1a93c4df290..c00a67a32ba 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.106 2011/03/22 13:52:19 adam Exp $ +# $NetBSD: Makefile,v 1.107 2011/05/07 14:32:02 drochner Exp $ DISTNAME= exim-4.75 +PKGREVISION= 1 CATEGORIES= mail net MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ http://dl.ambiweb.de/mirrors/ftp.exim.org/exim/exim4/ diff --git a/mail/exim/distinfo b/mail/exim/distinfo index 2ef5bed4c59..9a95bd0874c 100644 --- a/mail/exim/distinfo +++ b/mail/exim/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.49 2011/03/22 13:52:19 adam Exp $ +$NetBSD: distinfo,v 1.50 2011/05/07 14:32:02 drochner Exp $ SHA1 (exim-4.75.tar.bz2) = e3196a9035f433c380bb2cec4cbbcfd7ad6c00b3 RMD160 (exim-4.75.tar.bz2) = 2dfea8750cc95d057c0b804c0379f69fbed927a9 @@ -8,4 +8,5 @@ SHA1 (patch-ab) = ffb9fb28e4e5548777db31b3de34673a08a1c0fa SHA1 (patch-ac) = 9a260a07f5e8cc89c60188925f01fc5b46164a37 SHA1 (patch-ae) = 4a9d2fde403cfd6386742b31f062e7801ef081b9 SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519 +SHA1 (patch-ah) = 99eae6cf5a3d4b771db39934c3e468706f7497b9 SHA1 (patch-ba) = 6647a95bb8e3bce2bc7f075e4be2217b3a97ce8b diff --git a/mail/exim/patches/patch-ah b/mail/exim/patches/patch-ah new file mode 100644 index 00000000000..4c8c79e2385 --- /dev/null +++ b/mail/exim/patches/patch-ah @@ -0,0 +1,24 @@ +$NetBSD: patch-ah,v 1.1 2011/05/07 14:32:02 drochner Exp $ + +CVE-2011-1764 + +--- src/dkim.c.orig 2011-03-22 08:00:51.000000000 +0000 ++++ 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, |