From 2ab8f872d1a20816fca386853e620ea821f56e07 Mon Sep 17 00:00:00 2001
From: Henrik Grimler <henrik@grimler.se>
Date: Mon, 8 Nov 2021 21:00:36 +0100
Subject: [PATCH] lsof: avoid overriding termux_step_make

And update patch offsets.
---
 packages/lsof/Configure.patch | 52 ++++++-----------------------------
 packages/lsof/build.sh        |  7 ++---
 2 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/packages/lsof/Configure.patch b/packages/lsof/Configure.patch
index fd91da627..01139551a 100644
--- a/packages/lsof/Configure.patch
+++ b/packages/lsof/Configure.patch
@@ -1,6 +1,5 @@
-diff -uNr lsof-4.93.2/Configure lsof-4.93.2.mod/Configure
---- lsof-4.93.2/Configure	2019-05-08 10:32:25.000000000 +0300
-+++ lsof-4.93.2.mod/Configure	2020-06-07 03:20:36.117487707 +0300
+--- ../Configure.orig	2021-11-08 19:52:16.878340986 +0000
++++ ./Configure	2021-11-08 19:53:37.598405439 +0000
 @@ -2976,27 +2976,6 @@
        fi	#}
      fi	# }
@@ -29,47 +28,12 @@ diff -uNr lsof-4.93.2/Configure lsof-4.93.2.mod/Configure
    # Test for UNIX socket endpoint support.
  
      if test -r ${LSOF_INCLUDE}/linux/sock_diag.h -a -r ${LSOF_INCLUDE}/linux/unix_diag.h  # {
-@@ -5617,7 +5596,7 @@
- if test "X$LSOF_LIB_NO" = "X"	# {
- then
-   echo "" >> $LSOF_MKFC
--  echo "CFGL=	$LSOF_FCFGL -L./$LSOF_LIB -llsof $LSOF_CFGL" >> $LSOF_MKFC
-+  echo "CFGL=	$LSOF_FCFGL -Wl,-rpath=@TERMUX_PREFIX@/lib,--enable-new-dtags -L./$LSOF_LIB -llsof -L@TERMUX_PREFIX@/lib -ltirpc -landroid-support $LSOF_CFGL" >> $LSOF_MKFC
- fi	# }
- echo "" >> $LSOF_MKFC
- if test "X$LSOF_DEBUG" = "X"	# {
-diff -uNr lsof-4.93.2/OLD/Configure lsof-4.93.2.mod/OLD/Configure
---- lsof-4.93.2/OLD/Configure	2019-05-08 10:32:25.000000000 +0300
-+++ lsof-4.93.2.mod/OLD/Configure	2020-06-07 03:20:49.621626530 +0300
-@@ -2961,27 +2961,6 @@
-       fi	#}
-     fi	# }
- 
--    # Test for SELinux support.
--
--    LSOF_TMP1=0
--    if test "X$LINUX_HASSELINUX" = "X"	# {
--    then
--      if test -r ${LSOF_INCLUDE}/selinux/selinux.h	# {
--      then
--	LSOF_TMP1=1
--      fi	# }
--    else
--      if test "X$LINUX_HASSELINUX" = "XY" -o "X$LINUX_HASSELINUX" = "Xy" # {
--      then
--	LSOF_TMP1=1
--      fi	# }
--    fi	# }
--    if test $LSOF_TMP1 -eq 1	# {
--    then
--      LSOF_CFGF="$LSOF_CFGF -DHASSELINUX"
--      LSOF_CFGL="$LSOF_CFGL -lselinux"
--    fi	# }
--
-   # Test for UNIX socket endpoint support.
- 
-     if test -r ${LSOF_INCLUDE}/linux/sock_diag.h -a -r ${LSOF_INCLUDE}/linux/unix_diag.h  # {
-@@ -5591,7 +5570,7 @@
+@@ -5625,11 +5604,11 @@
+   LSOF_CFGF="$LSOF_CFGF -DLSOF_VSTR=\\\"$LSOF_TMP\\\""
+ fi	# }
+ echo "" >> $LSOF_MKFC
+-echo "CFGF=	$LSOF_CFGF" >> $LSOF_MKFC
++echo "CFGF=	$LSOF_CFGF -I@TERMUX_PREFIX@/include/tirpc" >> $LSOF_MKFC
  if test "X$LSOF_LIB_NO" = "X"	# {
  then
    echo "" >> $LSOF_MKFC
diff --git a/packages/lsof/build.sh b/packages/lsof/build.sh
index fbb3e3db6..e0b94a18f 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.94.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=a9865eeb581c3abaac7426962ddb112ecfd86a5ae93086eb4581ce100f8fa8f4
 TERMUX_PKG_AUTO_UPDATE=true
@@ -10,11 +11,7 @@ TERMUX_PKG_DEPENDS="libandroid-support, libtirpc"
 TERMUX_PKG_BUILD_IN_SRC=true
 
 termux_step_configure() {
-	./Configure -n linux
-}
-
-termux_step_make() {
-	make CC="$CC $CFLAGS $CPPFLAGS -I$TERMUX_PREFIX/include/tirpc"
+	LSOF_CC="$CC" ./Configure -n linux
 }
 
 termux_step_make_install() {