.gitignore

@@ -1,12 +1 @@
-psmisc-22.10.tar.gz
+SOURCES/psmisc-23.1.tar.xz
-/psmisc-22.13.tar.gz
-/psmisc-22.14.tar.gz
-/psmisc-22.15.tar.gz
-/psmisc-22.16.tar.gz
-/psmisc-22.19.tar.gz
-/psmisc-22.20.tar.gz
-/psmisc-22.21.tar.gz
-/psmisc-23.1.tar.xz
-/psmisc-23.2.tar.xz
-/psmisc-23.3.tar.xz
-/psmisc-23.4.tar.xz

.psmisc.metadata

@@ -0,0 +1 @@
+d19031a5ba18a530aa0bb768cb74593f9af74b08 SOURCES/psmisc-23.1.tar.xz

SOURCES/psmisc-23.1-no-nullptr-sanity-stalls-nfs.patch

@@ -0,0 +1,45 @@
+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;

SOURCES/psmisc-23.1-pstree-consecutive-NULs.patch

@@ -0,0 +1,17 @@
+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))) {

SPECS/psmisc.spec

@@ -1,23 +1,23 @@
 
 Summary: Utilities for managing processes on your system
 Name: psmisc
-Version: 23.4
+Version: 23.1
-Release: 3%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
+Group: Applications/System
 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,7 +30,9 @@ of processes that are using specified files or filesystems. The pslog
 command shows the path of log files owned by a given process.
 
 %prep
-%autosetup -S git
+%setup -q
+%patch2 -p1
+%patch3 -p1
 
 %build
 %configure --prefix=%{_prefix} --enable-selinux
@@ -43,7 +45,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 --all-name --with-man
+%find_lang %name
 
 
 %files -f %{name}.lang
@@ -58,7 +60,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} aarch64 mipsel
+%ifarch %{ix86} x86_64 ppc %{power64} %{arm} mipsel
 %{_bindir}/peekfd
 %{_mandir}/man1/peekfd.1*
 %else
@@ -69,51 +71,13 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 23.4-3
+* Fri Jul 03 2020 Jan Rybar <jrybar@redhat.com> - 23.1-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+- pstree -al incorrectly handles large empty cmdline
-  Related: rhbz#1991688
+- Resolves: rhbz#1715509
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 23.4-2
+* Wed Jun 12 2019 Jan Rybar <jrybar@redhat.com> - 23.1-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+- backport of patch fixing fuser stalling NFS on non-existent file
-
+- Resolves: rhbz#1693785
-* Mon Feb 08 2021 Jan Rybar <jrybar@redhat.com> - 23.4-1
-* Rebase to psmisc-23.4
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 23.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 23.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 23.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Nov 28 2019 Jan Rybar <jrybar@redhat.com> - 23.3-2
-- Rebase build failed due to missing peekfd export on aarch64
-
-* Thu Nov 28 2019 Jan Rybar <jrybar@redhat.com> - 23.3-1
-- Rebase to v23.3
-- Related: bz#1768993
-
-* Thu Nov 07 2019 Jan Rybar <jrybar@redhat.com> - 23.2-1
-- Rebase to v23.2
-- Related: bz#1768993
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Feb 18 2019 Jan Rybar <jrybar@redhat.com> - 23.1-6
-- Added nullptr sanity to scan fns to avoid useless work stalling NFS
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Feb 27 2018 Jan Rybar <jrybar@redhat.com> - 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 <releng@fedoraproject.org> - 23.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

gating.yaml

@@ -1,6 +0,0 @@
---- !Policy
-product_versions:
-  - rhel-9
-decision_context: osci_compose_gate
-rules:
-  - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}

psmisc-22.13-fuser-silent.patch

@@ -1,19 +0,0 @@
-diff --git a/src/fuser.c b/src/fuser.c
-index 4688dfe..d19075a 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1112,7 +1112,13 @@ print_matches(struct names *names_head, const opt_type opts,
- 
- 	for (nptr = names_head; nptr != NULL; nptr = nptr->next) {
- 		if (opts & OPT_SILENT) {
--			have_match = nptr->matched_procs ? 1 : have_match;
-+			for (pptr = nptr->matched_procs; pptr != NULL;
-+			     pptr = pptr->next) {
-+				if(pptr->proc_type != PTYPE_NORMAL)
-+					continue;
-+
-+				have_match = 1;
-+			}
- 		} else {	/* We're not silent */
- 			if ((opts & OPT_ALLFILES) == 0) {
- 				name_has_procs = 0;

sources

@@ -1 +0,0 @@
-SHA512 (psmisc-23.4.tar.xz) = b05781fdb283a6f132bd385d64437f8080e6bc0e11cd2e3e02227678682bb67b3c89edec34a6d067d77312811d072dc60b47ebb32b168c4c69bbc36df643a471