From 8a13b9797270b680d7f09839d5c2d4a883d44e3a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Dec 2018 02:42:57 +0100
Subject: [PATCH] clawsMail: 3.17.1 -> 3.17.2

---
 .../mailreaders/claws-mail/default.nix        |  4 +--
 .../mailreaders/claws-mail/mime.patch         | 29 ++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 47cb83dee766..a783cb2af3f8 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -31,11 +31,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
-  version = "3.17.1";
+  version = "3.17.2";
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "1wknxbwyzm5xjh3cqmddcxmvp1rkp301qga5n5rgfi7vcd0myyvm";
+    sha256 = "1hb17kpvfl8f1y49zan0wvf4awapxg13bqbqwrbhq2n4xp445kr5";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
index 62f5df4b69a7..2ff4269c3329 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
+++ b/pkgs/applications/networking/mailreaders/claws-mail/mime.patch
@@ -1,15 +1,28 @@
---- a/src/procmime.c	2015-10-01 23:02:16.629908590 -0700
-+++ b/src/procmime.c	2015-10-01 23:02:46.932001337 -0700
-@@ -1196,11 +1196,7 @@
+diff --git a/src/procmime.c b/src/procmime.c
+index bd3239e..06a3b26 100644
+--- a/src/procmime.c
++++ b/src/procmime.c
+@@ -1144,20 +1144,16 @@ GList *procmime_get_mime_type_list(void)
+ 	MimeType *mime_type;
+ 	gboolean fp_is_glob_file = TRUE;
+ 
  	if (mime_type_list) 
  		return mime_type_list;
- 	
+-	
 -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__)
--	if ((fp = procmime_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) 
+-	if ((fp = claws_fopen(DATAROOTDIR "/mime/globs", "rb")) == NULL) 
 -#else
--	if ((fp = procmime_fopen("/usr/share/mime/globs", "rb")) == NULL) 
+-	if ((fp = claws_fopen("/usr/share/mime/globs", "rb")) == NULL) 
 -#endif
-+	if ((fp = procmime_fopen("@MIMEROOTDIR@/mime/globs", "rb")) == NULL) 
++
++	if ((fp = claws_fopen("@MIMEROOTDIR@/mime/globs", "rb")) == NULL)
  	{
  		fp_is_glob_file = FALSE;
- 		if ((fp = procmime_fopen("/etc/mime.types", "rb")) == NULL) {
+ 		if ((fp = claws_fopen("/etc/mime.types", "rb")) == NULL) {
+ 			if ((fp = claws_fopen(SYSCONFDIR "/mime.types", "rb")) 
+ 				== NULL) {
+ 				FILE_OP_ERROR(SYSCONFDIR "/mime.types", 
+ 					"claws_fopen");
+ 				return NULL;
+ 			}
+