summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/mutt/Makefile11
-rw-r--r--package/mutt/patches/patch-Makefile_in14
-rw-r--r--package/mutt/patches/patch-mutt_ssl_c20
3 files changed, 13 insertions, 32 deletions
diff --git a/package/mutt/Makefile b/package/mutt/Makefile
index 0454d4627..05bb5096e 100644
--- a/package/mutt/Makefile
+++ b/package/mutt/Makefile
@@ -4,15 +4,16 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mutt
-PKG_VERSION:= 1.5.20
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 027cdd9959203de0c3c64149a7ee351c
-PKG_DESCR:= Mail text client
+PKG_VERSION:= 1.5.23
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 11f5b6a3eeba1afa1257fe93c9f26bff
+PKG_DESCR:= mail text client
PKG_SECTION:= mail
PKG_DEPENDS:= libncurses libopenssl
PKG_BUILDDEP:= ncurses openssl
PKG_URL:= http://www.mutt.org/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=mutt/}
+PKG_SITES:= ftp://ftp.mutt.org/mutt/devel/ \
+ http://ftp.hi.is/pub/mutt/
include ${TOPDIR}/mk/package.mk
diff --git a/package/mutt/patches/patch-Makefile_in b/package/mutt/patches/patch-Makefile_in
index 3a6601abe..c4bcb93db 100644
--- a/package/mutt/patches/patch-Makefile_in
+++ b/package/mutt/patches/patch-Makefile_in
@@ -1,20 +1,20 @@
---- 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
+--- mutt-1.5.23.orig/Makefile.in 2014-03-12 17:26:44.000000000 +0100
++++ mutt-1.5.23/Makefile.in 2014-03-27 11:06:17.000000000 +0100
+@@ -259,7 +259,7 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
+ CSCOPE = cscope
-DIST_SUBDIRS = m4 po intl doc contrib imap
+DIST_SUBDIRS = m4 po intl contrib imap
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
-@@ -340,7 +340,7 @@ top_srcdir = @top_srcdir@
+@@ -451,7 +451,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
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR)
bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@
- BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h hcversion.h
- mutt_SOURCES = \
+ @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
+ BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)
diff --git a/package/mutt/patches/patch-mutt_ssl_c b/package/mutt/patches/patch-mutt_ssl_c
deleted file mode 100644
index 160dc668c..000000000
--- a/package/mutt/patches/patch-mutt_ssl_c
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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)));
- }
-