From 11cdd053b6038facafa0ca718729868821b70625 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 1 Sep 2015 09:36:10 +0200
Subject: [PATCH] mutt: update to 1.5.24.

---
 srcpkgs/mutt/patches/CVE-2014-9116.patch | 32 ------------------------
 srcpkgs/mutt/template                    |  8 +++---
 2 files changed, 4 insertions(+), 36 deletions(-)
 delete mode 100644 srcpkgs/mutt/patches/CVE-2014-9116.patch

diff --git a/srcpkgs/mutt/patches/CVE-2014-9116.patch b/srcpkgs/mutt/patches/CVE-2014-9116.patch
deleted file mode 100644
index 8751325d536..00000000000
--- a/srcpkgs/mutt/patches/CVE-2014-9116.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch solves the issue raised by CVE-2014-9116.
-
-We correctly redefine what are the whitespace characters as per RFC5322; by
-doing so we prevent mutt_substrdup from being used in a way that could lead to
-a segfault.
-
-The lib.c part was written by Antonio Radici <antonio@debian.org> to prevent
-crashes due to this kind of bugs from happening again.
-
---- lib.c.orig
-+++ lib.c
-@@ -815,6 +815,9 @@ char *mutt_substrdup (const char *begin,
-   size_t len;
-   char *p;
- 
-+  if (end != NULL && end < begin)
-+    return NULL;
-+
-   if (end)
-     len = end - begin;
-   else
---- lib.h.orig
-+++ lib.h
-@@ -98,7 +98,7 @@
-    on some systems */
- # define SKIPWS(c) while (*(c) && isspace ((unsigned char) *(c))) c++;
- 
--#define EMAIL_WSP " \t\r\n"
-+#define EMAIL_WSP " \t\r"
- 
- /* skip over WSP as defined by RFC5322.  This is used primarily for parsing
-  * header fields. */
diff --git a/srcpkgs/mutt/template b/srcpkgs/mutt/template
index a511efaee46..97268ba5100 100644
--- a/srcpkgs/mutt/template
+++ b/srcpkgs/mutt/template
@@ -1,7 +1,7 @@
 # Template file for 'mutt'
 pkgname=mutt
-version=1.5.23
-revision=13
+version=1.5.24
+revision=1
 build_style=gnu-configure
 configure_args="--enable-pop --enable-imap --enable-smtp --enable-hcache
  --enable-gpgme --with-regex --with-idn --with-ssl --with-sasl
@@ -16,8 +16,8 @@ short_desc="The Mutt Mail Client"
 maintainer="Jan S. <jan.schreib@gmail.com>"
 license="GPL-2"
 homepage="http://www.mutt.org"
-distfiles="https://bitbucket.org/${pkgname}/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
-checksum=3af0701e57b9e1880ed3a0dee34498a228939e854a16cdccd24e5e502626fd37
+distfiles="http://ftp.mutt.org/pub/mutt/${pkgname}-${version}.tar.gz"
+checksum=a292ca765ed7b19db4ac495938a3ef808a16193b7d623d65562bb8feb2b42200
 
 # Package build options
 build_options="trash sidebar"