From 60cde2c2c71e4f5962ba8951885b581c69fdbcd5 Mon Sep 17 00:00:00 2001
From: Tee KOBAYASHI <xtkoba@gmail.com>
Date: Sat, 30 Apr 2022 04:00:58 +0900
Subject: [PATCH] lsof: Do not use `close_range`

---
 packages/lsof/build.sh     |  1 +
 packages/lsof/main.c.patch | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/packages/lsof/build.sh b/packages/lsof/build.sh
index b72aa9742..2060f82f8 100644
--- a/packages/lsof/build.sh
+++ b/packages/lsof/build.sh
@@ -3,6 +3,7 @@ TERMUX_PKG_DESCRIPTION="Lists open files for running Unix processes"
 TERMUX_PKG_LICENSE="custom"
 TERMUX_PKG_MAINTAINER="@termux"
 TERMUX_PKG_VERSION="4.95.0"
+TERMUX_PKG_REVISION=1
 TERMUX_PKG_SRCURL=https://github.com/lsof-org/lsof/archive/${TERMUX_PKG_VERSION}/lsof-${TERMUX_PKG_VERSION}.tar.gz
 TERMUX_PKG_SHA256=8ff4c77736cc7d9556da9e2c7614cc4292a12f1979f20bd520d3c6f64b66a4d7
 TERMUX_PKG_AUTO_UPDATE=true
diff --git a/packages/lsof/main.c.patch b/packages/lsof/main.c.patch
index e66e950e6..8d295edac 100644
--- a/packages/lsof/main.c.patch
+++ b/packages/lsof/main.c.patch
@@ -1,7 +1,6 @@
-diff -uNr lsof-4.93.2/main.c lsof-4.93.2.mod/main.c
---- lsof-4.93.2/main.c	2019-05-08 10:32:25.000000000 +0300
-+++ lsof-4.93.2.mod/main.c	2020-06-07 03:19:19.392693278 +0300
-@@ -121,7 +121,7 @@
+--- a/main.c
++++ b/main.c
+@@ -123,19 +123,19 @@
   * Make sure umask allows lsof to define its own file permissions.
   */
  
@@ -10,3 +9,17 @@ diff -uNr lsof-4.93.2/main.c lsof-4.93.2.mod/main.c
  	    MaxFd = 53;
  
  #if	defined(HAS_CLOSEFROM)
+ 	(void) closefrom(3);
+ #else	/* !defined(HAS_CLOSEFROM) */
+-#if	defined(SYS_close_range)
++#if	defined(SYS_close_range) && !defined(__ANDROID__)
+ 	if (MaxFd > 3 && syscall(SYS_close_range, 3, MaxFd - 1, 0) == 0)
+ 	    goto closed;
+ #endif
+ 	for (i = 3; i < MaxFd; i++)
+ 	    (void) close(i);
+-#if	defined(SYS_close_range)
++#if	defined(SYS_close_range) && !defined(__ANDROID__)
+   closed:
+ #endif
+ #endif	/* !defined(HAS_CLOSEFROM) */