From 172ce46b537061c15e7c47eeefea54a59c7d98e2 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 29 Apr 2002 10:43:16 +0000 Subject: Update to 4.1 -- patch-ab has been folded into the distribution. --- sysutils/skill/Makefile | 8 +- sysutils/skill/distinfo | 9 +- sysutils/skill/patches/patch-aa | 32 +++---- sysutils/skill/patches/patch-ab | 207 ---------------------------------------- 4 files changed, 21 insertions(+), 235 deletions(-) delete mode 100644 sysutils/skill/patches/patch-ab (limited to 'sysutils/skill') diff --git a/sysutils/skill/Makefile b/sysutils/skill/Makefile index b0b0c345fc7..291f7884f5c 100644 --- a/sysutils/skill/Makefile +++ b/sysutils/skill/Makefile @@ -1,9 +1,7 @@ -# $NetBSD: Makefile,v 1.12 2001/04/16 18:54:37 zuntum Exp $ +# $NetBSD: Makefile,v 1.13 2002/04/29 10:43:16 wiz Exp $ # -# The version number for skill does not match the @P number. -# This is normal. -DISTNAME= skill-4.0 +DISTNAME= skill-4.1 CATEGORIES= sysutils MASTER_SITES= ftp://fast.cs.utah.edu/pub/skill/ EXTRACT_SUFX= .tgz @@ -14,7 +12,7 @@ COMMENT= Signal processes given user names, ttys, commands, or pids .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "NetBSD" -MAKE_ENV+= OSTYPE=bsd-44 +MAKE_ENV+= OSTYPE=nbsd-44 .elif ${OPSYS} == "SunOS" BINMODE= 02555 MAKE_ENV+= OSTYPE=sys-5r4 BINGRP=sys CPPFLAGS= diff --git a/sysutils/skill/distinfo b/sysutils/skill/distinfo index 671e0e99684..97a92ca9d60 100644 --- a/sysutils/skill/distinfo +++ b/sysutils/skill/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.2 2001/04/19 11:29:08 agc Exp $ +$NetBSD: distinfo,v 1.3 2002/04/29 10:43:16 wiz Exp $ -SHA1 (skill-4.0.tgz) = db66bc8753fe2a15077d152ec20276b3577b396a -Size (skill-4.0.tgz) = 41102 bytes -SHA1 (patch-aa) = 8d8b3847fe7d9e2b6a4146701af058f19ef50d97 -SHA1 (patch-ab) = 63e5e058d4ea1bc0f57a9fce0441372fb4b64816 +SHA1 (skill-4.1.tgz) = d4f548347c34462156276f96185afa9862621338 +Size (skill-4.1.tgz) = 45923 bytes +SHA1 (patch-aa) = fc94b72896cb1d1023bb9a254540eb28bf5479cf diff --git a/sysutils/skill/patches/patch-aa b/sysutils/skill/patches/patch-aa index 40a9c8be6d7..0770a59a31f 100644 --- a/sysutils/skill/patches/patch-aa +++ b/sysutils/skill/patches/patch-aa @@ -1,31 +1,27 @@ -$NetBSD: patch-aa,v 1.9 2001/04/16 18:54:37 zuntum Exp $ +$NetBSD: patch-aa,v 1.10 2002/04/29 10:43:17 wiz Exp $ ---- Makefile.orig Tue May 30 04:03:08 2000 +--- Makefile.orig Sat Apr 6 06:53:39 2002 +++ Makefile -@@ -54,16 +54,16 @@ - SHELL= /bin/sh +@@ -59,15 +59,15 @@ # CONFIGURE: Set location of executable, it's group and mode. --BINDIR= /usr/local/bin --BINGRP= kmem --BINMOD= 2755 -+BINDIR= ${PREFIX}/bin -+#BINGRP= kmem -+#BINMOD= ${BINMODE} + BINDIR= ${PREFIX}/bin +-BINGRP= wheel +-BINMOD= 555 ++#BINGRP= wheel ++#BINMOD= 555 # CONFIGURE: Set location of man directory and man page suffix. --MANDIR= /usr/man/manl --MANSFX= l -+MANDIR= ${PREFIX}/man/man1 -+MANSFX= 1 + MANDIR= ${PREFIX}/man/man1 + MANSFX= 1 # CONFIGURE(Config): Select an OSTYPE for your machine from the list above. --OSTYPE= sys-5r4 -+#OSTYPE= bsd-44 +-OSTYPE= nbsd-44 ++#OSTYPE= nbsd-44 # CONFIGURE(Config): Add any OS-specific options here. COPTS= -@@ -75,7 +75,7 @@ +@@ -79,7 +79,7 @@ OBJS= main.o argparse.o getproc.o HDRS= conf.h @@ -34,7 +30,7 @@ $NetBSD: patch-aa,v 1.9 2001/04/16 18:54:37 zuntum Exp $ all: skill -@@ -90,20 +90,20 @@ +@@ -94,20 +94,20 @@ install: skill #(SysV) filepriv -d ${DESTDIR}/${BINDIR}/skill diff --git a/sysutils/skill/patches/patch-ab b/sysutils/skill/patches/patch-ab deleted file mode 100644 index 51fa977a3ac..00000000000 --- a/sysutils/skill/patches/patch-ab +++ /dev/null @@ -1,207 +0,0 @@ -$NetBSD: patch-ab,v 1.7 2000/09/03 13:31:00 wiz Exp $ ---- machdep/bsd-44.c.orig Sun Feb 20 07:37:39 2000 -+++ machdep/bsd-44.c Tue Jun 27 00:03:39 2000 -@@ -23,11 +23,54 @@ - #endif - #endif - -+#if defined(BSD4_4) && (BSD < 199306) -+#include -+#include -+#define _ALLPROCFLAG KINFO_PROC_ALL -+#else -+#include -+#include -+#define _ALLPROCFLAG KERN_PROC_ALL -+#endif -+ - #include -+#include -+#include - #include --#include -+#include - #include --#include -+#include -+ -+#ifndef P_WEXIT /* backward compatibility */ -+#define P_WEXIT SWEXIT -+#endif -+ -+static char *pidmap[] = { "swapper", "init", "pagedaemon" }; -+static int pidmapsiz = sizeof(pidmap) / sizeof(pidmap[0]); -+ -+#ifdef KERN_PROC2 -+#define CMDLEN KI_MAXCOMLEN -+#define PROCTYPE struct kinfo_proc2 -+#define SYSCTL_TO_USE KERN_PROC2 -+#define SYSCTL_MIBS 6 -+#define PROC_COMM(kprocp) kprocp->p_comm -+#define PROC_FLAG(kprocp) kprocp->p_flag -+#define PROC_PID(kprocp) kprocp->p_pid -+#define PROC_STAT(kprocp) kprocp->p_stat -+#define PROC_TDEV(kprocp) kprocp->p_tdev -+#define PROC_UID(kprocp) kprocp->p_uid -+#else -+#define PROCTYPE struct kinfo_proc -+#define SYSCTL_TO_USE KERN_PROC -+#define SYSCTL_MIBS 4 -+#define PROC_COMM(kprocp) kprocp->kp_proc.p_comm -+#define PROC_FLAG(kprocp) kprocp->kp_proc.p_flag -+#define PROC_PID(kprocp) kprocp->kp_proc.p_pid -+#define PROC_STAT(kprocp) kprocp->kp_proc.p_stat -+#define PROC_TDEV(kprocp) kprocp->kp_eproc.e_tdev -+#define PROC_UID(kprocp) kprocp->kp_eproc.e_ucred.cr_uid -+#endif -+ - - /* - * Define SigNames, NSig, and TtyDevDir here; they are used by other -@@ -132,33 +175,6 @@ - } - - /* -- * Now, set up everything we need to write a GetProc() routine. -- */ -- --#include --#include -- --#if defined(BSD4_4) && (BSD < 199306) --#include --#include --#define _ALLPROCFLAG KINFO_PROC_ALL --#else --#include --#include --#define _ALLPROCFLAG KERN_PROC_ALL --#endif -- --#ifndef P_WEXIT /* backward compatibility */ --#define P_WEXIT SWEXIT --#endif -- --static char *pidmap[] = { "swapper", "init", "pagedaemon" }; --static int pidmapsiz = sizeof(pidmap) / sizeof(pidmap[0]); -- --#define PROC(kprocp) kprocp->kp_proc --#define EPROC(kprocp) kprocp->kp_eproc -- --/* - * GetProc() - * - * Fill in and return a `struct ProcInfo' with information about the -@@ -169,54 +185,54 @@ - { - static struct ProcInfo procinfo; - static int nproc = -1; -- static struct kinfo_proc *aproc; -- static kvm_t *kd = NULL; --#ifdef _POSIX2_LINE_MAX -- char errbuf[_POSIX2_LINE_MAX]; --#else -- char errbuf[2048]; --#endif -+ static PROCTYPE *aproc; -+ int mib[6]; -+ size_t size; - - /* - * If this is our first time here, prepare to read procs from kernel. - */ - if (nproc == -1) { -- kd = kvm_openfiles((char *)NULL, (char *)NULL, (char *)NULL, -- O_RDONLY, errbuf); -- if (kd == NULL) { -- fprintf(stderr, "%s: %s\n", ProgName, errbuf); -- exit(EX_SERR); -- } -+ mib[0] = CTL_KERN; -+ mib[1] = SYSCTL_TO_USE; -+ mib[2] = _ALLPROCFLAG; -+ mib[3] = 0; -+#ifdef KERN_PROC2 -+ mib[4] = sizeof(PROCTYPE); -+ mib[5] = 0; -+#endif -+ if (sysctl(mib, SYSCTL_MIBS, NULL, &size, NULL, 0) < 0) -+ err(1, "sysctl kern.proc2"); -+ aproc = (PROCTYPE *)malloc(size); -+ if (aproc == NULL) -+ errx(1, "out of memory"); - -- if ((aproc=kvm_getprocs(kd, _ALLPROCFLAG, 0, &nproc)) == NULL) { -- fprintf(stderr, "%s: %s\n", ProgName, kvm_geterr(kd)); -- exit(EX_SERR); -- } -+#ifdef KERN_PROC2 -+ mib[5] = size / sizeof(PROCTYPE); -+#endif -+ if (sysctl(mib, SYSCTL_MIBS, aproc, &size, NULL, 0) < 0) -+ err(1, "sysctl kern.proc2"); -+ nproc = size / sizeof(PROCTYPE); - } - -- if (nproc == 0) { -- if (kd != NULL) { -- kvm_close(kd); -- kd = NULL; -- } -- return((struct ProcInfo *)NULL); -- } -+ if (nproc == 0) -+ return(NULL); - - do { -- if (PROC(aproc).p_stat != 0) { -+ if (PROC_STAT(aproc) != 0) { - /* - * Make sure this isn't a "zombie" or "exiting" - * process. If it is, fill in procinfo and return. - */ - procinfo.pi_flags = 0; -- procinfo.pi_pid = (pid_T) PROC(aproc).p_pid; -- procinfo.pi_uid = (uid_T) EPROC(aproc).e_ucred.cr_uid; -+ procinfo.pi_pid = (pid_T) PROC_PID(aproc); -+ procinfo.pi_uid = (uid_T) PROC_UID(aproc); - -- if (PROC(aproc).p_stat == SZOMB) { /* zombie */ -+ if (PROC_STAT(aproc) == SZOMB) { /* zombie */ - static char *zombie = ""; - procinfo.pi_flags |= PI_ZOMBIE; - procinfo.pi_cmd = zombie; -- } else if (PROC(aproc).p_flag & P_WEXIT) { /* exiting */ -+ } else if (PROC_FLAG(aproc) & P_WEXIT) { /* exiting */ - static char *exiting = ""; - procinfo.pi_flags |= PI_SWEXIT; - procinfo.pi_cmd = exiting; -@@ -228,22 +244,22 @@ - return(&procinfo); - } - } -- } while (PROC(aproc).p_stat == 0); -+ } while (PROC_STAT(aproc) == 0); - - /* - * We now have a process (`aproc'). - * Fill in the rest of `procinfo'. - */ -- if (EPROC(aproc).e_tdev != NODEV) { /* controlling tty */ -+ if (PROC_TDEV(aproc) != NODEV) { /* controlling tty */ - procinfo.pi_flags |= PI_CTLTTY; -- procinfo.pi_tty = (tty_T) EPROC(aproc).e_tdev; -+ procinfo.pi_tty = (tty_T) PROC_TDEV(aproc); - } - -- if (PROC(aproc).p_pid < pidmapsiz) { /* special */ -- procinfo.pi_cmd = pidmap[PROC(aproc).p_pid]; -+ if (PROC_PID(aproc) < pidmapsiz) { /* special */ -+ procinfo.pi_cmd = pidmap[PROC_PID(aproc)]; - procinfo.pi_flags |= PI_ASKUSR; - } else /* set path-stripped command name */ -- SETCMD(procinfo.pi_cmd, PROC(aproc).p_comm, MAXCOMLEN) -+ SETCMD(procinfo.pi_cmd, PROC_COMM(aproc), MAXCOMLEN) - - nproc--; - aproc++; -- cgit v1.2.3