Wed Oct 10 09:48:45 2012 UTC ()
add patch from upstream to fix crash (NULL dereference) by strange
email contents (CVE-2012-4507)
bump PKGREV


(drochner)
diff -r1.50 -r1.51 pkgsrc/mail/claws-mail/Makefile
diff -r1.21 -r1.22 pkgsrc/mail/claws-mail/distinfo
diff -r0 -r1.1 pkgsrc/mail/claws-mail/patches/patch-ca
cvs diff -r1.50 -r1.51 pkgsrc/mail/claws-mail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/claws-mail/Makefile 2012/10/08 23:01:57 1.50
+++ pkgsrc/mail/claws-mail/Makefile 2012/10/10 09:48:45 1.51
@@ -1,22 +1,22 @@ @@ -1,22 +1,22 @@
1# $NetBSD: Makefile,v 1.50 2012/10/08 23:01:57 adam Exp $ 1# $NetBSD: Makefile,v 1.51 2012/10/10 09:48:45 drochner Exp $
2 2
3INSTALLATION_DIRS+= ${EGDIR} 3INSTALLATION_DIRS+= ${EGDIR}
4INSTALLATION_DIRS+= share/claws-mail 4INSTALLATION_DIRS+= share/claws-mail
5 5
6.include "Makefile.common" 6.include "Makefile.common"
7 7
8PKGNAME= claws-mail-${CLAWS_VERSION} 8PKGNAME= claws-mail-${CLAWS_VERSION}
9PKGREVISION= 5 9PKGREVISION= 6
10 10
11MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
12COMMENT= X based e-mail and netnews client 12COMMENT= X based e-mail and netnews client
13 13
14CONFLICTS+= sylpheed-claws-[0-9]* 14CONFLICTS+= sylpheed-claws-[0-9]*
15 15
16USE_TOOLS+= msgfmt 16USE_TOOLS+= msgfmt
17PKGCONFIG_OVERRIDE+= claws-mail.pc.in 17PKGCONFIG_OVERRIDE+= claws-mail.pc.in
18 18
19PKG_SYSCONFSUBDIR= claws-mail 19PKG_SYSCONFSUBDIR= claws-mail
20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 20CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
21 21
22.include "../../mk/bsd.prefs.mk" 22.include "../../mk/bsd.prefs.mk"
cvs diff -r1.21 -r1.22 pkgsrc/mail/claws-mail/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/claws-mail/distinfo 2012/07/02 19:07:50 1.21
+++ pkgsrc/mail/claws-mail/distinfo 2012/10/10 09:48:45 1.22
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.21 2012/07/02 19:07:50 drochner Exp $ 1$NetBSD: distinfo,v 1.22 2012/10/10 09:48:45 drochner Exp $
2 2
3SHA1 (claws-mail-3.8.1.tar.bz2) = c519d07121bfb3095c7a3d47e53b6726bf397ed8 3SHA1 (claws-mail-3.8.1.tar.bz2) = c519d07121bfb3095c7a3d47e53b6726bf397ed8
4RMD160 (claws-mail-3.8.1.tar.bz2) = e50ddd80589e7edb9f1c172a83e7f41dd8dec372 4RMD160 (claws-mail-3.8.1.tar.bz2) = e50ddd80589e7edb9f1c172a83e7f41dd8dec372
5Size (claws-mail-3.8.1.tar.bz2) = 7335864 bytes 5Size (claws-mail-3.8.1.tar.bz2) = 7335864 bytes
6SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0 6SHA1 (patch-ab) = d908b8b47b525aa9d6ed677e5c1d5e5eddf74cc0
7SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef 7SHA1 (patch-ae) = 0312eeaaf2d31ab72d771598062019127c69cbef
8SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691 8SHA1 (patch-af) = 2655fac7e0e7bfb2d50291537eab9481dbc83691
9SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb 9SHA1 (patch-ag) = c5c3d16343437aedb9c899bec151338aea9fbbfb
10SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5 10SHA1 (patch-bb) = 2d432d7c1c3869b76965adea77f05127796a27f5
 11SHA1 (patch-ca) = 305882268b80cdcf8d827828ad67f191ef0c1729
File Added: pkgsrc/mail/claws-mail/patches/Attic/patch-ca
$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;