From 24c48198b5261b7676d958b7bdd8b8fbd01c3f84 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Thu, 7 Nov 2019 18:45:22 +0100
Subject: [PATCH 1/3] Rebase to v23.2 Related: bz#1768993

---
 .gitignore  |  1 +
 psmisc.spec | 10 ++++++----
 sources     |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5f17ce0..1b9af78 100644
--- a/.gitignore
+++ b/.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
diff --git a/psmisc.spec b/psmisc.spec
index 16525a7..069239b 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -1,8 +1,8 @@
 
 Summary: Utilities for managing processes on your system
 Name: psmisc
-Version: 23.1
-Release: 7%{?dist}
+Version: 23.2
+Release: 1%{?dist}
 License: GPLv2+
 URL: https://gitlab.com/psmisc/psmisc
 
@@ -10,7 +10,6 @@ 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
 
 BuildRequires: libselinux-devel
 BuildRequires: gettext
@@ -30,7 +29,6 @@ command shows the path of log files owned by a given process.
 
 %prep
 %setup -q
-%patch2 -p1
 
 %build
 %configure --prefix=%{_prefix} --enable-selinux
@@ -69,6 +67,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 
 
 %changelog
+* 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
 
diff --git a/sources b/sources
index 5c3967a..f8b8ec1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (psmisc-23.1.tar.xz) = f678869ea555986a2538ada9630b74ce79304f3ee85cc9d69a3912d8d30ad491829eac0dcb69aae7003ee9b5de9645d2135b80a9e0b77824e60c417dc0be5f95
+SHA512 (psmisc-23.2.tar.xz) = a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8

From 3316c5e8a70a64f05907663cb614a9afd957df8f Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Thu, 28 Nov 2019 15:29:43 +0100
Subject: [PATCH 2/3] Rebase to v23.3 Related: bz#1768993

---
 .gitignore  | 1 +
 psmisc.spec | 6 +++++-
 sources     | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b9af78..2b09aa8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ psmisc-22.10.tar.gz
 /psmisc-22.21.tar.gz
 /psmisc-23.1.tar.xz
 /psmisc-23.2.tar.xz
+/psmisc-23.3.tar.xz
diff --git a/psmisc.spec b/psmisc.spec
index 069239b..03aec85 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -1,7 +1,7 @@
 
 Summary: Utilities for managing processes on your system
 Name: psmisc
-Version: 23.2
+Version: 23.3
 Release: 1%{?dist}
 License: GPLv2+
 URL: https://gitlab.com/psmisc/psmisc
@@ -67,6 +67,10 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 
 
 %changelog
+* 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
diff --git a/sources b/sources
index f8b8ec1..1c5d28d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (psmisc-23.2.tar.xz) = a8d4e91443b66de1c4418fd74b5eb6dd42caddc937e75dfb35a4e49b9b35236db779e2a480c1693bcc7feaf0957b1028850134040685e88e6ff7ffcb572e20e8
+SHA512 (psmisc-23.3.tar.xz) = 791ffef78d87b092d653da98710b338017466a9e1e1935968b9f0194ccef8da941317aa0c39d821d46b20d95d6539ccf78e5ebb71ad1032ae62337a397180d58

From c9a94f1e4dc72ae0c23328569d7d0a2b210f5a04 Mon Sep 17 00:00:00 2001
From: Jan Rybar <jrybar@redhat.com>
Date: Thu, 28 Nov 2019 16:53:19 +0100
Subject: [PATCH 3/3] Rebase build failed due to missing peekfd export on
 aarch64

---
 psmisc.spec | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/psmisc.spec b/psmisc.spec
index 03aec85..af9a91f 100644
--- a/psmisc.spec
+++ b/psmisc.spec
@@ -2,7 +2,7 @@
 Summary: Utilities for managing processes on your system
 Name: psmisc
 Version: 23.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: https://gitlab.com/psmisc/psmisc
 
@@ -16,6 +16,7 @@ BuildRequires: gettext
 BuildRequires: ncurses-devel
 BuildRequires: autoconf automake
 BuildRequires: gcc
+BuildRequires: git
 
 
 %description
@@ -28,7 +29,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
 
 %build
 %configure --prefix=%{_prefix} --enable-selinux
@@ -56,7 +57,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
@@ -67,6 +68,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/fuser $RPM_BUILD_ROOT%{_sbindir}
 
 
 %changelog
+* 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