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

[Eric Bélanger]

    Date: Saturday, August 22, 2009 @ 00:01:26
  Author: eric
Revision: 50102

Merged revisions 27645,41855,46758,50054 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/mutt/trunk

........
  r27645 | james | 2009-02-24 00:35:32 -0500 (Tue, 24 Feb 2009) | 1 line
  
  upgpkg: mutt 1.5.19-1
........
  r41855 | thayer | 2009-06-07 13:51:02 -0400 (Sun, 07 Jun 2009) | 2 lines
  
  upgpkg: mutt 1.5.19-1
      upstream maintenance release
........
  r46758 | thayer | 2009-07-20 00:38:22 -0400 (Mon, 20 Jul 2009) | 2 lines
  
  upgpkg: mutt 1.5.20-1
      upstream maintenance release
........
  r50054 | thayer | 2009-08-18 20:43:14 -0400 (Tue, 18 Aug 2009) | 2 lines
  
  upgpkg: mutt 1.5.20-2
      fixed unmailbox seg fault
........

Added:
  mutt/repos/extra-x86_64/mutt-unmailbox.patch
    (from rev 50054, mutt/trunk/mutt-unmailbox.patch)
Modified:
  mutt/repos/extra-x86_64/	(properties)
  mutt/repos/extra-x86_64/PKGBUILD
  mutt/repos/extra-x86_64/mutt.install

----------------------+
 PKGBUILD             |   28 ++++++++++++++++++----------
 mutt-unmailbox.patch |   10 ++++++++++
 mutt.install         |    5 -----
 3 files changed, 28 insertions(+), 15 deletions(-)


Property changes on: mutt/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /mutt/trunk:1-1859
   + /mutt/trunk:1-50101

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-08-22 03:41:45 UTC (rev 50101)
+++ extra-x86_64/PKGBUILD	2009-08-22 04:01:26 UTC (rev 50102)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: tobias [tobias [at] archlinux.org]
 pkgname=mutt
-pkgver=1.5.18
-pkgrel=1
+pkgver=1.5.20
+pkgrel=2
 pkgdesc="A small but very powerful text-based mail client"
 arch=(i686 x86_64)
 license=('GPL')
@@ -10,12 +10,19 @@
 depends=('slang' 'openssl>=0.9.8e' 'gdbm' 'mime-types' 'zlib' 'libsasl' 'gpgme')
 makedepends=('gnupg')
 install=${pkgname}.install
-source=(ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz)
-md5sums=('27c30037120189b9f9c0d3e76361b8f8')
+source=(ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz 
+        mutt-unmailbox.patch)
 url="http://www.mutt.org/"
+md5sums=('027cdd9959203de0c3c64149a7ee351c'
+         'fa8e03a49a2fa7b294dc8237d928cdb7')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
+  cd ${srcdir}/${pkgname}-${pkgver}
+
+  # patch a segfault bug in 1.5.20 -- remove for next release
+  patch -p1 < ${srcdir}/mutt-unmailbox.patch || return 1
+  #patch -Np1 -i ../mutt-unmailbox.patch || exit 1
+
   ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-pop --enable-imap --enable-smtp \
     --with-sasl --with-ssl=/usr --without-idn \
@@ -23,9 +30,10 @@
 	 --enable-compressed --with-regex \
 	 --enable-gpgme --with-slang=/usr
   make || return 1
-  make DESTDIR=${startdir}/pkg install
-  rm -f ${startdir}/pkg/usr/bin/{flea,muttbug}
-  rm -f $startdir/pkg/usr/share/man/man1/{flea,muttbug}.1
-  rm -f ${startdir}/pkg/etc/mime.types*
-  install -Dm644 contrib/gpg.rc ${startdir}/pkg/etc/Muttrc.gpg.dist
+  make DESTDIR=${pkgdir} install
+  rm -f ${pkgdir}/usr/bin/{flea,muttbug}
+  rm -f ${pkgdir}/usr/share/man/man1/{flea,muttbug}.1
+  rm -f ${pkgdir}/etc/mime.types*
+  install -Dm644 contrib/gpg.rc ${pkgdir}/etc/Muttrc.gpg.dist
 }
+

Copied: mutt/repos/extra-x86_64/mutt-unmailbox.patch (from rev 50054, mutt/trunk/mutt-unmailbox.patch)
===================================================================
--- extra-x86_64/mutt-unmailbox.patch	                        (rev 0)
+++ extra-x86_64/mutt-unmailbox.patch	2009-08-22 04:01:26 UTC (rev 50102)
@@ -0,0 +1,10 @@
+--- a/buffy.c	2009-08-10 08:23:12.731846990 -0400
++++ b/buffy.c	2009-08-10 08:23:50.541878087 -0400
+@@ -236,7 +236,6 @@
+     {
+       if(*tmp)
+       {
+-        FREE (&((*tmp)->path));
+         tmp1=(*tmp)->next;
+         FREE (tmp);		/* __FREE_CHECKED__ */
+         *tmp=tmp1;

Modified: extra-x86_64/mutt.install
===================================================================
--- extra-x86_64/mutt.install	2009-08-22 03:41:45 UTC (rev 50101)
+++ extra-x86_64/mutt.install	2009-08-22 04:01:26 UTC (rev 50102)
@@ -6,7 +6,6 @@
 
 source /etc/Muttrc.gpg.dist
 
-
 EOM
 }
 
@@ -14,7 +13,3 @@
   post_install $1
 }
 
-op=$1
-shift
-$op $*
-# vim: ft=sh