neomutt: update to 20211029

This commit is contained in:
Yaksh Bariya 2021-12-15 18:22:58 +05:30
parent 938b698ea8
commit b41215f92a
No known key found for this signature in database
GPG Key ID: F7486BA7D3D27581
3 changed files with 20 additions and 26 deletions

View File

@ -1,13 +1,11 @@
diff --git a/autosetup/autosetup-config.guess b/autosetup/autosetup-config.guess
index 256083a70..946ee1ea2 100755
--- a/autosetup/autosetup-config.guess
+++ b/autosetup/autosetup-config.guess
@@ -99,7 +99,7 @@ trap 'exit 1' 1 2 15
set_cc_for_build='
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
+: ${TMPDIR=@TERMUX_PREFIX@/tmp} ;
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
--- ./autosetup/autosetup-config.guess.orig 2021-12-15 17:51:59.116965854 +0530
+++ ./autosetup/autosetup-config.guess 2021-12-15 17:55:55.635005030 +0530
@@ -114,7 +114,7 @@
set_cc_for_build() {
# prevent multiple calls if $tmp is already set
test "$tmp" && return 0
- : "${TMPDIR=/tmp}"
+ : "${TMPDIR=@TERMUX_PREFIX@/tmp}"
# shellcheck disable=SC2039,SC3028
{ tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } ||

View File

@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://neomutt.org/
TERMUX_PKG_DESCRIPTION="A version of mutt with added features"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=20210205
TERMUX_PKG_REVISION=3
TERMUX_PKG_VERSION=20211029
TERMUX_PKG_SRCURL=https://github.com/neomutt/neomutt/archive/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=77e177780fc2d8abb475d9cac4342c7e61d53c243f6ce2f9bc86d819fc962cdb
TERMUX_PKG_SHA256=08245cfa7aec80b895771fd1adcbb7b86e9c0434dfa64574e3c8c4d692aaa078
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_AUTO_UPDATE_TAG_REGEXP="\d{8}"
TERMUX_PKG_DEPENDS="gdbm, krb5, libiconv, libsasl, ncurses, notmuch, openssl, zlib, zstd"

View File

@ -1,16 +1,13 @@
diff --git a/mutt/file.c b/mutt/file.c
index 05a4918d6..bd8b14620 100644
--- a/mutt/file.c
+++ b/mutt/file.c
@@ -353,6 +353,11 @@ int mutt_file_symlink(const char *oldpath, const char *newpath)
--- ./mutt/file.c.orig 2021-12-15 17:56:42.465005012 +0530
+++ ./mutt/file.c 2021-12-15 18:16:25.832322927 +0530
@@ -354,6 +354,10 @@
*/
int mutt_file_safe_rename(const char *src, const char *target)
{
+/* Android (since 6.0) does not support hardlinks. */
+#ifdef __ANDROID__
+/* Since Android 6.0, hardlinks are unsupported */
+#if defined(__ANDROID__)
+ return rename(src, target);
+#endif
+
struct stat ssb, tsb;
struct stat st_src = { 0 };
struct stat st_target = { 0 };
int link_errno;