[arch-commits] Commit in mutt/repos (6 files)
Gaetan Bisson
bisson at archlinux.org
Tue Sep 1 01:17:07 UTC 2015
Date: Tuesday, September 1, 2015 @ 03:17:06
Author: bisson
Revision: 245125
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
mutt/repos/extra-i686/PKGBUILD
(from rev 245124, mutt/trunk/PKGBUILD)
mutt/repos/extra-x86_64/PKGBUILD
(from rev 245124, mutt/trunk/PKGBUILD)
Deleted:
mutt/repos/extra-i686/PKGBUILD
mutt/repos/extra-i686/cve-2014-9116.patch
mutt/repos/extra-x86_64/PKGBUILD
mutt/repos/extra-x86_64/cve-2014-9116.patch
----------------------------------+
/PKGBUILD | 94 +++++++++++++++++++++++++++++++++++++
extra-i686/PKGBUILD | 61 ------------------------
extra-i686/cve-2014-9116.patch | 35 -------------
extra-x86_64/PKGBUILD | 61 ------------------------
extra-x86_64/cve-2014-9116.patch | 35 -------------
5 files changed, 94 insertions(+), 192 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-09-01 01:16:35 UTC (rev 245124)
+++ extra-i686/PKGBUILD 2015-09-01 01:17:06 UTC (rev 245125)
@@ -1,61 +0,0 @@
-# $Id$
-# Contributor: tobias [tobias [at] archlinux.org]
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=mutt
-pkgver=1.5.23
-pkgrel=2
-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/${pkgname}-${pkgver}.tar.gz"
- 'cve-2014-9116.patch')
-sha1sums=('8ac821d8b1e25504a31bf5fda9c08d93a4acc862'
- '776e3e00fcf8a325e7b9c2bb456d3e9ba2c82307')
-
-makedepends=('mercurial')
-source=('hg+http://dev.mutt.org/hg/mutt#revision=2ca89bed64480780d0a435e89c13dba06c748094')
-sha1sums=('SKIP')
-pkgver=1.5.23.hg.20150711
-
-#prepare() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
-# patch -p1 -i ../cve-2014-9116.patch
-#}
-
-build() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
- cd "${srcdir}/${pkgname}"
-# ./configure \
- ./prepare \
- --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}"
- cd "${srcdir}/${pkgname}"
- 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
-}
Copied: mutt/repos/extra-i686/PKGBUILD (from rev 245124, mutt/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-09-01 01:17:06 UTC (rev 245125)
@@ -0,0 +1,47 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=mutt
+pkgver=1.5.24
+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=("http://ftp.mutt.org/pub/mutt/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha1sums=('38a2da5eb01ff83a90a2caee28fa2e95dbfe6898' 'SKIP')
+validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA')
+
+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/cve-2014-9116.patch
===================================================================
--- extra-i686/cve-2014-9116.patch 2015-09-01 01:16:35 UTC (rev 245124)
+++ extra-i686/cve-2014-9116.patch 2015-09-01 01:17:06 UTC (rev 245125)
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Kevin McCarthy <kevin at 8t8.us>
-# Date 1417472364 28800
-# Node ID 0aebf1df43598b442ac75ae4fe17875351854db0
-# Parent 5a86319adad0d17e4acaf8a580bfc9eb247547d0
-Revert write_one_header() to skip space and tab. (closes #3716)
-
-This patch fixes CVE-2014-9116 in the stable branch. It reverts
-write_one_header() to the pre [f251d523ca5a] code for skipping
-whitespace.
-
-Thanks to Antonio Radici and Tomas Hoger for their analysis and patches
-to mutt, which this patch is based off of.
-
-diff -r 5a86319adad0 -r 0aebf1df4359 sendlib.c
---- a/sendlib.c Mon Jan 05 18:28:59 2015 -0800
-+++ b/sendlib.c Mon Dec 01 14:19:24 2014 -0800
-@@ -1814,7 +1814,14 @@
- {
- tagbuf = mutt_substrdup (start, t);
- /* skip over the colon separating the header field name and value */
-- t = skip_email_wsp(t + 1);
-+ ++t;
-+
-+ /* skip over any leading whitespace (WSP, as defined in RFC5322)
-+ * NOTE: skip_email_wsp() does the wrong thing here.
-+ * See tickets 3609 and 3716. */
-+ while (*t == ' ' || *t == '\t')
-+ t++;
-+
- valbuf = mutt_substrdup (t, end);
- }
- dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-09-01 01:16:35 UTC (rev 245124)
+++ extra-x86_64/PKGBUILD 2015-09-01 01:17:06 UTC (rev 245125)
@@ -1,61 +0,0 @@
-# $Id$
-# Contributor: tobias [tobias [at] archlinux.org]
-# Maintainer: Gaetan Bisson <bisson at archlinux.org>
-
-pkgname=mutt
-pkgver=1.5.23
-pkgrel=2
-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/${pkgname}-${pkgver}.tar.gz"
- 'cve-2014-9116.patch')
-sha1sums=('8ac821d8b1e25504a31bf5fda9c08d93a4acc862'
- '776e3e00fcf8a325e7b9c2bb456d3e9ba2c82307')
-
-makedepends=('mercurial')
-source=('hg+http://dev.mutt.org/hg/mutt#revision=2ca89bed64480780d0a435e89c13dba06c748094')
-sha1sums=('SKIP')
-pkgver=1.5.23.hg.20150711
-
-#prepare() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
-# patch -p1 -i ../cve-2014-9116.patch
-#}
-
-build() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
- cd "${srcdir}/${pkgname}"
-# ./configure \
- ./prepare \
- --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}"
- cd "${srcdir}/${pkgname}"
- 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
-}
Copied: mutt/repos/extra-x86_64/PKGBUILD (from rev 245124, mutt/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-09-01 01:17:06 UTC (rev 245125)
@@ -0,0 +1,47 @@
+# $Id$
+# Contributor: tobias [tobias [at] archlinux.org]
+# Maintainer: Gaetan Bisson <bisson at archlinux.org>
+
+pkgname=mutt
+pkgver=1.5.24
+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=("http://ftp.mutt.org/pub/mutt/${pkgname}-${pkgver}.tar.gz"{,.asc})
+sha1sums=('38a2da5eb01ff83a90a2caee28fa2e95dbfe6898' 'SKIP')
+validpgpkeys=('8975A9B33AA37910385C5308ADEF768480316BDA')
+
+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/cve-2014-9116.patch
===================================================================
--- extra-x86_64/cve-2014-9116.patch 2015-09-01 01:16:35 UTC (rev 245124)
+++ extra-x86_64/cve-2014-9116.patch 2015-09-01 01:17:06 UTC (rev 245125)
@@ -1,35 +0,0 @@
-
-# HG changeset patch
-# User Kevin McCarthy <kevin at 8t8.us>
-# Date 1417472364 28800
-# Node ID 0aebf1df43598b442ac75ae4fe17875351854db0
-# Parent 5a86319adad0d17e4acaf8a580bfc9eb247547d0
-Revert write_one_header() to skip space and tab. (closes #3716)
-
-This patch fixes CVE-2014-9116 in the stable branch. It reverts
-write_one_header() to the pre [f251d523ca5a] code for skipping
-whitespace.
-
-Thanks to Antonio Radici and Tomas Hoger for their analysis and patches
-to mutt, which this patch is based off of.
-
-diff -r 5a86319adad0 -r 0aebf1df4359 sendlib.c
---- a/sendlib.c Mon Jan 05 18:28:59 2015 -0800
-+++ b/sendlib.c Mon Dec 01 14:19:24 2014 -0800
-@@ -1814,7 +1814,14 @@
- {
- tagbuf = mutt_substrdup (start, t);
- /* skip over the colon separating the header field name and value */
-- t = skip_email_wsp(t + 1);
-+ ++t;
-+
-+ /* skip over any leading whitespace (WSP, as defined in RFC5322)
-+ * NOTE: skip_email_wsp() does the wrong thing here.
-+ * See tickets 3609 and 3716. */
-+ while (*t == ' ' || *t == '\t')
-+ t++;
-+
- valbuf = mutt_substrdup (t, end);
- }
- dprint(4,(debugfile,"mwoh: buf[%s%s] too long, "
-
More information about the arch-commits
mailing list