Date: Friday, October 18, 2013 @ 08:54:09
Author: bisson
Revision: 196759
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mutt/repos/extra-i686/PKGBUILD
(from rev 196758, mutt/trunk/PKGBUILD)
mutt/repos/extra-i686/install
(from rev 196758, mutt/trunk/install)
mutt/repos/extra-x86_64/PKGBUILD
(from rev 196758, mutt/trunk/PKGBUILD)
mutt/repos/extra-x86_64/install
(from rev 196758, mutt/trunk/install)
Deleted:
mutt/repos/extra-i686/PKGBUILD
mutt/repos/extra-i686/crypt-gpgme.patch
mutt/repos/extra-i686/install
mutt/repos/extra-i686/pop-cachedir.patch
mutt/repos/extra-x86_64/PKGBUILD
mutt/repos/extra-x86_64/crypt-gpgme.patch
mutt/repos/extra-x86_64/install
mutt/repos/extra-x86_64/pop-cachedir.patch
---------------------------------+
/PKGBUILD | 96 ++++++++++++++++++++++++++++++++++++++
/install | 16 ++++++
extra-i686/PKGBUILD | 54 ---------------------
extra-i686/crypt-gpgme.patch | 32 ------------
extra-i686/install | 8 ---
extra-i686/pop-cachedir.patch | 12 ----
extra-x86_64/PKGBUILD | 54 ---------------------
extra-x86_64/crypt-gpgme.patch | 32 ------------
extra-x86_64/install | 8 ---
extra-x86_64/pop-cachedir.patch | 12 ----
10 files changed, 112 insertions(+), 212 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-i686/PKGBUILD 2013-10-18 06:54:09 UTC (rev 196759)
@@ -1,54 +0,0 @@
-# $Id$
-# Contributor: tobias [tobias [at] archlinux.org]
-# Maintainer: Gaetan Bisson <[email protected]>
-
-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/extra-i686/PKGBUILD (from rev 196758, mutt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2013-10-18 06:54:09 UTC (rev 196759)
@@ -0,0 +1,48 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <[email protected]>
+
+pkgname=mutt
+pkgver=1.5.22
+pkgrel=1
+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";)
+sha1sums=('728a114cb3a44df373dbf1292fc34dd8321057dc')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./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}"/etc/mime.types{,.dist}
+ rm "${pkgdir}"/usr/bin/{flea,muttbug}
+ rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
+ install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
+}
Deleted: extra-i686/crypt-gpgme.patch
===================================================================
--- extra-i686/crypt-gpgme.patch 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-i686/crypt-gpgme.patch 2013-10-18 06:54:09 UTC (rev 196759)
@@ -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: extra-i686/install
===================================================================
--- extra-i686/install 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-i686/install 2013-10-18 06:54:09 UTC (rev 196759)
@@ -1,8 +0,0 @@
-post_install() {
- cat <<EOF
-
-==> For GPG support, add the following to your muttrc:
-==> source /etc/Muttrc.gpg.dist
-
-EOF
-}
Copied: mutt/repos/extra-i686/install (from rev 196758, mutt/trunk/install)
===================================================================
--- extra-i686/install (rev 0)
+++ extra-i686/install 2013-10-18 06:54:09 UTC (rev 196759)
@@ -0,0 +1,8 @@
+post_install() {
+ cat <<EOF
+
+==> For GPG support, add the following to your muttrc:
+==> source /etc/Muttrc.gpg.dist
+
+EOF
+}
Deleted: extra-i686/pop-cachedir.patch
===================================================================
--- extra-i686/pop-cachedir.patch 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-i686/pop-cachedir.patch 2013-10-18 06:54:09 UTC (rev 196759)
@@ -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);
- }
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-x86_64/PKGBUILD 2013-10-18 06:54:09 UTC (rev 196759)
@@ -1,54 +0,0 @@
-# $Id$
-# Contributor: tobias [tobias [at] archlinux.org]
-# Maintainer: Gaetan Bisson <[email protected]>
-
-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/extra-x86_64/PKGBUILD (from rev 196758, mutt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2013-10-18 06:54:09 UTC (rev 196759)
@@ -0,0 +1,48 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <[email protected]>
+
+pkgname=mutt
+pkgver=1.5.22
+pkgrel=1
+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";)
+sha1sums=('728a114cb3a44df373dbf1292fc34dd8321057dc')
+
+install=install
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ ./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}"/etc/mime.types{,.dist}
+ rm "${pkgdir}"/usr/bin/{flea,muttbug}
+ rm "${pkgdir}"/usr/share/man/man1/{flea,muttbug}.1
+ install -Dm644 contrib/gpg.rc "${pkgdir}"/etc/Muttrc.gpg.dist
+}
Deleted: extra-x86_64/crypt-gpgme.patch
===================================================================
--- extra-x86_64/crypt-gpgme.patch 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-x86_64/crypt-gpgme.patch 2013-10-18 06:54:09 UTC (rev 196759)
@@ -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: extra-x86_64/install
===================================================================
--- extra-x86_64/install 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-x86_64/install 2013-10-18 06:54:09 UTC (rev 196759)
@@ -1,8 +0,0 @@
-post_install() {
- cat <<EOF
-
-==> For GPG support, add the following to your muttrc:
-==> source /etc/Muttrc.gpg.dist
-
-EOF
-}
Copied: mutt/repos/extra-x86_64/install (from rev 196758, mutt/trunk/install)
===================================================================
--- extra-x86_64/install (rev 0)
+++ extra-x86_64/install 2013-10-18 06:54:09 UTC (rev 196759)
@@ -0,0 +1,8 @@
+post_install() {
+ cat <<EOF
+
+==> For GPG support, add the following to your muttrc:
+==> source /etc/Muttrc.gpg.dist
+
+EOF
+}
Deleted: extra-x86_64/pop-cachedir.patch
===================================================================
--- extra-x86_64/pop-cachedir.patch 2013-10-18 06:53:38 UTC (rev 196758)
+++ extra-x86_64/pop-cachedir.patch 2013-10-18 06:54:09 UTC (rev 196759)
@@ -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);
- }
