Compare commits

..

No commits in common. "rawhide" and "f39" have entirely different histories.

5 changed files with 39 additions and 66 deletions

1
.gitignore vendored
View file

@ -3,4 +3,3 @@
/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

View file

@ -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].

27
lsof-Configure.patch Normal file
View file

@ -0,0 +1,27 @@
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__)

View file

@ -1,8 +1,10 @@
Summary: A utility which lists open files on a Linux/UNIX system
Name: lsof
Version: 4.98.0
Release: 8%{?dist}
License: lsof
Version: 4.96.3
Release: 4%{?dist}
# Sendmail .. lib/snpf.c
# LGPLv2+ .. lib/regex.c, regex.h
License: zlib and Sendmail and LGPLv2+
URL: https://github.com/lsof-org/lsof
# lsof contains licensed code that we cannot ship. Therefore we use
@ -17,26 +19,25 @@ Source1: upstream2downstream.sh
# BZ#1260300 - move lsof man page to section 1
Patch0: lsof-man-page-section.patch
Patch1: f42-ftbfs.patch
Patch1: lsof-Configure.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
%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
@ -53,30 +54,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

View file

@ -1 +1,2 @@
SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683
SHA512 (lsof-4.95.0-rh.tar.xz) = 305adc829f2bc4b2f3fcec7060b0bc457feec970bce663e34a37adce42ace09258e0d4a9ec5c3e064feb7637b0f1a47f1c764bad9d25bc756ae8f823aa6e2a53
SHA512 (lsof-4.96.3-rh.tar.xz) = 6f289662aa8c2d075d04d7a272c20cf6f06ddeb3af5b70650c1ba607e1517d6c19ee320a2207af61aed67cb8f11be994350c656b990ad9db696c41ab5019128c