From ead0c6e48d995e6b4b7dddc7ab2dc917a713e52d Mon Sep 17 00:00:00 2001 From: sthen Date: Mon, 14 Nov 2022 18:47:53 +0000 Subject: [PATCH] update to pstree-2.40 --- sysutils/pstree/Makefile | 14 ++++++-------- sysutils/pstree/distinfo | 4 ++-- sysutils/pstree/patches/patch-pstree_c | 19 +++++++++---------- 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile index 1f666f981dd..924b7ab3a8b 100644 --- a/sysutils/pstree/Makefile +++ b/sysutils/pstree/Makefile @@ -1,21 +1,19 @@ COMMENT = list processes as a tree -DISTNAME = pstree-2.39 + +GH_ACCOUNT = FredHucht +GH_PROJECT = pstree +GH_TAGNAME = v2.40 + CATEGORIES = sysutils -HOMEPAGE = http://www.thp.uni-duisburg.de/pstree/ -REVISION = 0 # GPL PERMIT_PACKAGE = Yes # uses pledge() -WANTLIB = c - -MASTER_SITES = ftp://ftp.thp.uni-duisburg.de/pub/source/ +WANTLIB = c NO_TEST = Yes -WRKDIST = ${WRKDIR} - do-build: cd ${WRKBUILD} && ${CC} ${CFLAGS} -o pstree pstree.c diff --git a/sysutils/pstree/distinfo b/sysutils/pstree/distinfo index 9ceea2d03ba..7496d151a76 100644 --- a/sysutils/pstree/distinfo +++ b/sysutils/pstree/distinfo @@ -1,2 +1,2 @@ -SHA256 (pstree-2.39.tar.gz) = fJvDtD7m+TqbwFTu/x550woBysE9+BDilT4/wkrYR58= -SIZE (pstree-2.39.tar.gz) = 12929 +SHA256 (pstree-2.40.tar.gz) = ZNYT2PZmhbKfE6gOCM3cCGFs8+MVoGksu/neDYqjdrM= +SIZE (pstree-2.40.tar.gz) = 25698 diff --git a/sysutils/pstree/patches/patch-pstree_c b/sysutils/pstree/patches/patch-pstree_c index dadf4bac637..963451bb4d3 100644 --- a/sysutils/pstree/patches/patch-pstree_c +++ b/sysutils/pstree/patches/patch-pstree_c @@ -1,7 +1,8 @@ ---- pstree.c.orig Wed May 13 14:24:47 2015 -+++ pstree.c Thu Apr 21 08:23:00 2016 -@@ -77,7 +77,7 @@ extern getargs(struct ProcInfo *, int, char *, int); - * (Net|Open|Free)BSD & Darwin merged by Ralf Meyer +Index: pstree.c +--- pstree.c.orig ++++ pstree.c +@@ -75,7 +75,7 @@ extern getargs(struct ProcInfo *, int, char *, int); + * DragonFlyBSD contributed by Krzysztof Piecuch */ # define HAS_PGID -# define PSCMD "ps -axwwo user,pid,ppid,pgid,command" @@ -9,12 +10,10 @@ # define PSFORMAT "%s %ld %ld %ld %[^\n]" # define PSVARS P[i].name, &P[i].pid, &P[i].ppid, &P[i].pgid, P[i].cmd # define PSVARSN 5 -@@ -872,7 +872,12 @@ int main(int argc, char **argv) { - #ifdef ZOMBIES_HAVE_PID_0 - FixZombies(); - #endif -- -+ +@@ -899,6 +899,11 @@ int main(int argc, char **argv) { + FixParentCycle(); + #endif + + if (pledge("stdio getpw proc tty", NULL) == -1) { + fprintf(stderr, "%s: pledge\n", Progname); + exit(1);