From owner-svn-src-projects@FreeBSD.ORG  Tue Apr 26 15:11:14 2011
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 442051065670;
	Tue, 26 Apr 2011 15:11:14 +0000 (UTC) (envelope-from flz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 193888FC18;
	Tue, 26 Apr 2011 15:11:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3QFBDMX027486;
	Tue, 26 Apr 2011 15:11:13 GMT (envelope-from flz@svn.freebsd.org)
Received: (from flz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3QFBD77027483;
	Tue, 26 Apr 2011 15:11:13 GMT (envelope-from flz@svn.freebsd.org)
Message-Id: <201104261511.p3QFBD77027483@svn.freebsd.org>
From: Florent Thoumie <flz@FreeBSD.org>
Date: Tue, 26 Apr 2011 15:11:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221068 - projects/portbuild/sources
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2011 15:11:14 -0000

Author: flz
Date: Tue Apr 26 15:11:13 2011
New Revision: 221068
URL: http://svn.freebsd.org/changeset/base/221068

Log:
  portbuild: use SIGKILL for ptimeout/pnohang.
  
  As requested by Pav.

Modified:
  projects/portbuild/sources/pnohang.c
  projects/portbuild/sources/ptimeout.c

Modified: projects/portbuild/sources/pnohang.c
==============================================================================
--- projects/portbuild/sources/pnohang.c	Tue Apr 26 15:11:12 2011	(r221067)
+++ projects/portbuild/sources/pnohang.c	Tue Apr 26 15:11:13 2011	(r221068)
@@ -70,7 +70,7 @@ main(int argc, char *argv[])
 		    sv.sa_handler = SIG_IGN;
 		    sigemptyset(&sv.sa_mask);
 		    sv.sa_flags = 0;
-		    sigaction(SIGTERM, &sv, 0);
+		    sigaction(SIGKILL, &sv, 0);
 
 		    /* parent */
 		    child = wait(&status);
@@ -78,10 +78,10 @@ main(int argc, char *argv[])
 
 		    if (pid1 == child) {
 			DPRINTF("killing process %d (second child)\n", pid2);
-			kill(pid2, SIGTERM);
+			kill(pid2, SIGKILL);
 		    } else {
 			DPRINTF("killing process %d (first child)\n", pid1);
-			kill(pid1, SIGTERM);
+			kill(pid1, SIGKILL);
 		    }
 		    /* exit status in upper 8 bits, killed signal (if any) in
 		     * lower 8 bits
@@ -98,9 +98,9 @@ main(int argc, char *argv[])
 			    printf("ps jgx before the signal\n");
 			    system("ps jgxww");
 			    sleep(1); /* give it a chance to output the message */
-			    kill(pid1, SIGTERM);
+			    kill(pid1, SIGKILL);
 			    sleep(1);
-			    kill(pid, SIGTERM);
+			    kill(pid, SIGKILL);
 			    sleep(1);
 			    system("ps jgxww");
 			    exit(1);

Modified: projects/portbuild/sources/ptimeout.c
==============================================================================
--- projects/portbuild/sources/ptimeout.c	Tue Apr 26 15:11:12 2011	(r221067)
+++ projects/portbuild/sources/ptimeout.c	Tue Apr 26 15:11:13 2011	(r221068)
@@ -56,7 +56,7 @@ main(int argc, char *argv[])
 			kill(pid2, SIGKILL);
 		    } else {
 			DPRINTF("killing process %d\n", pid1);
-			kill(pid1, SIGTERM);
+			kill(pid1, SIGKILL);
 		    }
 		    /* exit status in upper 8 bits, killed signal (if any)
 		     * in lower 8 bits
@@ -67,7 +67,7 @@ main(int argc, char *argv[])
 		    sleep(timeout);
 		    t = time(NULL);
 		    printf("ptimeout: killing %s (pid %d) since timeout of %d expired at %s", args, pid1, timeout, ctime(&t));
-		    kill(pid1, SIGTERM);
+		    kill(pid1, SIGKILL);
 		    exit(1);
 		}
 	} else {