.gitignore

@@ -1,6 +1 @@
 /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

@@ -1,31 +0,0 @@
-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

@@ -1,10 +1,10 @@
-diff -up ./Lsof.8.ori ./Lsof.8
+diff -upr lsof_4.89-rh.orig/lsof.8 lsof_4.89-rh/lsof.8
---- ./Lsof.8.ori	2022-09-20 19:46:03.560004892 +0200
+--- lsof_4.89-rh.orig/lsof.8	2015-11-30 13:09:37.785075681 +0100
-+++ ./Lsof.8	2022-09-20 19:46:17.578086787 +0200
++++ lsof_4.89-rh/lsof.8	2015-11-30 13:10:11.663029129 +0100
 @@ -1,5 +1,5 @@
- .so ./version
+ .ds VN 4.91
 -.TH LSOF 8 Revision-\*(VN
 +.TH LSOF 1 Revision-\*(VN
- .\" Register )P is used neither by this file nor any groff macro.  However,
+ \" Register )P is used neither by this file nor any groff macro.  However,
- .\" some versions of nroff require it.
+ \" some versions of nroff require it.
  .if !\n(.g \{\

lsof.spec

@@ -1,9 +1,11 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
-Version: 4.98.0
+Version: 4.91
-Release: 8%{?dist}
+Release: 3%{?dist}
-License: lsof
+# Sendmail .. lib/snpf.c
-URL: https://github.com/lsof-org/lsof
+# LGPLv2+  .. lib/regex.c, regex.h
+License: zlib and Sendmail and LGPLv2+
+URL: http://people.freebsd.org/~abe/
 
 # lsof contains licensed code that we cannot ship.  Therefore we use
 # upstream2downstream.sh script to remove the code before shipping it.
@@ -11,41 +13,37 @@ URL: https://github.com/lsof-org/lsof
 # 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
+%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
+# BZ#1574669 - glibc deprecated Sun RPC, use TIRPC instead
+Patch1: lsof-tirpc.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.
 
 %prep
-%autosetup -n %{lsofrh} -S git
+%setup -q -n %{lsofrh}
+%patch0 -p1 -b .man-page-section
+%patch1 -p1 -b .tirpc
 
 %build
-%configure
+./Configure -n linux
 %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}%{_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
+install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 
 %files
 %doc 00README 00CREDITS 00FAQ 00LSOF-L 00QUICKSTART
@@ -53,74 +51,6 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
 %{_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
 

sources

@@ -1 +1 @@
-SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683
+SHA512 (lsof_4.91-rh.tar.xz) = c73037ef2b69ebb49ba4badc19508adafe0eff8216a4d7007aa084d8ba246cba4f5fd1d729a5e53fa2d55cb7f27dbaf340c72575b297e5ac331a1d547e986e70

upstream2downstream.sh

@@ -12,27 +12,27 @@
 #
 
 UPSTREAM="$1"
-NAME=$(basename $UPSTREAM .tar.gz)
+NAME=$(basename $UPSTREAM .tar.bz2)
 MYPWD=$(pwd)
 TMP=$(mktemp -d)
 
 echo
 echo -n "Extracting upstream code..."
-tar -xf $UPSTREAM  -C $TMP
+tar -jxf $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* RELEASE* "$NAME"-rh
 echo " done."
 
 echo -n "Removing non-Linux dialects..."
-rm -rf ./dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
+rm -rf "$NAME"-rh/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."