From b7f6aea9f08f4d27b3ae9cb04ea9cfdd34e92a92 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:13:31 +0000 Subject: [PATCH] import UBI lsof-4.98.0-7.el10 --- .gitignore | 2 +- .lsof.metadata | 1 - SOURCES/lsof-man-page-section.patch | 10 -- lsof-man-page-section.patch | 10 ++ SPECS/lsof.spec => lsof.spec | 93 ++++++++++++++++--- osh-findigs.patch | 13 +++ sources | 1 + ...am2downstream.sh => upstream2downstream.sh | 0 8 files changed, 106 insertions(+), 24 deletions(-) delete mode 100644 .lsof.metadata delete mode 100644 SOURCES/lsof-man-page-section.patch create mode 100644 lsof-man-page-section.patch rename SPECS/lsof.spec => lsof.spec (74%) create mode 100644 osh-findigs.patch create mode 100644 sources rename SOURCES/upstream2downstream.sh => upstream2downstream.sh (100%) diff --git a/.gitignore b/.gitignore index 7a234a4..ec9c4df 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/lsof-4.93.2-rh.tar.xz +lsof-4.98.0-rh.tar.xz diff --git a/.lsof.metadata b/.lsof.metadata deleted file mode 100644 index 3110b0d..0000000 --- a/.lsof.metadata +++ /dev/null @@ -1 +0,0 @@ -fc65518ea135309e4426ab1f44eb97eefd95bc96 SOURCES/lsof-4.93.2-rh.tar.xz diff --git a/SOURCES/lsof-man-page-section.patch b/SOURCES/lsof-man-page-section.patch deleted file mode 100644 index 861baec..0000000 --- a/SOURCES/lsof-man-page-section.patch +++ /dev/null @@ -1,10 +0,0 @@ -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 -@@ -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 \{\ diff --git a/lsof-man-page-section.patch b/lsof-man-page-section.patch new file mode 100644 index 0000000..47da375 --- /dev/null +++ b/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 \{\ diff --git a/SPECS/lsof.spec b/lsof.spec similarity index 74% rename from SPECS/lsof.spec rename to lsof.spec index edc47ac..f8af6cc 100644 --- a/SPECS/lsof.spec +++ b/lsof.spec @@ -1,11 +1,8 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof -Version: 4.93.2 -Release: 1%{?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: 7%{?dist} +License: lsof URL: https://github.com/lsof-org/lsof # lsof contains licensed code that we cannot ship. Therefore we use @@ -20,22 +17,26 @@ Source1: upstream2downstream.sh # BZ#1260300 - move lsof man page to section 1 Patch0: lsof-man-page-section.patch +Patch1: osh-findigs.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,11 +53,79 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog -* Fri Apr 17 2020 Jan Rybar - 4.93.2-1 +* Tue Jan 28 2025 Jan Rybar - 4.98.0-7 +- forgot to bump release number +- Resolves: RHEL-43531 + +* Mon Jan 27 2025 Jan Rybar - 4.98.0-7 +- fix OSH findings +- Resolves: RHEL-43531 + +* Tue Oct 29 2024 Troy Dawson - 4.98.0-6 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 4.98.0-5 +- Bump release for June 2024 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 + +* Thu Jan 20 2022 Fedora Release Engineering - 4.94.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 4.94.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jan 28 2021 Jan Rybar - 4.94.0-1 +- Rebase to 4.94.0 + +* Tue Jan 26 2021 Fedora Release Engineering - 4.93.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 4.93.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 4.93.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 4.93.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue May 28 2019 Jan Rybar - 4.93.2-1 - Rebase to lsof-4.93.2 -- Upstream moved to GitHub (original unreachable) and tarball structure changed +- Upstream moved to GitHub and tarball structure changed - Manpage patch needed to reflect the tarball changes -- Resolves: rhbz#1778228 + +* Fri Feb 01 2019 Fedora Release Engineering - 4.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Fri Jul 13 2018 Fedora Release Engineering - 4.91-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/osh-findigs.patch b/osh-findigs.patch new file mode 100644 index 0000000..e3fd208 --- /dev/null +++ b/osh-findigs.patch @@ -0,0 +1,13 @@ +diff --git a/arg.c b/arg.c +index cd3d5b1..6551e65 100644 +--- a/arg.c ++++ b/arg.c +@@ -1830,6 +1830,8 @@ enter_network_address(na) + } + if (sn) + (void) free((FREE_P *)sn); ++ if (hn) ++ free (hn); + return(0); + } + diff --git a/sources b/sources new file mode 100644 index 0000000..339a190 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683 diff --git a/SOURCES/upstream2downstream.sh b/upstream2downstream.sh similarity index 100% rename from SOURCES/upstream2downstream.sh rename to upstream2downstream.sh