From 9ddf3e5a94b0848cdf9e6ffcc586576bb614bc13 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 25 Sep 2012 00:23:17 -0700
Subject: Tue Sep 25 00:23:14 PDT 2012

---
 extra/mutt/1a4c43138685.patch | 12 ++++++++++++
 extra/mutt/PKGBUILD           | 11 +++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 extra/mutt/1a4c43138685.patch

(limited to 'extra/mutt')

diff --git a/extra/mutt/1a4c43138685.patch b/extra/mutt/1a4c43138685.patch
new file mode 100644
index 000000000..ec1bc198a
--- /dev/null
+++ b/extra/mutt/1a4c43138685.patch
@@ -0,0 +1,12 @@
+Index: muttlib.c
+===================================================================
+--- muttlib.c	(revision 6128:eff500f87889)
++++ muttlib.c	(revision 6161:1a4c43138685)
+@@ -1961,5 +1961,6 @@
+   char *p = safe_strdup (src);
+   int rc = mutt_convert_string (&p, Charset, "utf-8", 0);
+-  strfcpy (dest, rc == 0 ? p : src, dlen);
++  /* `src' may be NULL, such as when called from the pop3 driver. */
++  strfcpy (dest, (rc == 0) ? NONULL(p) : NONULL(src), dlen);
+   FREE (&p);
+ }
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index 9b97bf170..f1da74622 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 143812 2011-11-29 13:33:33Z stephane $
+# $Id: PKGBUILD 166981 2012-09-24 06:32:03Z bisson $
 # Contributor: tobias [tobias [at] archlinux.org]
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=mutt
 pkgver=1.5.21
-pkgrel=6
+pkgrel=7
 pkgdesc='Small but very powerful text-based mail client'
 url='http://www.mutt.org/'
 license=('GPL')
@@ -12,13 +12,16 @@ backup=('etc/Muttrc')
 arch=('i686' 'x86_64')
 optdepends=('smtp-forwarder: to send mail')
 depends=('gpgme' 'ncurses' 'openssl' 'libsasl' 'gdbm' 'libidn' 'mime-types' 'krb5')
-source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
+source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz"
+        '1a4c43138685.patch')
+sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9'
+          '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1')
 
 install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -i ../1a4c43138685.patch # FS#31536
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
-- 
cgit v1.2.3-54-g00ecf