summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2012-10-10 09:48:45 +0000
committerdrochner <drochner@pkgsrc.org>2012-10-10 09:48:45 +0000
commit80ba6d7933cad50c8a858be2bf993a9e22fdef07 (patch)
treebcddfbb519f5f8485b1bc745ba66332d6a3e111c /mail
parent673db3c34f132b1dfa5e31db4170fa795721e6e7 (diff)
downloadpkgsrc-80ba6d7933cad50c8a858be2bf993a9e22fdef07.tar.gz
add patch from upstream to fix crash (NULL dereference) by strange
email contents (CVE-2012-4507) bump PKGREV
Diffstat (limited to 'mail')
-rw-r--r--mail/claws-mail/Makefile4
-rw-r--r--mail/claws-mail/distinfo3
-rw-r--r--mail/claws-mail/patches/patch-ca15
3 files changed, 19 insertions, 3 deletions
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index c4e898e5f5f..8f1cfbb960b 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2012/10/08 23:01:57 adam Exp $
+# $NetBSD: Makefile,v 1.51 2012/10/10 09:48:45 drochner Exp $
INSTALLATION_DIRS+= ${EGDIR}
INSTALLATION_DIRS+= share/claws-mail
@@ -6,7 +6,7 @@ INSTALLATION_DIRS+= share/claws-mail
.include "Makefile.common"
PKGNAME= claws-mail-${CLAWS_VERSION}
-PKGREVISION= 5
+PKGREVISION= 6
MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= X based e-mail and netnews client
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 8bc87d00e43..d28c8e8fd80 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2012/07/02 19:07:50 drochner Exp $
+$NetBSD: distinfo,v 1.22 2012/10/10 09:48:45 drochner Exp $
SHA1 (claws-mail-3.8.1.tar.bz2) = c519d07121bfb3095c7a3d47e53b6726bf397ed8
RMD160 (claws-mail-3.8.1.tar.bz2) = e50ddd80589e7edb9f1c172a83e7f41dd8dec372
@@ -8,3 +8,4 @@ SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
+SHA1 (patch-ca) = 305882268b80cdcf8d827828ad67f191ef0c1729
diff --git a/mail/claws-mail/patches/patch-ca b/mail/claws-mail/patches/patch-ca
new file mode 100644
index 00000000000..090b2b9551b
--- /dev/null
+++ b/mail/claws-mail/patches/patch-ca
@@ -0,0 +1,15 @@
+$NetBSD: patch-ca,v 1.1 2012/10/10 09:48:45 drochner Exp $
+
+see http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2743
+
+--- src/procmime.c.orig 2012-06-27 09:05:22.000000000 +0000
++++ src/procmime.c
+@@ -1753,6 +1753,8 @@ static void parse_parameters(const gchar
+ continue;
+
+ charset = value;
++ if (charset == NULL)
++ continue;
+ lang = strchr(charset, '\'');
+ if (lang == NULL)
+ continue;