summaryrefslogtreecommitdiffstats
path: root/source/a/procps-ng
diff options
context:
space:
mode:
Diffstat (limited to 'source/a/procps-ng')
-rwxr-xr-xsource/a/procps-ng/procps-ng.SlackBuild7
-rw-r--r--source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff25
2 files changed, 2 insertions, 30 deletions
diff --git a/source/a/procps-ng/procps-ng.SlackBuild b/source/a/procps-ng/procps-ng.SlackBuild
index c3ebf38f6..456d38e35 100755
--- a/source/a/procps-ng/procps-ng.SlackBuild
+++ b/source/a/procps-ng/procps-ng.SlackBuild
@@ -24,10 +24,10 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=procps-ng
VERSION=${VERSION:-3.3.15}
-PSMISCVER=${PSMISCVER:-22.21}
+PSMISCVER=${PSMISCVER:-23.1}
PROCINFONGVER=${PROCINFONGVER:-2.0.304}
PROCINFOVER=${PROCINFOVER:-18}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -156,9 +156,6 @@ mkdir -p $PKG/etc/sysctl.d
cd psmisc-$PSMISCVER || exit 1
-# Fix fuser -s:
-zcat $CWD/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff.gz | patch -p1 --verbose || exit 1
-
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff b/source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff
deleted file mode 100644
index d930f6f23..000000000
--- a/source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-index fd1cccf..e5f784c 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,7 @@
-+Changes in 22.22
-+================
-+ * Fixed typo in fuser which has -M on Debian #740275
-+
- Changes in 22.21
- ================
- * Missing comma in fuser(1) added Debian #702391
-diff --git a/src/fuser.c b/src/fuser.c
-index b485f65..389b302 100644
---- a/src/fuser.c
-+++ b/src/fuser.c
-@@ -1174,7 +1174,7 @@ int main(int argc, char *argv[])
- 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);
- }
-