[arch-commits] Commit in mutt/repos (10 files)

Gaetan Bisson bisson at archlinux.org
Mon Sep 24 06:32:03 UTC 2012


    Date: Monday, September 24, 2012 @ 02:32:03
  Author: bisson
Revision: 166981

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  mutt/repos/extra-i686/1a4c43138685.patch
    (from rev 166980, mutt/trunk/1a4c43138685.patch)
  mutt/repos/extra-i686/PKGBUILD
    (from rev 166980, mutt/trunk/PKGBUILD)
  mutt/repos/extra-i686/install
    (from rev 166980, mutt/trunk/install)
  mutt/repos/extra-x86_64/1a4c43138685.patch
    (from rev 166980, mutt/trunk/1a4c43138685.patch)
  mutt/repos/extra-x86_64/PKGBUILD
    (from rev 166980, mutt/trunk/PKGBUILD)
  mutt/repos/extra-x86_64/install
    (from rev 166980, mutt/trunk/install)
Deleted:
  mutt/repos/extra-i686/PKGBUILD
  mutt/repos/extra-i686/install
  mutt/repos/extra-x86_64/PKGBUILD
  mutt/repos/extra-x86_64/install

---------------------------------+
 extra-i686/1a4c43138685.patch   |   12 ++++
 extra-i686/PKGBUILD             |   99 +++++++++++++++++++-------------------
 extra-i686/install              |   16 +++---
 extra-x86_64/1a4c43138685.patch |   12 ++++
 extra-x86_64/PKGBUILD           |   99 +++++++++++++++++++-------------------
 extra-x86_64/install            |   16 +++---
 6 files changed, 142 insertions(+), 112 deletions(-)

Copied: mutt/repos/extra-i686/1a4c43138685.patch (from rev 166980, mutt/trunk/1a4c43138685.patch)
===================================================================
--- extra-i686/1a4c43138685.patch	                        (rev 0)
+++ extra-i686/1a4c43138685.patch	2012-09-24 06:32:03 UTC (rev 166981)
@@ -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);
+ }

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-09-24 06:31:30 UTC (rev 166980)
+++ extra-i686/PKGBUILD	2012-09-24 06:32:03 UTC (rev 166981)
@@ -1,48 +0,0 @@
-# $Id$
-# Contributor: tobias [tobias [at] archlinux.org]
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=mutt
-pkgver=1.5.21
-pkgrel=6
-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=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
-
-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}"/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 166980, mutt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-09-24 06:32:03 UTC (rev 166981)
@@ -0,0 +1,51 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=mutt
+pkgver=1.5.21
+pkgrel=7
+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"
+        '1a4c43138685.patch')
+sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9'
+          '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	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 \
+
+	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
+}

Deleted: extra-i686/install
===================================================================
--- extra-i686/install	2012-09-24 06:31:30 UTC (rev 166980)
+++ extra-i686/install	2012-09-24 06:32:03 UTC (rev 166981)
@@ -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 166980, mutt/trunk/install)
===================================================================
--- extra-i686/install	                        (rev 0)
+++ extra-i686/install	2012-09-24 06:32:03 UTC (rev 166981)
@@ -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/extra-x86_64/1a4c43138685.patch (from rev 166980, mutt/trunk/1a4c43138685.patch)
===================================================================
--- extra-x86_64/1a4c43138685.patch	                        (rev 0)
+++ extra-x86_64/1a4c43138685.patch	2012-09-24 06:32:03 UTC (rev 166981)
@@ -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);
+ }

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-09-24 06:31:30 UTC (rev 166980)
+++ extra-x86_64/PKGBUILD	2012-09-24 06:32:03 UTC (rev 166981)
@@ -1,48 +0,0 @@
-# $Id$
-# Contributor: tobias [tobias [at] archlinux.org]
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=mutt
-pkgver=1.5.21
-pkgrel=6
-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=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9')
-
-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}"/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 166980, mutt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-09-24 06:32:03 UTC (rev 166981)
@@ -0,0 +1,51 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=mutt
+pkgver=1.5.21
+pkgrel=7
+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"
+        '1a4c43138685.patch')
+sha1sums=('a8475f2618ce5d5d33bff85c0affdf21ab1d76b9'
+          '32dbcafe05e4a919fd00c6a1064c6ecd205e6eb1')
+
+install=install
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	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 \
+
+	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
+}

Deleted: extra-x86_64/install
===================================================================
--- extra-x86_64/install	2012-09-24 06:31:30 UTC (rev 166980)
+++ extra-x86_64/install	2012-09-24 06:32:03 UTC (rev 166981)
@@ -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 166980, mutt/trunk/install)
===================================================================
--- extra-x86_64/install	                        (rev 0)
+++ extra-x86_64/install	2012-09-24 06:32:03 UTC (rev 166981)
@@ -0,0 +1,8 @@
+post_install() {
+	cat <<EOF
+
+==> For GPG support, add the following to your muttrc:
+==> source /etc/Muttrc.gpg.dist
+
+EOF
+}




More information about the arch-commits mailing list