Date: Friday, October 18, 2013 @ 08:53:38 Author: bisson Revision: 196758
upstream update Modified: mutt/trunk/PKGBUILD Deleted: mutt/trunk/crypt-gpgme.patch mutt/trunk/pop-cachedir.patch --------------------+ PKGBUILD | 16 +++++----------- crypt-gpgme.patch | 32 -------------------------------- pop-cachedir.patch | 12 ------------ 3 files changed, 5 insertions(+), 55 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-17 23:38:31 UTC (rev 196757) +++ PKGBUILD 2013-10-18 06:53:38 UTC (rev 196758) @@ -3,8 +3,8 @@ # Maintainer: Gaetan Bisson <[email protected]> pkgname=mutt -pkgver=1.5.21 -pkgrel=9 +pkgver=1.5.22 +pkgrel=1 pkgdesc='Small but very powerful text-based mail client' url='http://www.mutt.org/' license=('GPL') @@ -12,19 +12,13 @@ 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"; - 'pop-cachedir.patch' - 'crypt-gpgme.patch') -sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9' - '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1' - '8cf0d4278aab1d162ab7f847f1b917327d630d98') +source=("ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz";) +sha1sums=('728a114cb3a44df373dbf1292fc34dd8321057dc') install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" - patch -i ../pop-cachedir.patch # FS#31536 - patch -p1 -i ../crypt-gpgme.patch # FS#31735 ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -47,8 +41,8 @@ cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install + rm "${pkgdir}"/etc/mime.types{,.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 } Deleted: crypt-gpgme.patch =================================================================== --- crypt-gpgme.patch 2013-10-17 23:38:31 UTC (rev 196757) +++ crypt-gpgme.patch 2013-10-18 06:53:38 UTC (rev 196758) @@ -1,32 +0,0 @@ -# HG changeset patch -# User Roman Kagan <[email protected]> -# 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) Deleted: pop-cachedir.patch =================================================================== --- pop-cachedir.patch 2013-10-17 23:38:31 UTC (rev 196757) +++ pop-cachedir.patch 2013-10-18 06:53:38 UTC (rev 196758) @@ -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); - }
