Compare commits

..

31 commits

Author SHA1 Message Date
Fedora Release Engineering
c1db20ed4a Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-24 20:54:35 +00:00
Jan Rybar
8a517987f7 FTBFS: stricter check, incompatible types 2025-01-27 11:31:20 +01:00
Fedora Release Engineering
c6355d7f40 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-17 16:05:57 +00:00
Fedora Release Engineering
6ec9f9e2fe Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-18 16:04:36 +00:00
Fedora Release Engineering
76099262dc Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-25 04:52:58 +00:00
Fedora Release Engineering
3040efd024 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-21 06:17:24 +00:00
Jan Rybar
f469b0d7c7 version bump due to licence fix 2023-10-23 12:42:13 +02:00
Jan Rybar
8da3b153d4 Rebase to lsof-4.98.0 2023-10-20 20:03:40 +02:00
Miroslav Suchý
787bec859b Migrate to SPDX license
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
2023-09-29 14:11:57 +00:00
Fedora Release Engineering
d0c998b5d6 Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-20 13:07:47 +00:00
Fedora Release Engineering
f4bfc83824 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 18:21:59 +00:00
Florian Weimer
9b1730c7b0 Fix C89isms in Configure
Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>
2022-11-21 11:02:08 +01:00
Jan Rybar
f130d9e01c Rebase to 4.96.3 2022-09-20 21:55:50 +02:00
Jan Rybar
c2295475c1 rebase to 4.95.0
Resolves: bz#1896532
2022-09-03 16:16:22 +02:00
Fedora Release Engineering
5152bc91ae Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-21 19:57:11 +00:00
Fedora Release Engineering
3ac7af198d - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 18:09:26 +00:00
Fedora Release Engineering
43b439851f - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 13:13:41 +00:00
Jan Rybar
013af6d92d Rebase to 4.94.0 2021-01-28 17:53:58 +01:00
Fedora Release Engineering
9604b26dc2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 18:45:37 +00:00
Tom Stellard
102cdfba93 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-05 03:28:19 +00:00
Fedora Release Engineering
dbb35c4370 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 06:21:34 +00:00
Fedora Release Engineering
e929047ed2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 11:21:50 +00:00
Fedora Release Engineering
007cdc1204 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-25 15:16:10 +00:00
Jan Rybar
3b359ddacc Rebase to lsof-4.93.2
Upstream moved to GitHub and tarball structure changed
Manpage patch needed to reflect the tarball changes
2019-06-12 14:37:24 +02:00
Fedora Release Engineering
5c32991297 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 09:05:07 +00:00
Igor Gnatenko
870a16364d Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:14 +01:00
Fedora Release Engineering
bd1c16e28d - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 09:24:29 +00:00
Peter Schiffer
f1c2bfc28c Update to 4.91, use tirpc for rpc
- resolves: #1560993 #1574669
2018-05-22 16:35:48 +02:00
Rafael dos Santos
4c02d877e4 Use standard Fedora build flags
- Resolves #1548552

Signed-off-by: Rafael dos Santos <rdossant@redhat.com>
2018-04-13 22:01:39 +02:00
Peter Schiffer
f0789f5c04 Updated to 4.90
- resolves: #1545963
2018-02-21 16:35:19 +01:00
Fedora Release Engineering
0415bb7b4b - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 00:16:10 +00:00
7 changed files with 173 additions and 30 deletions

7
.gitignore vendored
View file

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

31
f42-ftbfs.patch Normal file
View file

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

View file

@ -1,10 +1,10 @@
diff -upr lsof_4.89-rh.orig/lsof.8 lsof_4.89-rh/lsof.8
--- lsof_4.89-rh.orig/lsof.8 2015-11-30 13:09:37.785075681 +0100
+++ lsof_4.89-rh/lsof.8 2015-11-30 13:10:11.663029129 +0100
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 @@
.ds VN 4.89
.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 \{\

11
lsof-tirpc.patch Normal file
View file

@ -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 # }

122
lsof.spec
View file

@ -1,12 +1,9 @@
Summary: A utility which lists open files on a Linux/UNIX system
Name: lsof
Version: 4.89
Release: 7%{?dist}
# Sendmail .. lib/snpf.c
# LGPLv2+ .. lib/regex.c, regex.h
License: zlib and Sendmail and LGPLv2+
Group: Development/Debuggers
URL: http://people.freebsd.org/~abe/
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.
@ -14,32 +11,41 @@ URL: http://people.freebsd.org/~abe/
# 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
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
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}%{_bindir}
install -p -m 0755 lsof ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
install -p -m 0644 lsof.8 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1
%files
%doc 00README 00CREDITS 00FAQ 00LSOF-L 00QUICKSTART
@ -47,6 +53,96 @@ install -p -m 0644 lsof.8 ${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
* 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

View file

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

View file

@ -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* RELEASE* "$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."