From 2a7416c82d539b67365f024b707a6350888f64cd Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Fri, 17 Sep 2010 19:39:05 +0200
Subject: [PATCH] mutt: update to 1.5.21

---
 mutt/.footprint            |  1 +
 mutt/.md5sum               |  3 +--
 mutt/Pkgfile               |  9 +++------
 mutt/mutt-1.5.20-ssl.patch | 13 -------------
 4 files changed, 5 insertions(+), 21 deletions(-)
 delete mode 100644 mutt/mutt-1.5.20-ssl.patch

diff --git a/mutt/.footprint b/mutt/.footprint
index 30c232ab9..02194b6b2 100644
--- a/mutt/.footprint
+++ b/mutt/.footprint
@@ -10,6 +10,7 @@ drwxr-xr-x	root/root	usr/etc/
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/mutt.1.gz
+-rw-r--r--	root/root	usr/man/man1/smime_keys.1.gz
 drwxr-xr-x	root/root	usr/man/man5/
 -rw-r--r--	root/root	usr/man/man5/muttrc.5.gz
 drwxr-xr-x	root/root	usr/share/
diff --git a/mutt/.md5sum b/mutt/.md5sum
index a963f7a11..1af2b5d1e 100644
--- a/mutt/.md5sum
+++ b/mutt/.md5sum
@@ -1,2 +1 @@
-6000f60b02767e02f38b19b055831869  mutt-1.5.20-ssl.patch
-027cdd9959203de0c3c64149a7ee351c  mutt-1.5.20.tar.gz
+a29db8f1d51e2f10c070bf88e8a553fd  mutt-1.5.21.tar.gz
diff --git a/mutt/Pkgfile b/mutt/Pkgfile
index de17e0be5..f6519ee5f 100644
--- a/mutt/Pkgfile
+++ b/mutt/Pkgfile
@@ -4,16 +4,13 @@
 # Depends on:  gdbm ncurses openssl zlib
 
 name=mutt
-version=1.5.20
-release=2
-source=(ftp://ftp.mutt.org/mutt/devel/$name-$version.tar.gz
-        $name-$version-ssl.patch)
+version=1.5.21
+release=1
+source=(ftp://ftp.mutt.org/mutt/devel/$name-$version.tar.gz)
 
 build () {
     cd $name-$version
 
-    patch -p0 -i $SRC/$name-$version-ssl.patch
-
     ./configure --prefix=/usr \
                 --mandir=/usr/man \
                 --with-docdir=/usr/share/mutt \
diff --git a/mutt/mutt-1.5.20-ssl.patch b/mutt/mutt-1.5.20-ssl.patch
deleted file mode 100644
index fd3095631..000000000
--- a/mutt/mutt-1.5.20-ssl.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-# http://dev.mutt.org/trac/changeset/6031%3A1cf34ea1f128/mutt_ssl.c
-
-Index: mutt_ssl.c
-===================================================================
---- mutt_ssl.c	(revision 6016:dc09812e63a3)
-+++ mutt_ssl.c	(revision 6031:1cf34ea1f128)
-@@ -653,5 +653,5 @@
-   int bufsize;
-   /* needed to get the DNS subjectAltNames: */
--  STACK *subj_alt_names;
-+  STACK_OF(GENERAL_NAME) *subj_alt_names;
-   int subj_alt_names_count;
-   GENERAL_NAME *subj_alt_name;