diff options
| -rw-r--r-- | sysutils/psmisc/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/psmisc/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/psmisc/files/patch-src-killall.c | 6 | ||||
| -rw-r--r-- | sysutils/psmisc/files/patch-src-pstree.c | 18 |
4 files changed, 18 insertions, 14 deletions
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile index d654bb4e1b73..0e7aa64a2e47 100644 --- a/sysutils/psmisc/Makefile +++ b/sysutils/psmisc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= psmisc -PORTVERSION= 21.8 +PORTVERSION= 21.9 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= psmisc diff --git a/sysutils/psmisc/distinfo b/sysutils/psmisc/distinfo index d429de3aa141..64fcd98741f0 100644 --- a/sysutils/psmisc/distinfo +++ b/sysutils/psmisc/distinfo @@ -1,3 +1,3 @@ -MD5 (psmisc-21.8.tar.gz) = d6276e071c10ddf4b0d98856e5573e1a -SHA256 (psmisc-21.8.tar.gz) = 495463860415171d9019798ed4fdf5848ffe93f8a380662a39dd2690a04717ed -SIZE (psmisc-21.8.tar.gz) = 227997 +MD5 (psmisc-21.9.tar.gz) = 7b21b6bb1e35e7e68b952e86f85c0a1c +SHA256 (psmisc-21.9.tar.gz) = 90fd6844a4a527021d2ef3efada0fc5384d0778a09dce91ab11effed4ce34a44 +SIZE (psmisc-21.9.tar.gz) = 232172 diff --git a/sysutils/psmisc/files/patch-src-killall.c b/sysutils/psmisc/files/patch-src-killall.c index 1ea03692c3c7..d46b89de24dd 100644 --- a/sysutils/psmisc/files/patch-src-killall.c +++ b/sysutils/psmisc/files/patch-src-killall.c @@ -1,5 +1,5 @@ ---- src/killall.c.orig Tue Sep 20 05:31:38 2005 -+++ src/killall.c Wed Nov 16 17:40:13 2005 +--- src/killall.c.orig Thu Dec 1 22:32:19 2005 ++++ src/killall.c Thu Jan 5 23:32:33 2006 @@ -59,35 +59,31 @@ quiet = 0, wait_until_dead = 0, process_group = 0, ignore_case = 0, pidof; @@ -70,7 +70,7 @@ continue; } free (path); -- okay = fscanf (file, "%*d (%[^)]", comm) == 1; +- okay = fscanf (file, "%*d (%15[^)]", comm) == 1; + okay = fscanf (file, "%s", comm) == 1; (void) fclose (file); if (!okay) diff --git a/sysutils/psmisc/files/patch-src-pstree.c b/sysutils/psmisc/files/patch-src-pstree.c index c53d04bff1c2..491e921c5aa2 100644 --- a/sysutils/psmisc/files/patch-src-pstree.c +++ b/sysutils/psmisc/files/patch-src-pstree.c @@ -1,5 +1,5 @@ ---- src/pstree.c.orig Tue Oct 11 05:18:48 2005 -+++ src/pstree.c Wed Nov 16 17:31:59 2005 +--- src/pstree.c.orig Fri Nov 25 23:14:48 2005 ++++ src/pstree.c Thu Jan 5 23:34:36 2006 @@ -590,7 +590,7 @@ { if (!(path = malloc (strlen (PROC_BASE) + strlen (de->d_name) + 10))) @@ -9,7 +9,7 @@ if ((file = fopen (path, "r")) != NULL) { empty = 0; -@@ -608,90 +608,10 @@ +@@ -608,95 +608,8 @@ perror (path); exit (1); } @@ -53,9 +53,15 @@ - if ((thread=atoi(dt->d_name)) !=0) { - if (thread != pid) { -#ifdef WITH_SELINUX -- add_proc(threadname, thread, pid, st.st_uid, NULL, 0, scontext); +- if (print_args) +- add_proc(threadname, thread, pid, st.st_uid, threadname, strlen(threadname)+1, scontext); +- else +- add_proc(threadname, thread, pid, st.st_uid, NULL, 0, scontext); -#else /*WITH_SELINUX*/ -- add_proc(threadname, thread, pid, st.st_uid, NULL, 0); +- if (print_args) +- add_proc(threadname, thread, pid, st.st_uid, threadname, strlen(threadname)+1); +- else +- add_proc(threadname, thread, pid, st.st_uid, NULL, 0); -#endif /*WITH_SELINUX*/ - } - } @@ -99,7 +105,5 @@ + if (fscanf(file, "%s %*d %d", comm, &ppid) == 2) { + add_proc(comm,pid,ppid,st.st_uid,NULL,0); } -+ (void) fclose (file); } - free (path); |