From 8da3b153d4a151b4a7a504c9a7779efb04dbf914 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Fri, 20 Oct 2023 20:03:40 +0200
Subject: [PATCH] Rebase to lsof-4.98.0

---
 .gitignore           |  1 +
 lsof-Configure.patch | 27 ---------------------------
 lsof.spec            | 19 +++++++++++--------
 sources              |  3 +--
 4 files changed, 13 insertions(+), 37 deletions(-)
 delete mode 100644 lsof-Configure.patch

diff --git a/.gitignore b/.gitignore
index e0720ce..f785c3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /lsof-4.94.0-rh.tar.xz
 /lsof-4.95.0-rh.tar.xz
 /lsof-4.96.3-rh.tar.xz
+/lsof-4.98.0-rh.tar.xz
diff --git a/lsof-Configure.patch b/lsof-Configure.patch
deleted file mode 100644
index 96b5ceb..0000000
--- a/lsof-Configure.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Avoid C89isms during configure checks.
-
-Submitted upstream: <https://github.com/lsof-org/lsof/pull/265>
-
-diff --git a/Configure b/Configure
-index d8adfda3e47f87df..ed1e1d60840b3852 100755
---- a/Configure
-+++ b/Configure
-@@ -2189,7 +2189,7 @@ LOCKF_OWNER4
- #include <netinet/in.h>
- #include <netinet/in_pcb.h>
- #include <netinet/tcp_var.h>
--main() {
-+int main() {
- struct xtcpcb pcb; pcb.t_maxseg = 0;
- }
- .LSOF_END_HERE_DOC4
-@@ -2755,7 +2755,8 @@ struct xtcpcb pcb; pcb.t_maxseg = 0;
-       rm -f ${LSOF_TMPC}.*
-       cat > $LSOF_TMPC.c << .LSOF_END_HERE_DOC1
- #include <features.h>
--main() {
-+#include <stdio.h>
-+int main() {
- #if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
- printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__);
- #elif defined(__GLIBC__)
diff --git a/lsof.spec b/lsof.spec
index 7809a93..67bedb3 100644
--- a/lsof.spec
+++ b/lsof.spec
@@ -1,9 +1,8 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.96.3
-Release: 4%{?dist}
-# Sendmail .. lib/snpf.c
-License: lsof AND Sendmail
+Version: 4.98.0
+Release: 1%{?dist}
+License: lsof AND GPL-3.0-or-later
 URL: https://github.com/lsof-org/lsof
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
@@ -18,13 +17,14 @@ Source1: upstream2downstream.sh
 
 # BZ#1260300 - move lsof man page to section 1
 Patch0: lsof-man-page-section.patch
-Patch1: lsof-Configure.patch
 
 BuildRequires: gcc
 BuildRequires: libselinux-devel
 BuildRequires: libtirpc-devel
 BuildRequires: groff-base
 BuildRequires: make
+BuildRequires: automake
+BuildRequires: autoconf
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists information
@@ -32,11 +32,11 @@ about files that are open by the processes running on a UNIX system.
 
 %prep
 %setup -q -n %{lsofrh}
-%patch0 -p1 -b .man-page-section
-%patch1 -p1
+%autopatch -p1
+#%patch1 -p1
 
 %build
-./Configure -n linux
+%configure
 %make_build DEBUG="%{build_cflags} -I/usr/include/tirpc" CFGL="%{build_ldflags} -L./lib -llsof -lselinux -ltirpc"
 # rebase to 4.93 introduced change in Lsof.8 with unhandled .so inclusion
 soelim -r Lsof.8 > lsof.1
@@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_mandir}/man*/*
 
 %changelog
+* Fri Oct 20 2023 Jan Rybar <jrybar@redhat.com> - 4.98.0-1
+- rebase to lsof-4.98
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.96.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index d5264de..339a190 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (lsof-4.95.0-rh.tar.xz) = 305adc829f2bc4b2f3fcec7060b0bc457feec970bce663e34a37adce42ace09258e0d4a9ec5c3e064feb7637b0f1a47f1c764bad9d25bc756ae8f823aa6e2a53
-SHA512 (lsof-4.96.3-rh.tar.xz) = 6f289662aa8c2d075d04d7a272c20cf6f06ddeb3af5b70650c1ba607e1517d6c19ee320a2207af61aed67cb8f11be994350c656b990ad9db696c41ab5019128c
+SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683