summaryrefslogtreecommitdiff
path: root/package/mutt
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-06-13 18:06:45 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2010-06-13 18:06:45 +0200
commit8edb1cd5a6a03b391003a1047e0b3ca6d22acd45 (patch)
tree751b35f97d8dcc1c9da4f0c81d9707701e8d6710 /package/mutt
parent92dd4fee15cb7c33868c7d7213f82136955397b1 (diff)
bulk package update
Diffstat (limited to 'package/mutt')
-rw-r--r--package/mutt/patches/patch-Makefile_in11
-rw-r--r--package/mutt/patches/patch-mutt_ssl_c20
2 files changed, 25 insertions, 6 deletions
diff --git a/package/mutt/patches/patch-Makefile_in b/package/mutt/patches/patch-Makefile_in
index ab7867d78..3a6601abe 100644
--- a/package/mutt/patches/patch-Makefile_in
+++ b/package/mutt/patches/patch-Makefile_in
@@ -1,8 +1,7 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mutt-1.5.19.orig/Makefile.in 2009-01-05 20:24:13.000000000 +0100
-+++ mutt-1.5.19/Makefile.in 2009-05-10 19:02:17.000000000 +0200
-@@ -129,7 +129,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
- distclean-recursive maintainer-clean-recursive
+--- mutt-1.5.20.orig/Makefile.in 2009-06-09 08:50:44.000000000 +0200
++++ mutt-1.5.20/Makefile.in 2010-05-30 13:43:47.001613117 +0200
+@@ -155,7 +155,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGE
+ distdir dist dist-all distcheck
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = m4 po intl doc contrib imap
@@ -10,7 +9,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -291,7 +291,7 @@ top_srcdir = @top_srcdir@
+@@ -340,7 +340,7 @@ top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = 1.6 foreign
@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
diff --git a/package/mutt/patches/patch-mutt_ssl_c b/package/mutt/patches/patch-mutt_ssl_c
new file mode 100644
index 000000000..160dc668c
--- /dev/null
+++ b/package/mutt/patches/patch-mutt_ssl_c
@@ -0,0 +1,20 @@
+--- mutt-1.5.20.orig/mutt_ssl.c 2009-06-10 07:08:29.000000000 +0200
++++ mutt-1.5.20/mutt_ssl.c 2010-06-02 19:53:33.141613592 +0200
+@@ -652,7 +652,7 @@ static int check_host (X509 *x509cert, c
+ char *buf = NULL;
+ 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;
+ /* did we find a name matching hostname? */
+@@ -735,7 +735,7 @@ static int ssl_cache_trusted_cert (X509
+ {
+ dprint (1, (debugfile, "trusted: %s\n", c->name));
+ if (!SslSessionCerts)
+- SslSessionCerts = sk_new_null();
++ SslSessionCerts = sk_X509_new_null();
+ return (sk_X509_push (SslSessionCerts, X509_dup(c)));
+ }
+