Date: Friday, May 10, 2013 @ 21:12:59
Author: bisson
Revision: 185069
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
mutt/repos/staging-i686/
mutt/repos/staging-i686/PKGBUILD
(from rev 185068, mutt/trunk/PKGBUILD)
mutt/repos/staging-i686/crypt-gpgme.patch
(from rev 185068, mutt/trunk/crypt-gpgme.patch)
mutt/repos/staging-i686/install
(from rev 185068, mutt/trunk/install)
mutt/repos/staging-i686/pop-cachedir.patch
(from rev 185068, mutt/trunk/pop-cachedir.patch)
mutt/repos/staging-x86_64/
mutt/repos/staging-x86_64/PKGBUILD
(from rev 185068, mutt/trunk/PKGBUILD)
mutt/repos/staging-x86_64/crypt-gpgme.patch
(from rev 185068, mutt/trunk/crypt-gpgme.patch)
mutt/repos/staging-x86_64/install
(from rev 185068, mutt/trunk/install)
mutt/repos/staging-x86_64/pop-cachedir.patch
(from rev 185068, mutt/trunk/pop-cachedir.patch)
-----------------------------------+
staging-i686/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++
staging-i686/crypt-gpgme.patch | 32 +++++++++++++++++++++
staging-i686/install | 8 +++++
staging-i686/pop-cachedir.patch | 12 ++++++++
staging-x86_64/PKGBUILD | 54 ++++++++++++++++++++++++++++++++++++
staging-x86_64/crypt-gpgme.patch | 32 +++++++++++++++++++++
staging-x86_64/install | 8 +++++
staging-x86_64/pop-cachedir.patch | 12 ++++++++
8 files changed, 212 insertions(+)
Copied: mutt/repos/staging-i686/PKGBUILD (from rev 185068, mutt/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2013-05-10 19:12:59 UTC (rev 185069)
@@ -0,0 +1,54 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=mutt
+pkgver=1.5.21
+pkgrel=9
+pkgdesc='Small but very powerful text-based mail client'
+url='http://www.mutt.org/'
+license=('GPL')
+backup=('etc/Muttrc')
+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')
+
+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 \
+ --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
+}
+
+package() {
+ 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
+}
Copied: mutt/repos/staging-i686/crypt-gpgme.patch (from rev 185068,
mutt/trunk/crypt-gpgme.patch)
===================================================================
--- staging-i686/crypt-gpgme.patch (rev 0)
+++ staging-i686/crypt-gpgme.patch 2013-05-10 19:12:59 UTC (rev 185069)
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Roman Kagan <rka...@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/repos/staging-i686/install (from rev 185068, mutt/trunk/install)
===================================================================
--- staging-i686/install (rev 0)
+++ staging-i686/install 2013-05-10 19:12:59 UTC (rev 185069)
@@ -0,0 +1,8 @@
+post_install() {
+ cat <<EOF
+
+==> For GPG support, add the following to your muttrc:
+==> source /etc/Muttrc.gpg.dist
+
+EOF
+}
Copied: mutt/repos/staging-i686/pop-cachedir.patch (from rev 185068,
mutt/trunk/pop-cachedir.patch)
===================================================================
--- staging-i686/pop-cachedir.patch (rev 0)
+++ staging-i686/pop-cachedir.patch 2013-05-10 19:12:59 UTC (rev 185069)
@@ -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);
+ }
Copied: mutt/repos/staging-x86_64/PKGBUILD (from rev 185068,
mutt/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2013-05-10 19:12:59 UTC (rev 185069)
@@ -0,0 +1,54 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <bis...@archlinux.org>
+
+pkgname=mutt
+pkgver=1.5.21
+pkgrel=9
+pkgdesc='Small but very powerful text-based mail client'
+url='http://www.mutt.org/'
+license=('GPL')
+backup=('etc/Muttrc')
+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')
+
+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 \
+ --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
+}
+
+package() {
+ 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
+}
Copied: mutt/repos/staging-x86_64/crypt-gpgme.patch (from rev 185068,
mutt/trunk/crypt-gpgme.patch)
===================================================================
--- staging-x86_64/crypt-gpgme.patch (rev 0)
+++ staging-x86_64/crypt-gpgme.patch 2013-05-10 19:12:59 UTC (rev 185069)
@@ -0,0 +1,32 @@
+# HG changeset patch
+# User Roman Kagan <rka...@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/repos/staging-x86_64/install (from rev 185068, mutt/trunk/install)
===================================================================
--- staging-x86_64/install (rev 0)
+++ staging-x86_64/install 2013-05-10 19:12:59 UTC (rev 185069)
@@ -0,0 +1,8 @@
+post_install() {
+ cat <<EOF
+
+==> For GPG support, add the following to your muttrc:
+==> source /etc/Muttrc.gpg.dist
+
+EOF
+}
Copied: mutt/repos/staging-x86_64/pop-cachedir.patch (from rev 185068,
mutt/trunk/pop-cachedir.patch)
===================================================================
--- staging-x86_64/pop-cachedir.patch (rev 0)
+++ staging-x86_64/pop-cachedir.patch 2013-05-10 19:12:59 UTC (rev 185069)
@@ -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);
+ }
