From 787bec859b08509592a79729d8e3c5147d2e7f28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 29 Sep 2023 14:11:57 +0000 Subject: [PATCH 1/9] 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 --- lsof.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lsof.spec b/lsof.spec index 83f8437..7809a93 100644 --- a/lsof.spec +++ b/lsof.spec @@ -3,8 +3,7 @@ Name: lsof Version: 4.96.3 Release: 4%{?dist} # Sendmail .. lib/snpf.c -# LGPLv2+ .. lib/regex.c, regex.h -License: zlib and Sendmail and LGPLv2+ +License: lsof AND Sendmail URL: https://github.com/lsof-org/lsof # lsof contains licensed code that we cannot ship. Therefore we use From 8da3b153d4a151b4a7a504c9a7779efb04dbf914 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Fri, 20 Oct 2023 20:03:40 +0200 Subject: [PATCH 2/9] Rebase to lsof-4.98.0 --- .gitignore | 1 + lsof-Configure.patch | 27 --------------------------- lsof.spec | 19 +++++++++++-------- sources | 3 +-- 4 files changed, 13 insertions(+), 37 deletions(-) delete mode 100644 lsof-Configure.patch diff --git a/.gitignore b/.gitignore index e0720ce..f785c3b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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/lsof-Configure.patch b/lsof-Configure.patch deleted file mode 100644 index 96b5ceb..0000000 --- a/lsof-Configure.patch +++ /dev/null @@ -1,27 +0,0 @@ -Avoid C89isms during configure checks. - -Submitted upstream: - -diff --git a/Configure b/Configure -index d8adfda3e47f87df..ed1e1d60840b3852 100755 ---- a/Configure -+++ b/Configure -@@ -2189,7 +2189,7 @@ LOCKF_OWNER4 - #include - #include - #include --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 --main() { -+#include -+int main() { - #if defined(__GLIBC__) && defined(__GLIBC_MINOR__) - printf("-DGLIBCV=%d\n",__GLIBC__*100+__GLIBC_MINOR__); - #elif defined(__GLIBC__) diff --git a/lsof.spec b/lsof.spec index 7809a93..67bedb3 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,9 +1,8 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof -Version: 4.96.3 -Release: 4%{?dist} -# Sendmail .. lib/snpf.c -License: lsof AND Sendmail +Version: 4.98.0 +Release: 1%{?dist} +License: lsof AND GPL-3.0-or-later URL: https://github.com/lsof-org/lsof # lsof contains licensed code that we cannot ship. Therefore we use @@ -18,13 +17,14 @@ Source1: upstream2downstream.sh # BZ#1260300 - move lsof man page to section 1 Patch0: lsof-man-page-section.patch -Patch1: lsof-Configure.patch BuildRequires: gcc BuildRequires: libselinux-devel BuildRequires: libtirpc-devel BuildRequires: groff-base BuildRequires: make +BuildRequires: automake +BuildRequires: autoconf %description Lsof stands for LiSt Open Files, and it does just that: it lists information @@ -32,11 +32,11 @@ about files that are open by the processes running on a UNIX system. %prep %setup -q -n %{lsofrh} -%patch0 -p1 -b .man-page-section -%patch1 -p1 +%autopatch -p1 +#%patch1 -p1 %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 @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 diff --git a/sources b/sources index d5264de..339a190 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (lsof-4.95.0-rh.tar.xz) = 305adc829f2bc4b2f3fcec7060b0bc457feec970bce663e34a37adce42ace09258e0d4a9ec5c3e064feb7637b0f1a47f1c764bad9d25bc756ae8f823aa6e2a53 -SHA512 (lsof-4.96.3-rh.tar.xz) = 6f289662aa8c2d075d04d7a272c20cf6f06ddeb3af5b70650c1ba607e1517d6c19ee320a2207af61aed67cb8f11be994350c656b990ad9db696c41ab5019128c +SHA512 (lsof-4.98.0-rh.tar.xz) = a0938c4c431d2aed7ce7e09560b45acefb5c2730c707817b3013f564defa381391ee113e7989fc21eec4703f4ac112104ec0edd9d51a024797116416a4717683 From f469b0d7c718f0fb0766af5e1fc500d92e48d5a9 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Mon, 23 Oct 2023 12:42:13 +0200 Subject: [PATCH 3/9] version bump due to licence fix --- lsof.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lsof.spec b/lsof.spec index 67bedb3..a97b2d5 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,8 +1,8 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 1%{?dist} -License: lsof AND GPL-3.0-or-later +Release: 2%{?dist} +License: lsof URL: https://github.com/lsof-org/lsof # lsof contains licensed code that we cannot ship. Therefore we use @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 From 3040efd024f11becf41f4a1d4b2168e3f09fc055 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:17:24 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lsof.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lsof.spec b/lsof.spec index a97b2d5..ba7920d 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 2%{?dist} +Release: 3%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 From 76099262dcb9388046a26b0ce9dded0253c735e5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 04:52:58 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lsof.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lsof.spec b/lsof.spec index ba7920d..d72b0e6 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 3%{?dist} +Release: 4%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 From 6ec9f9e2fe2f1c163239790f1ffb7ec7557b5354 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:04:36 +0000 Subject: [PATCH 6/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lsof.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lsof.spec b/lsof.spec index d72b0e6..02a8671 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 4%{?dist} +Release: 5%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 From c6355d7f40182913af700550506309bba8e22f3e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:05:57 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lsof.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lsof.spec b/lsof.spec index 02a8671..3824888 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 5%{?dist} +Release: 6%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 From 8a517987f7ee25a76ff89c5bb704deb3807f57c3 Mon Sep 17 00:00:00 2001 From: Jan Rybar Date: Mon, 27 Jan 2025 11:31:20 +0100 Subject: [PATCH 8/9] FTBFS: stricter check, incompatible types --- f42-ftbfs.patch | 31 +++++++++++++++++++++++++++++++ lsof.spec | 11 +++++++---- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 f42-ftbfs.patch 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.spec b/lsof.spec index 3824888..35fa64d 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 6%{?dist} +Release: 7%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -17,6 +17,7 @@ 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 @@ -25,15 +26,14 @@ 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} -%autopatch -p1 -#%patch1 -p1 +%autosetup -n %{lsofrh} -S git %build %configure @@ -53,6 +53,9 @@ install -p -m 0644 lsof.1 ${RPM_BUILD_ROOT}%{_mandir}/man1/lsof.1 %{_mandir}/man*/* %changelog +* 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 From c1db20ed4a411403a470cab8a5dd8697ba10c56b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 20:54:35 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lsof.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lsof.spec b/lsof.spec index 35fa64d..04379d5 100644 --- a/lsof.spec +++ b/lsof.spec @@ -1,7 +1,7 @@ Summary: A utility which lists open files on a Linux/UNIX system Name: lsof Version: 4.98.0 -Release: 7%{?dist} +Release: 8%{?dist} License: lsof URL: https://github.com/lsof-org/lsof @@ -53,6 +53,9 @@ 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