mutt: Update from 1.5.23 to 1.5.24

This commit is contained in:
Fredrik Fornwall 2015-11-08 01:43:03 -05:00
parent c9c6e8d142
commit a79f175218
3 changed files with 13 additions and 13 deletions

View File

@ -1,7 +1,6 @@
TERMUX_PKG_HOMEPAGE=http://www.mutt.org/ TERMUX_PKG_HOMEPAGE=http://www.mutt.org/
TERMUX_PKG_DESCRIPTION="Mail client" TERMUX_PKG_DESCRIPTION="Mail client"
TERMUX_PKG_VERSION=1.5.23 TERMUX_PKG_VERSION=1.5.24
TERMUX_PKG_BUILD_REVISION=1
TERMUX_PKG_SRCURL=https://bitbucket.org/mutt/mutt/downloads/mutt-${TERMUX_PKG_VERSION}.tar.gz TERMUX_PKG_SRCURL=https://bitbucket.org/mutt/mutt/downloads/mutt-${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_DEPENDS="libandroid-support, ncurses, openssl" 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" TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed"

View File

@ -1,12 +1,12 @@
diff -u -r ../mutt-1.5.23/Makefile.in ./Makefile.in diff -u -r ../mutt-1.5.24/Makefile.in ./Makefile.in
--- ../mutt-1.5.23/Makefile.in 2014-03-12 17:26:44.000000000 +0100 --- ../mutt-1.5.24/Makefile.in 2015-08-30 13:24:26.000000000 -0400
+++ ./Makefile.in 2014-07-02 04:15:30.884707410 +0200 +++ ./Makefile.in 2015-11-08 01:39:51.544139704 -0500
@@ -451,7 +451,7 @@ @@ -458,7 +458,7 @@
AUTOMAKE_OPTIONS = 1.6 foreign AUTOMAKE_OPTIONS = 1.6 foreign
@BUILD_IMAP_TRUE@IMAP_SUBDIR = imap @BUILD_IMAP_TRUE@IMAP_SUBDIR = imap
@BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap @BUILD_IMAP_TRUE@IMAP_INCLUDES = -I$(top_srcdir)/imap
-SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) -SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR)
+SUBDIRS = m4 po intl 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 @BUILD_HCACHE_TRUE@HCVERSION = hcversion.h
BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION) BUILT_SOURCES = keymap_defs.h patchlist.c reldate.h conststrings.c $(HCVERSION)

View File

@ -1,11 +1,12 @@
--- mutt-1.5.23/smime_keys.pl 2014-03-12 17:03:45.000000000 +0100 diff -u -r ../mutt-1.5.24/smime_keys.pl ./smime_keys.pl
+++ mutt/smime_keys.pl 2015-09-27 07:13:21.000000000 +0200 --- ../mutt-1.5.24/smime_keys.pl 2015-08-30 13:06:38.000000000 -0400
@@ -53,7 +53,7 @@ +++ ./smime_keys.pl 2015-11-08 01:41:12.179119879 -0500
# Get the directories mutt uses for certificate/key storage. @@ -76,7 +76,7 @@
my $mutt = $ENV{MUTT_CMDLINE} || 'mutt'; my $mutt = $ENV{MUTT_CMDLINE} || 'mutt';
-my $opensslbin = "/usr/bin/openssl"; -my $opensslbin = "/usr/bin/openssl";
+my $opensslbin = "@TERMUX_PREFIX@/bin/openssl"; +my $opensslbin = "@TERMUX_PREFIX@/bin/openssl";
my @tempfiles = (); my $tmpdir;
my @cert_tmp_file = ();
# Get the directories mutt uses for certificate/key storage.