From 4bf76c8bd4d349970c21ef20b5f16cddae93762f Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 14 May 2025 19:19:06 +0000 Subject: [PATCH] import UBI psmisc-23.6-8.el10 --- .gitignore | 2 +- .psmisc.metadata | 1 - ...sc-23.1-no-nullptr-sanity-stalls-nfs.patch | 45 --------- .../psmisc-23.1-pstree-consecutive-NULs.patch | 17 ---- SPECS/psmisc.spec => psmisc.spec | 96 +++++++++++++++---- sources | 1 + 6 files changed, 81 insertions(+), 81 deletions(-) delete mode 100644 .psmisc.metadata delete mode 100644 SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch delete mode 100644 SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch rename SPECS/psmisc.spec => psmisc.spec (81%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 535aeba..da44f43 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/psmisc-23.1.tar.xz +psmisc-23.6.tar.xz diff --git a/.psmisc.metadata b/.psmisc.metadata deleted file mode 100644 index 975c9d5..0000000 --- a/.psmisc.metadata +++ /dev/null @@ -1 +0,0 @@ -d19031a5ba18a530aa0bb768cb74593f9af74b08 SOURCES/psmisc-23.1.tar.xz diff --git a/SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch b/SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch deleted file mode 100644 index 947c611..0000000 --- a/SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up ./src/fuser.c.ori ./src/fuser.c ---- ./src/fuser.c.ori 2017-03-25 00:17:53.169339912 +0100 -+++ ./src/fuser.c 2019-08-23 11:58:55.268835489 +0200 -@@ -187,6 +187,9 @@ scan_procs(struct names *names_head, str - pid_t pid, my_pid; - uid_t uid; - -+ if ( (ino_head == NULL) && (dev_head == NULL) ) -+ return; -+ - if ((topproc_dir = opendir("/proc")) == NULL) { - fprintf(stderr, _("Cannot open /proc directory: %s\n"), - strerror(errno)); -@@ -1860,6 +1863,10 @@ scan_knfsd(struct names *names_head, str - char *find_space; - struct stat st; - -+ if ( (ino_head == NULL) && (dev_head == NULL) ) -+ return; -+ -+ - if ((fp = fopen(KNFSD_EXPORTS, "r")) == NULL) { - #ifdef DEBUG - printf("Cannot open %s\n", KNFSD_EXPORTS); -@@ -1906,6 +1913,10 @@ scan_mounts(struct names *names_head, st - char *find_space; - struct stat st; - -+ if ( (ino_head == NULL) && (dev_head == NULL) ) -+ return; -+ -+ - if ((fp = fopen(PROC_MOUNTS, "r")) == NULL) { - fprintf(stderr, "Cannot open %s\n", PROC_MOUNTS); - return; -@@ -1949,6 +1960,9 @@ scan_swaps(struct names *names_head, str - char *find_space; - struct stat st; - -+ if ( (ino_head == NULL) && (dev_head == NULL) ) -+ return; -+ - if ((fp = fopen(PROC_SWAPS, "r")) == NULL) { - /*fprintf(stderr, "Cannot open %s\n", PROC_SWAPS); */ - return; diff --git a/SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch b/SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch deleted file mode 100644 index 976d4c7..0000000 --- a/SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up ./src/pstree.c.ori ./src/pstree.c ---- ./src/pstree.c.ori 2017-06-12 02:24:29.089210495 +0200 -+++ ./src/pstree.c 2020-07-03 21:24:47.257760342 +0200 -@@ -530,8 +530,12 @@ static void set_args(PROC * this, const - } - this->argc = 0; - for (i = 0; i < size - 1; i++) -- if (!args[i]) -+ if (!args[i]) { - this->argc++; -+ /* now skip consecutive NUL */ -+ while(!args[i] && (i < size -1 )) -+ i++; -+ } - if (!this->argc) - return; - if (!(this->argv = malloc(sizeof(char *) * this->argc))) { diff --git a/SPECS/psmisc.spec b/psmisc.spec similarity index 81% rename from SPECS/psmisc.spec rename to psmisc.spec index f6c0b90..35a2e9d 100644 --- a/SPECS/psmisc.spec +++ b/psmisc.spec @@ -1,23 +1,23 @@ Summary: Utilities for managing processes on your system Name: psmisc -Version: 23.1 -Release: 5%{?dist} -License: GPLv2+ -Group: Applications/System +Version: 23.6 +Release: 8%{?dist} +License: GPL-2.0-or-later URL: https://gitlab.com/psmisc/psmisc Source: https://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}.tar.xz #The following has been reworked by upstream in a different way ... we'll see #Patch1: psmisc-22.13-fuser-silent.patch -Patch2: psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch -Patch3: psmisc-23.1-pstree-consecutive-NULs.patch +BuildRequires: make BuildRequires: libselinux-devel BuildRequires: gettext BuildRequires: ncurses-devel BuildRequires: autoconf automake +BuildRequires: gcc +BuildRequires: git %description @@ -30,9 +30,7 @@ of processes that are using specified files or filesystems. The pslog command shows the path of log files owned by a given process. %prep -%setup -q -%patch2 -p1 -%patch3 -p1 +%autosetup -S git %build %configure --prefix=%{_prefix} --enable-selinux @@ -45,7 +43,7 @@ make install DESTDIR="$RPM_BUILD_ROOT" mkdir -p $RPM_BUILD_ROOT%{_sbindir} mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir} -%find_lang %name +%find_lang %name --all-name --with-man %files -f %{name}.lang @@ -60,7 +58,7 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir} %{_mandir}/man1/pstree.1* %{_mandir}/man1/prtstat.1* %{_mandir}/man1/pslog.1* -%ifarch %{ix86} x86_64 ppc %{power64} %{arm} mipsel +%ifarch %{ix86} x86_64 ppc %{power64} %{arm} aarch64 mipsel %{_bindir}/peekfd %{_mandir}/man1/peekfd.1* %else @@ -71,13 +69,77 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir} %changelog -* Fri Jul 03 2020 Jan Rybar - 23.1-5 -- pstree -al incorrectly handles large empty cmdline -- Resolves: rhbz#1715509 +* Tue Oct 29 2024 Troy Dawson - 23.6-8 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Wed Jun 12 2019 Jan Rybar - 23.1-4 -- backport of patch fixing fuser stalling NFS on non-existent file -- Resolves: rhbz#1693785 +* Mon Jun 24 2024 Troy Dawson - 23.6-7 +- Bump release for June 2024 mass rebuild + +* Fri Jan 26 2024 Fedora Release Engineering - 23.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 23.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jul 21 2023 Fedora Release Engineering - 23.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Mon Apr 24 2023 Lukáš Zaoral - 23.6-3 +- migrate to SPDX license format + +* Fri Jan 20 2023 Fedora Release Engineering - 23.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Dec 20 2022 Jan Rybar - 23.6-1 +- Rebase to psmisc-23.6 +* Fri Jul 22 2022 Fedora Release Engineering - 23.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 21 2022 Fedora Release Engineering - 23.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 23.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon Feb 08 2021 Jan Rybar - 23.4-1 +* Rebase to psmisc-23.4 + +* Wed Jan 27 2021 Fedora Release Engineering - 23.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 23.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Jan 30 2020 Fedora Release Engineering - 23.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Nov 28 2019 Jan Rybar - 23.3-2 +- Rebase build failed due to missing peekfd export on aarch64 + +* Thu Nov 28 2019 Jan Rybar - 23.3-1 +- Rebase to v23.3 +- Related: bz#1768993 + +* Thu Nov 07 2019 Jan Rybar - 23.2-1 +- Rebase to v23.2 +- Related: bz#1768993 + +* Fri Jul 26 2019 Fedora Release Engineering - 23.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Mon Feb 18 2019 Jan Rybar - 23.1-6 +- Added nullptr sanity to scan fns to avoid useless work stalling NFS + +* Sat Feb 02 2019 Fedora Release Engineering - 23.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 23.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Feb 27 2018 Jan Rybar - 23.1-3 +- Added gcc to BuildRequires as per "Packaging:C and C++" Wiki guidelines +- Bump considered unnecessary * Fri Feb 09 2018 Fedora Release Engineering - 23.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..4844dbc --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (psmisc-23.6.tar.xz) = 4daffbd1726e50d9344f8578dd4c10f0b8f7971929ec667490de31122e5f3828747e1bafb3ed3c37ed7e1758ab9ec43b8f4556b676a416a8efbc7c6c88b6985d