Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

the zlib license has been found to not match zlib and got new SPDX identifier. See:
 https://gitlab.com/fedora/legal/fedora-license-data/-/issues/307
 https://github.com/spdx/license-list-XML/issues/2100

I removed the LGPLv2 because I could not find any such text in regex.c or regex.h.

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2

.gitignore

@@ -1 +1,6 @@
-/lsof_4.87-rh.tar.xz
+/lsof_4.91-rh.tar.xz
+/lsof-4.93.2-rh.tar.xz
+/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

f42-ftbfs.patch

@@ -0,0 +1,31 @@
+diff --git a/misc.c b/misc.c
+index 9f443ea..a4bb3db 100644
+--- a/misc.c
++++ b/misc.c
+@@ -58,7 +58,7 @@ _PROTOTYPE(static void closePipes,(void));
+ _PROTOTYPE(static int dolstat,(char *path, char *buf, int len));
+ _PROTOTYPE(static int dostat,(char *path, char *buf, int len));
+ _PROTOTYPE(static int doreadlink,(char *path, char *buf, int len));
+-_PROTOTYPE(static int doinchild,(int (*fn)(), char *fp, char *rbuf, int rbln));
++_PROTOTYPE(static int doinchild,(int (*fn)(char *, char *, int), char *fp, char *rbuf, int rbln));
+ 
+ #if	defined(HASINTSIGNAL)
+ _PROTOTYPE(static int handleint,(int sig));
+@@ -234,7 +234,7 @@ compdev(a1, a2)
+ 
+ static int
+ doinchild(fn, fp, rbuf, rbln)
+-	int (*fn)();			/* function to perform */
++	int (*fn)(char *, char *, int);			/* function to perform */
+ 	char *fp;			/* function parameter */
+ 	char *rbuf;			/* response buffer */
+ 	int rbln;			/* response buffer length */
+@@ -296,7 +296,7 @@ doinchild(fn, fp, rbuf, rbln)
+ 			     */
+ 			    struct stat _;
+ 		    } r;
+-		    int (*r_fn)();
++		    int (*r_fn)(char *, char *, int);
+ 		/*
+ 		 * Close sufficient open file descriptors except Pipes[0] and
+ 		 * Pipes[3].

lsof-man-page-section.patch

@@ -0,0 +1,10 @@
+diff -up ./Lsof.8.ori ./Lsof.8
+--- ./Lsof.8.ori	2022-09-20 19:46:03.560004892 +0200
++++ ./Lsof.8	2022-09-20 19:46:17.578086787 +0200
+@@ -1,5 +1,5 @@
+ .so ./version
+-.TH LSOF 8 Revision-\*(VN
++.TH LSOF 1 Revision-\*(VN
+ .\" Register )P is used neither by this file nor any groff macro.  However,
+ .\" some versions of nroff require it.
+ .if !\n(.g \{\

lsof-tirpc.patch

@@ -0,0 +1,11 @@
+--- lsof_4.91-rh/Configure.orig	2018-05-22 15:54:57.275682247 +0200
++++ lsof_4.91-rh/Configure	2018-05-22 15:55:22.314556548 +0200
+@@ -2945,7 +2945,7 @@ return(0); }
+ 
+     # Test for <rpc/rpc.h>.
+ 
+-    if ! test -r ${LSOF_INCLUDE}/rpc/rpc.h	# {
++    if ! test -r ${LSOF_INCLUDE}/tirpc/rpc/rpc.h	# {
+     then
+       LSOF_CFGF="$LSOF_CFGF -DHASNORPC_H"
+     fi	# }

lsof.spec

@@ -1,49 +1,189 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.87
-Release: 2%{?dist}
-# Sendmail .. lib/snpf.c
-# LGPLv2+  .. lib/regex.c, regex.h
-License: zlib and Sendmail and LGPLv2+
-Group: Development/Debuggers
+Version: 4.98.0
+Release: 8%{?dist}
+License: lsof
+URL: https://github.com/lsof-org/lsof
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
 # upstream2downstream.sh script to remove the code before shipping it.
 #
-# The script you can found in SCM or download from:
-# http://pkgs.fedoraproject.org/gitweb/?p=lsof.git;a=blob_plain;f=upstream2downstream.sh
+# The script can be found in SCM or downloaded from:
+# http://pkgs.fedoraproject.org/cgit/lsof.git/tree/upstream2downstream.sh
 
-%global lsofrh lsof_%{version}-rh
-URL: http://people.freebsd.org/~abe/
+%global lsofrh lsof-%{version}-rh
 Source0: %{lsofrh}.tar.xz
 Source1: upstream2downstream.sh
 
+# BZ#1260300 - move lsof man page to section 1
+Patch0: lsof-man-page-section.patch
+Patch1: f42-ftbfs.patch
+
+BuildRequires: gcc
 BuildRequires: libselinux-devel
+BuildRequires: libtirpc-devel
+BuildRequires: groff-base
+BuildRequires: make
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: git
 
 %description
-Lsof stands for LiSt Open Files, and it does just that: it lists
-information about files that are open by the processes running on a
-UNIX system.
+Lsof stands for LiSt Open Files, and it does just that: it lists information
+about files that are open by the processes running on a UNIX system.
 
 %prep
-%setup -q -n %{lsofrh}
+%autosetup -n %{lsofrh} -S git
 
 %build
-./Configure -n linux
-make DEBUG="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%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
 
 %install
-mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
-install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_sbindir}
-mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man8
-install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
+install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 
 %files
-%doc 00* README.lsof_*
-%{_sbindir}/lsof
+%doc 00README 00CREDITS 00FAQ 00LSOF-L 00QUICKSTART
+%{_bindir}/lsof
 %{_mandir}/man*/*
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Fri Jan 24 2025 Jan Rybar <jrybar@redhat.com> - 4.98.0-7
+- FTBFS: stricter check, incompatible types
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.98.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 23 2023 Jan Rybar <jrybar@redhat.com> - 4.98.0-2
+- version bump due to licence fix
+
+* 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
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.96.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Nov 21 2022 Florian Weimer <fweimer@redhat.com> - 4.96.3-2
+- Fix C89isms in Configure
+
+* Tue Sep 20 2022 Jan Rybar <jrybar@redhat.com> - 4.96.3-1
+- rebase to 4.96.3
+
+* Fri Sep 02 2022 Jan Rybar <jrybar@redhat.com> - 4.95.0-1
+- rebase to 4.95.0
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.94.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Thu Jan 28 2021 Jan Rybar <jrybar@redhat.com> - 4.94.0-1
+- Rebase to 4.94.0
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.93.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue May 28 2019 Jan Rybar <jrybar@redhat.com> - 4.93.2-1
+- Rebase to lsof-4.93.2
+- Upstream moved to GitHub and tarball structure changed
+- Manpage patch needed to reflect the tarball changes
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.91-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.91-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue May 22 2018 Peter Schiffer <pschiffe@redhat.com> - 4.91-1
+- resolves: #1560993
+  updated to 4.91
+- resolves: #1574669
+  use tirpc library for rpc
+
+* Fri Apr 13 2018 Rafael dos Santos <rdossant@redhat.com> - 4.90-2
+- Use standard Fedora build flags (bug #1548552)
+
+* Wed Feb 21 2018 Peter Schiffer <pschiffe@redhat.com> - 4.90-1
+- resolves: #1545963
+  updated to 4.90
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Sat Mar  5 2016 Peter Robinson <pbrobinson@fedoraproject.org> 4.89-4
+- Only ship end user useful docs, don't ship bits for building
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 4.89-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Nov 30 2015 Peter Schiffer <pschiffe@redhat.com> - 4.89-2
+- resolves #1260300
+  moved lsof to /usr/bin, it's not sysadmin only utility
+
+* Wed Jul 29 2015 Peter Schiffer <pschiffe@redhat.com> - 4.89-1
+-  updated to 4.89
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.88-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Jan  6 2015 Peter Schiffer <pschiffe@redhat.com> - 4.88-2
+-  added upstream patch fixing unwanted pipe file output
+-  cleaned .spec file
+
+* Wed Oct 15 2014 Peter Schiffer <pschiffe@redhat.com> - 4.88-1
+-  updated to 4.88
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.87-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -193,104 +333,3 @@ install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man8
 - update to 4.73
 - remove lsof_4.72-sock.patch, already in the upstream code
 
-* Fri Jul 30 2004 Jakub Jelinek <jakub@redhat.com> 4.72-1
-- update to 4.72
-- use st_dev/st_ino comparison for sockets by name if possible
-  (#126419)
-
-* Fri Jul 18 2003 Jakub Jelinek <jakub@redhat.com> 4.68-1
-- update to 4.68 (#99064)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Thu Dec 12 2002 Tim Powers <timp@redhat.com> 4.63-3
-- rebuild on all arches
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Fri Jun 21 2002 Jakub Jelinek <jakub@redhat.com> 4.63-1
-- update to 4.63 (#66333).
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Sun Jun 24 2001 Elliot Lee <sopwith@redhat.com>
-- Bump release + rebuild.
-
-* Thu Sep  7 2000 Jeff Johnson <jbj@redhat.com>
-- update to 4.51.
-
-* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Wed Jun 14 2000 Jeff Johnson <jbj@redhat.com>
-- FHS packaging.
-
-* Sun Mar 26 2000 Florian La Roche <Florian.LaRoche@redhat.com>
-- change to root:root perms
-
-* Wed Feb 02 2000 Cristian Gafton <gafton@redhat.com>
-- fix description
-- man pages are compressed
-
-* Wed Dec 22 1999 Jeff Johnson <jbj@redhat.com>
-- update to 4.47.
-
-* Tue Aug  3 1999 Jeff Johnson <jbj@redhat.com>
-- update to 4.45.
-
-* Fri Jun 25 1999 Jeff Johnson <jbj@redhat.com>
-- update to 4.44.
-
-* Fri May 14 1999 Jeff Johnson <jbj@redhat.com>
-- upgrade to 4.43 with sparc64 tweak (#2803)
-
-* Thu Apr 08 1999 Preston Brown <pbrown@redhat.com>
-- upgrade to 4.42 (security fix)
-
-* Sun Mar 21 1999 Cristian Gafton <gafton@redhat.com> 
-- auto rebuild in the new build environment (release 5)
-
-* Fri Mar 19 1999 Jeff Johnson <jbj@redhat.com>
-- turn off setgid kmem "just in case".
-
-* Thu Feb 18 1999 Jeff Johnson <jbj@redhat.com>
-- buffer overflow patch.
-- upgrade to 4.40.
-
-* Wed Dec 30 1998 Jeff Johnson <jbj@redhat.com>
-- update to "official" 4.39 release.
-
-* Wed Dec 16 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.39B (linux) with internal kernel src.
-
-* Tue Dec 15 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.39A (linux)
-
-* Sat Sep 19 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.37
-
-* Thu Sep 10 1998 Jeff Johnson <jbj@redhat.com>
-- update to 4.36
-
-* Thu Jul 23 1998 Jeff Johnson <jbj@redhat.com>
-- upgrade to 4.35.
-- rewrap for RH 5.2.
-
-* Mon Jun 29 1998 Maciej Lesniewski <nimir@kis.p.lodz.pl>
-  [4.34-1]
-- New version
-- Spec rewriten to use %%{name} and %%{version} macros
-- Removed old log enteries
-
-* Tue Apr 28 1998 Maciej Lesniewski <nimir@kis.p.lodz.pl>
-- Built under RH5
-- install macro was changed

sources

@@ -1 +1 @@
-60ee5b17ce374be2fe1f3c7f1e2da1ee  lsof_4.87-rh.tar.xz
+SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683

upstream2downstream.sh

@@ -12,27 +12,27 @@
 #
 
 UPSTREAM="$1"
-NAME=$(basename $UPSTREAM .tar.bz2)
+NAME=$(basename $UPSTREAM .tar.gz)
 MYPWD=$(pwd)
 TMP=$(mktemp -d)
 
 echo
 echo -n "Extracting upstream code..."
-tar -jxf $UPSTREAM  -C $TMP
+tar -xf $UPSTREAM  -C $TMP
 cd $TMP/$NAME
-tar xf "$NAME"_src.tar
-echo " done."
-
-echo -n "Moving files to downstream directory..."
-mv "$NAME"_src/ "$NAME"-rh
-mv README* 00* "$NAME"-rh
 echo " done."
 
 echo -n "Removing non-Linux dialects..."
-rm -rf "$NAME"-rh/dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
+rm -rf ./dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
+echo " done."
+
+echo -n "Removing unused distribution scripts..."
+rm -rf ./support
 echo " done."
 
 echo -n "Creating final downstream tarball..."
+cd ..
+mv $NAME $NAME-rh
 tar Jcf $MYPWD/"$NAME"-rh.tar.xz "$NAME"-rh
 echo " done."