From a578b373810690f6bed678537c7b6434b41391be Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Tue, 9 Oct 2012 17:01:15 +0000
Subject: [PATCH] avoid a null pointer deref in claws-mail;
 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2743

---
 mail/claws-mail/Makefile                     |  6 ++++--
 mail/claws-mail/patches/patch-src_procmime_c | 16 +++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 66147ab390b..f5df8ec77f8 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.54 2012/10/09 16:41:29 sthen Exp $
+# $OpenBSD: Makefile,v 1.55 2012/10/09 17:01:15 sthen Exp $
 
 SHARED_ONLY=		Yes
 
@@ -9,7 +9,9 @@ COMMENT-spamassassin=	spamassassin plugin
 
 V=			3.8.1
 DISTNAME=		claws-mail-${V}
-REVISION=		0
+REVISION-main=		1
+REVISION-bogofilter=	0
+REVISION-spamassassin=	0
 PKGNAME-main=		${DISTNAME}
 PKGNAME-bogofilter=	claws-mail-bogofilter-${V}
 PKGNAME-spamassassin=	claws-mail-spamassassin-${V}
diff --git a/mail/claws-mail/patches/patch-src_procmime_c b/mail/claws-mail/patches/patch-src_procmime_c
index eecd05752df..757a2b17c3e 100644
--- a/mail/claws-mail/patches/patch-src_procmime_c
+++ b/mail/claws-mail/patches/patch-src_procmime_c
@@ -1,9 +1,10 @@
-$OpenBSD: patch-src_procmime_c,v 1.7 2012/06/29 14:02:54 landry Exp $
+$OpenBSD: patch-src_procmime_c,v 1.8 2012/10/09 17:01:16 sthen Exp $
 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2640
 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2641
 http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2642
---- src/procmime.c.orig	Fri Dec 16 09:09:32 2011
-+++ src/procmime.c	Tue Apr  3 14:59:40 2012
+http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2743
+--- src/procmime.c.orig	Wed Jun 27 11:05:22 2012
++++ src/procmime.c	Tue Oct  9 18:51:08 2012
 @@ -562,16 +562,29 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, E
  			g_free(tmp_file);
  		}
@@ -164,3 +165,12 @@ http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2642
  	} else {
  		debug_print("using 7bit\n");
  		return ENC_7BIT;
+@@ -1753,6 +1814,8 @@ static void parse_parameters(const gchar *parameters, 
+ 			continue;
+ 
+ 		charset = value;
++		if (charset == NULL)
++			continue;
+ 		lang = strchr(charset, '\'');
+ 		if (lang == NULL)
+ 			continue;