Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

mutt: update with latest PKGBUILD from official repo

  • Loading branch information...
commit 7ba331f1eb6d24e34f31e7dad7dd712f718641bc 1 parent 73635b0
@w0ng authored
Showing with 76 additions and 29 deletions.
  1. +32 −29 mutt/PKGBUILD
  2. +32 −0 mutt/crypt-gpgme.patch
  3. +12 −0 mutt/pop-cachedir.patch
View
61 mutt/PKGBUILD
@@ -1,4 +1,4 @@
-# $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>
@@ -13,42 +13,45 @@ 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"
- 'patch-1.5.21-r1.vk.pgp_verbose_mime'
- '1a4c43138685.patch')
+ 'pop-cachedir.patch'
+ 'crypt-gpgme.patch'
+ 'patch-1.5.21-r1.vk.pgp_verbose_mime')
sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9'
- '573699f4c4c038b9674714ab7849f9c88aa62059'
- '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1')
+ '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1'
+ '8cf0d4278aab1d162ab7f847f1b917327d630d98'
+ '573699f4c4c038b9674714ab7849f9c88aa62059')
install=install
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -i ../patch-1.5.21-r1.vk.pgp_verbose_mime
- patch -i ../1a4c43138685.patch # FS#31536
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --enable-gpgme \
- --enable-pop \
- --enable-imap \
- --enable-smtp \
- --enable-hcache \
- --with-curses=/usr \
- --with-regex \
- --with-gss=/usr \
- --with-ssl=/usr \
- --with-sasl \
- --with-idn \
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ patch -i ../pop-cachedir.patch # FS#31536
+ patch -p1 -i ../crypt-gpgme.patch # FS#31735
+ patch -i ../patch-1.5.21-r1.vk.pgp_verbose_mime
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-gpgme \
+ --enable-pop \
+ --enable-imap \
+ --enable-smtp \
+ --enable-hcache \
+ --with-curses=/usr \
+ --with-regex \
+ --with-gss=/usr \
+ --with-ssl=/usr \
+ --with-sasl \
+ --with-idn \
- make
+ make
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
- rm "${pkgdir}"/usr/bin/{flea,muttbug}
- rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
- rm "${pkgdir}"/etc/mime.types{,.dist}
- install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
+ rm "${pkgdir}"/usr/bin/{flea,muttbug}
+ rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
+ rm "${pkgdir}"/etc/mime.types{,.dist}
+ install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
}
View
32 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)
View
12 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);
+ }
Please sign in to comment.
Something went wrong with that request. Please try again.