[arch-commits] Commit in mutt/trunk (PKGBUILD mutt_ssl.patch)

[Giovanni Scafora]

    Date: Thursday, April 1, 2010 @ 19:56:30
  Author: giovanni
Revision: 75622

upgpkg: mutt 1.5.20-3
openssl-1 rebuild

Added:
  mutt/trunk/mutt_ssl.patch
Modified:
  mutt/trunk/PKGBUILD

----------------+
 PKGBUILD       |   13 ++++++++-----
 mutt_ssl.patch |   11 +++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-04-01 23:43:46 UTC (rev 75621)
+++ PKGBUILD	2010-04-01 23:56:30 UTC (rev 75622)
@@ -2,26 +2,29 @@
 # Maintainer: tobias [tobias [at] archlinux.org]
 pkgname=mutt
 pkgver=1.5.20
-pkgrel=2
+pkgrel=3
 pkgdesc="A small but very powerful text-based mail client"
 arch=(i686 x86_64)
 license=('GPL')
 url="http://www.mutt.org/"
-depends=('slang' 'openssl>=0.9.8e' 'gdbm' 'mime-types' 'zlib' 'libsasl' 'gpgme')
+depends=('slang' 'openssl' 'gdbm' 'mime-types' 'zlib' 'libsasl' 'gpgme')
 makedepends=('gnupg')
 install=${pkgname}.install
 source=(ftp://ftp.mutt.org/mutt/devel/${pkgname}-${pkgver}.tar.gz 
-        mutt-unmailbox.patch)
+        mutt-unmailbox.patch
+        mutt_ssl.patch)
 url="http://www.mutt.org/"
 md5sums=('027cdd9959203de0c3c64149a7ee351c'
-         'fa8e03a49a2fa7b294dc8237d928cdb7')
+         'fa8e03a49a2fa7b294dc8237d928cdb7'
+         '3f54850315502ad47405421339ffae60')
 
 build() {
   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
+  # patch for openssl-1
+  patch -Np1 -i ${srcdir}/mutt_ssl.patch || return 1
 
   ./configure --prefix=/usr --sysconfdir=/etc \
     --enable-pop --enable-imap --enable-smtp \

Added: mutt_ssl.patch
===================================================================
--- mutt_ssl.patch	                        (rev 0)
+++ mutt_ssl.patch	2010-04-01 23:56:30 UTC (rev 75622)
@@ -0,0 +1,11 @@
+--- a/mutt_ssl.c	2009-06-10 07:08:29.000000000 +0200
++++ b/mutt_ssl.c	2010-04-02 01:42:55.000000000 +0200
+@@ -652,7 +652,7 @@
+   char *buf = NULL;
+   int bufsize;
+   /* needed to get the DNS subjectAltNames: */
+-  STACK *subj_alt_names;
++  STACK_OF(X509) *subj_alt_names;
+   int subj_alt_names_count;
+   GENERAL_NAME *subj_alt_name;
+   /* did we find a name matching hostname? */