lsof: update to 4.99.7

- convert the patch to a make option
- Add -J/-j options for JSON and JSON Lines output format.
- lsof_free_result(): handle result == NULL
- Fix missing parenthesis in lstat error message format
- Fix use-after-free in lsof_select_process_regex
- Fix truncated fd numbers in -F field output
- Display connection state for UDP sockets with -T option

Signed-off-by: Maxim Storchak <redacted>

diff --git a/utils/lsof/Makefile b/utils/lsof/Makefile
index 8eeb76c849782fc28d9dbcf653ccd92235685960..6062b32e4cf4bf56e99cd780e0458ea1377a064b 100644 (file)
--- a/utils/lsof/Makefile
+++ b/utils/lsof/Makefile
@@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=lsof
-PKG_VERSION:=4.99.6
+PKG_VERSION:=4.99.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/lsof-org/lsof/releases/download/$(PKG_VERSION)
-PKG_HASH:=6081dedf841cd61f8a022ff7cbe04ed78918a47dea3c39528c8571474167aa0f
+PKG_HASH:=4a10391aab0b8ce1f539e82a1966693b2a6cf225972a6504ebb7ec4fa71675de
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_MAINTAINER:=Maxim Storchak <m.storchak@gmail.com>
@@ -32,7 +32,12 @@ define Package/lsof
   URL:=https://lsof.readthedocs.io/en/latest/
 endef
 
-CONFIGURE_ARGS += --without-selinux --without-libtirpc
+CONFIGURE_ARGS += \
+    --without-selinux \
+    --without-libtirpc \
+    --disable-liblsof
+
+MAKE_FLAGS += man8_MANS=
 
 define Package/lsof/install
        $(INSTALL_DIR) $(1)/usr/bin

diff --git a/utils/lsof/patches/000-disable-man.patch b/utils/lsof/patches/000-disable-man.patch
deleted file mode 100644 (file)
index 0c4e06a..0000000
--- a/utils/lsof/patches/000-disable-man.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -212,11 +212,6 @@ EXTRA_DIST += 00.README.FIRST 00CREDITS
- # Testing
- EXTRA_DIST += tests/00README tests/TestDB tests/CkTestDB tests/Makefile tests/LsofTest.h check.bash
- 
--# Manpages
--lsof.man: Lsof.8 version 00DIALECTS
--      soelim < Lsof.8 > $@
--man8_MANS = lsof.man
--EXTRA_DIST += Lsof.8
- # Fix distcheck error
- clean-local:
-       rm -rf lsof.man