[arch-commits] Commit in mutt/trunk (4 files)
Gaetan Bisson
bisson at archlinux.org
Tue Oct 2 02:03:25 UTC 2012
Date: Monday, October 1, 2012 @ 22:03:24
Author: bisson
Revision: 167417
fix FS#31735
Added:
mutt/trunk/crypt-gpgme.patch
mutt/trunk/pop-cachedir.patch
(from rev 167416, mutt/trunk/1a4c43138685.patch)
Modified:
mutt/trunk/PKGBUILD
Deleted:
mutt/trunk/1a4c43138685.patch
--------------------+
1a4c43138685.patch | 12 ------------
PKGBUILD | 11 +++++++----
crypt-gpgme.patch | 32 ++++++++++++++++++++++++++++++++
pop-cachedir.patch | 12 ++++++++++++
4 files changed, 51 insertions(+), 16 deletions(-)
Deleted: 1a4c43138685.patch
===================================================================
--- 1a4c43138685.patch 2012-10-02 00:13:40 UTC (rev 167416)
+++ 1a4c43138685.patch 2012-10-02 02:03:24 UTC (rev 167417)
@@ -1,12 +0,0 @@
-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-10-02 00:13:40 UTC (rev 167416)
+++ PKGBUILD 2012-10-02 02:03:24 UTC (rev 167417)
@@ -4,7 +4,7 @@
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 @@
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 \
Added: crypt-gpgme.patch
===================================================================
--- crypt-gpgme.patch (rev 0)
+++ crypt-gpgme.patch 2012-10-02 02:03:24 UTC (rev 167417)
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Roman Kagan <rkagan at 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)
Copied: mutt/trunk/pop-cachedir.patch (from rev 167416, mutt/trunk/1a4c43138685.patch)
===================================================================
--- pop-cachedir.patch (rev 0)
+++ pop-cachedir.patch 2012-10-02 02:03:24 UTC (rev 167417)
@@ -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);
+ }
More information about the arch-commits
mailing list