diff --git a/.gitignore b/.gitignore index f25d2cc..f785c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ /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 diff --git a/f42-ftbfs.patch b/f42-ftbfs.patch new file mode 100644 index 0000000..626bfab --- /dev/null +++ b/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]. diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch index 861baec..47da375 100644 --- a/lsof-man-page-section.patch +++ b/lsof-man-page-section.patch @@ -1,10 +1,10 @@ diff -up ./Lsof.8.ori ./Lsof.8 ---- ./Lsof.8.ori 2019-05-28 15:32:49.945667234 +0200 -+++ ./Lsof.8 2019-05-28 15:33:06.182865931 +0200 +--- ./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. + .\" Register )P is used neither by this file nor any groff macro. However, + .\" some versions of nroff require it. .if !\n(.g \{\ diff --git a/lsof.spec b/lsof.spec index a9dd496..04379d5 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,10 +1,8 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof -Version: 4.94.0 -Release: 4%{?dist} -# Sendmail .. lib/snpf.c -# LGPLv2+ .. lib/regex.c, regex.h -License: zlib and Sendmail and LGPLv2+ +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 @@ -19,23 +17,26 @@ 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. %prep -%setup -q -n %{lsofrh} -%patch0 -p1 -b .man-page-section +%autosetup -n %{lsofrh} -S git %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 @@ -52,6 +53,45 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 4.98.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri Jan 24 2025 Jan Rybar - 4.98.0-7 +- FTBFS: stricter check, incompatible types + +* Fri Jan 17 2025 Fedora Release Engineering - 4.98.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 18 2024 Fedora Release Engineering - 4.98.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Jan 25 2024 Fedora Release Engineering - 4.98.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 4.98.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Oct 23 2023 Jan Rybar - 4.98.0-2 +- version bump due to licence fix + +* Fri Oct 20 2023 Jan Rybar - 4.98.0-1 +- rebase to lsof-4.98 + +* Thu Jul 20 2023 Fedora Release Engineering - 4.96.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 4.96.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Nov 21 2022 Florian Weimer - 4.96.3-2 +- Fix C89isms in Configure + +* Tue Sep 20 2022 Jan Rybar - 4.96.3-1 +- rebase to 4.96.3 + +* Fri Sep 02 2022 Jan Rybar - 4.95.0-1 +- rebase to 4.95.0 + * Thu Jul 21 2022 Fedora Release Engineering - 4.94.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index 211fd52..339a190 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lsof-4.94.0-rh.tar.xz) = 61ce5c85ee263b38281fe5e591d2da391e52e061293e884b2afc72b7372a1b412b97ed4246e19a339d012fd7102df997004a01d74e9afa035bd8764be7d0af7e +SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683