From 7db1a3bd97bf198ca811688d79766933909a039e Mon Sep 17 00:00:00 2001 From: Fredrik Rinnestam Date: Tue, 13 Jun 2017 00:21:47 +0200 Subject: [PATCH] psmisc: updated to 23.0 --- psmisc/.footprint | 1 + psmisc/.md5sum | 3 +-- psmisc/.signature | 9 ++++----- psmisc/Pkgfile | 10 +++------- psmisc/fuseropts.patch | 12 ------------ 5 files changed, 9 insertions(+), 26 deletions(-) delete mode 100644 psmisc/fuseropts.patch diff --git a/psmisc/.footprint b/psmisc/.footprint index 92b5fcfc..78da5821 100644 --- a/psmisc/.footprint +++ b/psmisc/.footprint @@ -4,6 +4,7 @@ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/killall -rwxr-xr-x root/root usr/bin/peekfd -rwxr-xr-x root/root usr/bin/prtstat +-rwxr-xr-x root/root usr/bin/pslog -rwxr-xr-x root/root usr/bin/pstree drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/man/ diff --git a/psmisc/.md5sum b/psmisc/.md5sum index 581840db..4908f8e4 100644 --- a/psmisc/.md5sum +++ b/psmisc/.md5sum @@ -1,2 +1 @@ -6d0386913eb0a88e43aa9bc868cb0eb5 fuseropts.patch -935c0fd6eb208288262b385fa656f1bf psmisc-22.21.tar.gz +31c616d5508aca2611bba0baf41995cb psmisc-23.0.tar.xz diff --git a/psmisc/.signature b/psmisc/.signature index eda6f12a..15315732 100644 --- a/psmisc/.signature +++ b/psmisc/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqiDUUBURz10ZvJL+2yJ38dGn6f50qX7atN/laLodQa3X0cFWNCiPF0iC1CxuMUP3CAtASPla/889DHDzXRkmkAI= -SHA256 (Pkgfile) = 78d68c3e47c1c9e423f569d991a483119aa936131f9baec8b3b0b172335b0bb1 -SHA256 (.footprint) = 773b36a2c40e760344e5f7d49c0f1bcd79bc743fe034411ebaf9cb5c5a5f83c7 -SHA256 (psmisc-22.21.tar.gz) = 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a -SHA256 (fuseropts.patch) = 368853d8385e9f8d0a071035b24f8f977d6b03dbcaf939ed47000b2889b82e02 +RWRJc1FUaeVeqseENLNVIf590L8+DxyrS9rLNbbWn6m8+AxSqvGSiXTsY8yUPxaBQN2bLFTegC3GQ4I7+kDU9/YGueNEtdSfFAM= +SHA256 (Pkgfile) = 85cf7e74e7d915a8863806edc442705c5b290e73edb2cce3b8054e325fa68a2e +SHA256 (.footprint) = bee44fdf93b81b3082da400ad37d0f8d9942316c7b9f35768c8ebbb9a8f3095e +SHA256 (psmisc-23.0.tar.xz) = 7553318c5ecf021d3b98de0a200761e1a5898397832499201c1aa191a053f04c diff --git a/psmisc/Pkgfile b/psmisc/Pkgfile index f9152618..c195d63b 100644 --- a/psmisc/Pkgfile +++ b/psmisc/Pkgfile @@ -4,17 +4,13 @@ # Depends on: ncurses name=psmisc -version=22.21 -release=3 -source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz \ - fuseropts.patch) +version=23.0 +release=1 +source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.xz) build() { cd $name-$version - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=740275 - patch -p1 -i $SRC/fuseropts.patch - ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install diff --git a/psmisc/fuseropts.patch b/psmisc/fuseropts.patch deleted file mode 100644 index 3bac333b..00000000 --- a/psmisc/fuseropts.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur a/src/fuser.c b/src/fuser.c ---- a/src/fuser.c 2014-01-31 08:07:32.000000000 -0500 -+++ b/src/fuser.c 2014-02-27 12:34:44.352910007 -0500 -@@ -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); - } -