From f91900f1bf62980ed1ce69e9dc61b9ed17b5dd37 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 6 Aug 2018 01:38:01 +0200
Subject: [PATCH] gnupg: Avoid hardlink test and debug message

---
 packages/gnupg/build.sh               |  2 +-
 packages/gnupg/common-dotlock.c.patch | 34 +++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 packages/gnupg/common-dotlock.c.patch

diff --git a/packages/gnupg/build.sh b/packages/gnupg/build.sh
index dec847337..d548ae177 100755
--- a/packages/gnupg/build.sh
+++ b/packages/gnupg/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://www.gnupg.org/
 TERMUX_PKG_DESCRIPTION="Implementation of the OpenPGP standard for encrypting and signing data and communication"
 TERMUX_PKG_VERSION=2.2.9
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SHA256=6278eaabffa1ebc9fa2ceb3dc53eea9a1505ab02a668a86dd6fec06951af2164
 TERMUX_PKG_SRCURL=https://www.gnupg.org/ftp/gcrypt/gnupg/gnupg-${TERMUX_PKG_VERSION}.tar.bz2
 TERMUX_PKG_DEPENDS="libassuan,libbz2,libgcrypt,libksba,libsqlite,libnpth,readline,pinentry,libgpg-error"
diff --git a/packages/gnupg/common-dotlock.c.patch b/packages/gnupg/common-dotlock.c.patch
new file mode 100644
index 000000000..76b1eaf22
--- /dev/null
+++ b/packages/gnupg/common-dotlock.c.patch
@@ -0,0 +1,34 @@
+Android does not support hardlinks so no need to try or nag.
+
+diff -u -r ../gnupg-2.2.9/common/dotlock.c ./common/dotlock.c
+--- ../gnupg-2.2.9/common/dotlock.c	2017-08-28 10:22:54.000000000 +0000
++++ ./common/dotlock.c	2018-08-05 21:40:02.699642490 +0000
+@@ -605,6 +605,9 @@
+ static int
+ use_hardlinks_p (const char *tname)
+ {
++#ifdef __ANDROID__
++  return 1;
++#else
+   char *lname;
+   struct stat sb;
+   unsigned int nlink;
+@@ -633,6 +636,7 @@
+   unlink (lname);
+   xfree (lname);
+   return res;
++#endif
+ }
+ #endif /*HAVE_POSIX_SYSTEM */
+ 
+@@ -758,8 +762,10 @@
+     }
+   strcpy (stpcpy (h->lockname, file_to_lock), EXTSEP_S "lock");
+   UNLOCK_all_lockfiles ();
++#ifndef __ANDROID__
+   if (h->use_o_excl)
+     my_debug_1 ("locking for '%s' done via O_EXCL\n", h->lockname);
++#endif
+ 
+   return h;
+