From a79f1752180e90ec7ea7003e5a10acd5444c1fe8 Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 8 Nov 2015 01:43:03 -0500 Subject: [PATCH] mutt: Update from 1.5.23 to 1.5.24 --- packages/mutt/build.sh | 3 +-- packages/mutt/makefile.in.patch | 10 +++++----- packages/mutt/smime_keys_path.patch | 13 +++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/mutt/build.sh b/packages/mutt/build.sh index cbfd2d4c..237b3a8e 100644 --- a/packages/mutt/build.sh +++ b/packages/mutt/build.sh @@ -1,7 +1,6 @@ TERMUX_PKG_HOMEPAGE=http://www.mutt.org/ TERMUX_PKG_DESCRIPTION="Mail client" -TERMUX_PKG_VERSION=1.5.23 -TERMUX_PKG_BUILD_REVISION=1 +TERMUX_PKG_VERSION=1.5.24 TERMUX_PKG_SRCURL=https://bitbucket.org/mutt/mutt/downloads/mutt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_DEPENDS="libandroid-support, ncurses, openssl" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed" diff --git a/packages/mutt/makefile.in.patch b/packages/mutt/makefile.in.patch index 95d363e7..723fbcf3 100644 --- a/packages/mutt/makefile.in.patch +++ b/packages/mutt/makefile.in.patch @@ -1,12 +1,12 @@ -diff -u -r ../mutt-1.5.23/Makefile.in ./Makefile.in ---- ../mutt-1.5.23/Makefile.in 2014-03-12 17:26:44.000000000 +0100 -+++ ./Makefile.in 2014-07-02 04:15:30.884707410 +0200 -@@ -451,7 +451,7 @@ +diff -u -r ../mutt-1.5.24/Makefile.in ./Makefile.in +--- ../mutt-1.5.24/Makefile.in 2015-08-30 13:24:26.000000000 -0400 ++++ ./Makefile.in 2015-11-08 01:39:51.544139704 -0500 +@@ -458,7 +458,7 @@ 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@ + bin_SCRIPTS = muttbug flea $(SMIMEAUX_TARGET) @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) diff --git a/packages/mutt/smime_keys_path.patch b/packages/mutt/smime_keys_path.patch index 23b146dc..4edfd22b 100644 --- a/packages/mutt/smime_keys_path.patch +++ b/packages/mutt/smime_keys_path.patch @@ -1,11 +1,12 @@ ---- mutt-1.5.23/smime_keys.pl 2014-03-12 17:03:45.000000000 +0100 -+++ mutt/smime_keys.pl 2015-09-27 07:13:21.000000000 +0200 -@@ -53,7 +53,7 @@ - # Get the directories mutt uses for certificate/key storage. +diff -u -r ../mutt-1.5.24/smime_keys.pl ./smime_keys.pl +--- ../mutt-1.5.24/smime_keys.pl 2015-08-30 13:06:38.000000000 -0400 ++++ ./smime_keys.pl 2015-11-08 01:41:12.179119879 -0500 +@@ -76,7 +76,7 @@ + my $mutt = $ENV{MUTT_CMDLINE} || 'mutt'; -my $opensslbin = "/usr/bin/openssl"; +my $opensslbin = "@TERMUX_PREFIX@/bin/openssl"; - my @tempfiles = (); - my @cert_tmp_file = (); + my $tmpdir; + # Get the directories mutt uses for certificate/key storage. -- 2.11.0