Date: Monday, September 24, 2012 @ 02:31:30 Author: bisson Revision: 166980
fix FS#31536 Added: mutt/trunk/1a4c43138685.patch Modified: mutt/trunk/PKGBUILD --------------------+ 1a4c43138685.patch | 12 ++++++++++++ PKGBUILD | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) Added: 1a4c43138685.patch =================================================================== --- 1a4c43138685.patch (rev 0) +++ 1a4c43138685.patch 2012-09-24 06:31:30 UTC (rev 166980) @@ -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); + } Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-09-24 06:15:02 UTC (rev 166979) +++ PKGBUILD 2012-09-24 06:31:30 UTC (rev 166980) @@ -4,7 +4,7 @@ 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 @@ 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 \