summaryrefslogtreecommitdiff
path: root/extra/mutt
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-10-02 01:06:16 -0700
committerroot <root@rshg054.dnsready.net>2012-10-02 01:06:16 -0700
commit941550cbc215d608bd18439f99500b74fbb80f0d (patch)
treeced50aee5db693d8495b19c59d2bdbd6927c9393 /extra/mutt
parent9b6be78b0c13a61c14d5278f1363eaf9c6388e4c (diff)
Tue Oct 2 01:06:06 PDT 2012
Diffstat (limited to 'extra/mutt')
-rw-r--r--extra/mutt/PKGBUILD13
-rw-r--r--extra/mutt/crypt-gpgme.patch32
-rw-r--r--extra/mutt/pop-cachedir.patch12
3 files changed, 52 insertions, 5 deletions
diff --git a/extra/mutt/PKGBUILD b/extra/mutt/PKGBUILD
index f1da74622..9650cff99 100644
--- a/extra/mutt/PKGBUILD
+++ b/extra/mutt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 166981 2012-09-24 06:32:03Z bisson $
+# $Id: PKGBUILD 167418 2012-10-02 02:04:08Z bisson $
# Contributor: tobias [tobias [at] archlinux.org]
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
pkgname=mutt
pkgver=1.5.21
-pkgrel=7
+pkgrel=8
pkgdesc='Small but very powerful text-based mail client'
url='http://www.mutt.org/'
license=('GPL')
@@ -13,15 +13,18 @@ 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"
- '1a4c43138685.patch')
+ 'pop-cachedir.patch'
+ 'crypt-gpgme.patch')
sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9'
- '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1')
+ '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1'
+ '8cf0d4278aab1d162ab7f847f1b917327d630d98')
install=install
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- patch -i ../1a4c43138685.patch # FS#31536
+ patch -i ../pop-cachedir.patch # FS#31536
+ patch -p1 -i ../crypt-gpgme.patch # FS#31735
./configure \
--prefix=/usr \
--sysconfdir=/etc \
diff --git a/extra/mutt/crypt-gpgme.patch b/extra/mutt/crypt-gpgme.patch
new file mode 100644
index 000000000..7ed9348b2
--- /dev/null
+++ b/extra/mutt/crypt-gpgme.patch
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Roman Kagan <rkagan@mail.ru>
+# Date 1290506473 -10800
+# Node ID 938f0706311a6ab599d29d35447f0c70972fe7cf
+# Parent 01731fb1884ea0e1eaf9008ea9c70804b66f2363
+crypt-gpgme: actually init gpgme
+
+Recent versions of gpgme (at least the one packaged with Fedora 14,
+gpgme-1.2.0), requires proper initialization of the library before use.
+
+The initialization is done via gpgme_check_version(), and gpgme_set_locale() is
+recommended right afterwards, too (see gpgme manual for details).
+
+Otherwise gpgme_init() fails with "Not operational" error, which makes mutt
+immediately quit.
+
+diff --git a/crypt-gpgme.c b/crypt-gpgme.c
+--- a/crypt-gpgme.c
++++ b/crypt-gpgme.c
+@@ -4191,6 +4191,12 @@
+ if (mutt_any_key_to_continue (NULL) == -1)
+ mutt_exit(1);
+ }
++
++ gpgme_check_version (NULL);
++ gpgme_set_locale (NULL, LC_CTYPE, setlocale (LC_CTYPE, NULL));
++#ifdef LC_MESSAGES
++ gpgme_set_locale (NULL, LC_MESSAGES, setlocale (LC_MESSAGES, NULL));
++#endif
+ }
+
+ void pgp_gpgme_init (void)
diff --git a/extra/mutt/pop-cachedir.patch b/extra/mutt/pop-cachedir.patch
new file mode 100644
index 000000000..ec1bc198a
--- /dev/null
+++ b/extra/mutt/pop-cachedir.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);
+ }