From bb78fec59c9ffc89f446a8a234c1917cdc21b84f Mon Sep 17 00:00:00 2001
From: Peter Budai <peterbudai@hotmail.com>
Date: Tue, 9 Oct 2018 07:44:25 +0300
Subject: [PATCH] psmisc: Update to 23.2 (#1445)

---
 psmisc/PKGBUILD           | 21 ++++++++++-----------
 psmisc/psmisc-fuser.patch | 11 -----------
 2 files changed, 10 insertions(+), 22 deletions(-)
 delete mode 100644 psmisc/psmisc-fuser.patch

diff --git a/psmisc/PKGBUILD b/psmisc/PKGBUILD
index 127fa7e1..fe602d31 100644
--- a/psmisc/PKGBUILD
+++ b/psmisc/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alexey Pavlov <alexpux@gmail.com>
 
 pkgname=psmisc
-pkgver=22.21
-pkgrel=2
+pkgver=23.2
+pkgrel=1
 pkgdesc="Miscellaneous procfs tools"
 arch=('i686' 'x86_64')
 url="https://psmisc.sourceforge.io/"
@@ -10,28 +10,27 @@ license=('GPL')
 groups=('sys-utils')
 depends=('msys2-runtime' 'gcc-libs' 'ncurses' 'libiconv' 'libintl')
 makedepends=('gcc' 'ncurses-devel' 'libiconv-devel' 'gettext-devel')
-source=(https://downloads.sourceforge.net/psmisc/${pkgname}-${pkgver}.tar.gz
-        'psmisc-fuser.patch')
-sha256sums=('97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a'
-            'dc3966a1fb41863602d687a9e13fdd01708ad4c6fc905711380b7265b571d992')
+source=(${pkgname}-${pkgver}.tar.gz::https://gitlab.com/psmisc/psmisc/-/archive/v${pkgver}/${pkgname}-v${pkgver}.tar.gz)
+sha256sums=('03533fc0c19c16073d2ebbcbb2ad4e1d870467aa1b91663f57c4a1437ff78e9f')
 
 prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ${srcdir}/psmisc-fuser.patch
-  autoreconf -fi
+  cd ${pkgname}-v${pkgver}
+  echo ${pkgver} > .tarball-version
+  ./autogen.sh
 }
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-v${pkgver}
   ./configure \
     --prefix=/usr \
     --without-libiconv-prefix \
     --without-libintl-prefix \
+    --disable-harden-flags \
     CPPFLAGS="${CPPFLAGS} -I/usr/include/ncursesw"
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd ${pkgname}-v${pkgver}
   make DESTDIR=${pkgdir} install
 }
diff --git a/psmisc/psmisc-fuser.patch b/psmisc/psmisc-fuser.patch
deleted file mode 100644
index b7645f20..00000000
--- a/psmisc/psmisc-fuser.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@
- 		usage(_("No process specification given"));
- 
- 	/* Check if -M flag was used and if so check mounts */
--	if (opts * OPT_ISMOUNTPOINT) {
-+	if (opts & OPT_ISMOUNTPOINT) {
- 	    check_mountpoints(&mounts, &names_head, &names_tail);
- 	}
-