Rebase to 23.2 with autosetup

.gitignore

@@ -7,3 +7,4 @@ psmisc-22.10.tar.gz
 /psmisc-22.20.tar.gz
 /psmisc-22.21.tar.gz
 /psmisc-23.1.tar.xz
+/psmisc-23.2.tar.xz

no-nullptr-sanity-stalls-nfs.patch

@@ -1,7 +1,18 @@
-diff -up ./src/fuser.c.ori ./src/fuser.c
+From 499dfe62817f46e2132dd265dbe3603e5929279e Mon Sep 17 00:00:00 2001
---- ./src/fuser.c.ori	2017-03-25 00:17:53.169339912 +0100
+From: Jan Rybar <jrybar@redhat.com>
-+++ ./src/fuser.c	2019-02-19 16:42:04.781433478 +0100
+Date: Tue, 19 Feb 2019 16:39:17 +0100
-@@ -187,6 +187,9 @@ scan_procs(struct names *names_head, str
+Subject: [PATCH] NULLptr sanity added in scan fns to avoid useless prep work
+ (stalls NFS)
+
+---
+ src/fuser.c | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/src/fuser.c b/src/fuser.c
+index c44cee8..b8662a3 100644
+--- a/src/fuser.c
++++ b/src/fuser.c
+@@ -188,6 +188,9 @@ scan_procs(struct names *names_head, struct inode_list *ino_head,
  	pid_t pid, my_pid;
  	uid_t uid;
  
@@ -11,7 +22,7 @@ diff -up ./src/fuser.c.ori ./src/fuser.c
  	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
+@@ -1873,6 +1876,10 @@ scan_knfsd(struct names *names_head, struct inode_list *ino_head,
  	char *find_space;
  	struct stat st;
  
@@ -22,7 +33,7 @@ diff -up ./src/fuser.c.ori ./src/fuser.c
  	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
+@@ -1919,6 +1926,10 @@ scan_mounts(struct names *names_head, struct inode_list *ino_head,
  	char *find_space;
  	struct stat st;
  
@@ -33,7 +44,7 @@ diff -up ./src/fuser.c.ori ./src/fuser.c
  	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
+@@ -1962,6 +1973,9 @@ scan_swaps(struct names *names_head, struct inode_list *ino_head,
  	char *find_space;
  	struct stat st;
  
@@ -43,3 +54,6 @@ diff -up ./src/fuser.c.ori ./src/fuser.c
  	if ((fp = fopen(PROC_SWAPS, "r")) == NULL) {
  		/*fprintf(stderr, "Cannot open %s\n", PROC_SWAPS); */
  		return;
+-- 
+2.20.1
+

psmisc.spec

@@ -1,8 +1,8 @@
 
 Summary: Utilities for managing processes on your system
 Name: psmisc
-Version: 23.1
+Version: 23.2
-Release: 7%{?dist}
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://gitlab.com/psmisc/psmisc
 
@@ -10,13 +10,14 @@ Source: https://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version
 
 #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
+Patch2: no-nullptr-sanity-stalls-nfs.patch
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
 BuildRequires: ncurses-devel
 BuildRequires: autoconf automake
 BuildRequires: gcc
+BuildRequires: git
 
 
 %description
@@ -29,8 +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
+%autosetup -S git
-%patch2 -p1
 
 %build
 %configure --prefix=%{_prefix} --enable-selinux
@@ -69,6 +69,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 
 
 %changelog
+* Fri Aug 23 2019 Jan Rybar <jrybar@redhat.com> - 23.2-1
+- Rebase to 23.2 with autosetup
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (psmisc-23.1.tar.xz) = f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
+SHA512 (psmisc-23.2.tar.xz) = a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8