From 41b506db6634f9055835d483c77871695074789a Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Sun, 8 Oct 2023 08:50:30 +0200 Subject: [PATCH] fix(main/proc): Revert -f/--full default for pgrep&pkill This causes compatibility problems: https://github.com/termux/termux-packages/issues/18180 A better solution (will be a separate future PR) will be to just replace the executable name with argv0 - we shouldn't match on all command-line arguments by default). --- packages/procps/build.sh | 2 +- packages/procps/pgrep.c.patch | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 packages/procps/pgrep.c.patch diff --git a/packages/procps/build.sh b/packages/procps/build.sh index 880dc6cc4781ce..220eadfa919b21 100644 --- a/packages/procps/build.sh +++ b/packages/procps/build.sh @@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="Utilities that give information about processes using th TERMUX_PKG_LICENSE="LGPL-2.0" TERMUX_PKG_MAINTAINER="@termux" TERMUX_PKG_VERSION=3.3.17 -TERMUX_PKG_REVISION=3 +TERMUX_PKG_REVISION=4 TERMUX_PKG_SRCURL=https://sourceforge.net/projects/procps-ng/files/Production/procps-ng-$TERMUX_PKG_VERSION.tar.xz TERMUX_PKG_SHA256=4518b3e7aafd34ec07d0063d250fd474999b20b200218c3ae56f5d2113f141b4 TERMUX_PKG_DEPENDS="ncurses" diff --git a/packages/procps/pgrep.c.patch b/packages/procps/pgrep.c.patch deleted file mode 100644 index 0f917b55c0b208..00000000000000 --- a/packages/procps/pgrep.c.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -u -r ../src-orig/pgrep.c ./pgrep.c ---- ../src-orig/pgrep.c 2023-10-02 11:04:29.715645019 +0000 -+++ ./pgrep.c 2023-10-02 11:17:10.632452771 +0000 -@@ -80,7 +80,7 @@ - - /* User supplied arguments */ - --static int opt_full = 0; -+static int opt_full = 1; - static int opt_long = 0; - static int opt_longlong = 0; - static int opt_oldest = 0;