From b41215f92a4f3ab580d45e2629ce8714f53df222 Mon Sep 17 00:00:00 2001
From: Yaksh Bariya <yakshbari4@gmail.com>
Date: Wed, 15 Dec 2021 18:22:58 +0530
Subject: [PATCH] neomutt: update to 20211029

---
 packages/neomutt/autosetup-config.guess.patch | 24 +++++++++----------
 packages/neomutt/build.sh                     |  5 ++--
 packages/neomutt/file.c.patch                 | 17 ++++++-------
 3 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/packages/neomutt/autosetup-config.guess.patch b/packages/neomutt/autosetup-config.guess.patch
index f25d7a82d..9c6e709d9 100644
--- a/packages/neomutt/autosetup-config.guess.patch
+++ b/packages/neomutt/autosetup-config.guess.patch
@@ -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) ; } ||
diff --git a/packages/neomutt/build.sh b/packages/neomutt/build.sh
index cebc2c020..6876484dd 100644
--- a/packages/neomutt/build.sh
+++ b/packages/neomutt/build.sh
@@ -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"
diff --git a/packages/neomutt/file.c.patch b/packages/neomutt/file.c.patch
index 232f5fe91..055922491 100644
--- a/packages/neomutt/file.c.patch
+++ b/packages/neomutt/file.c.patch
@@ -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;
-