From owner-svn-ports-head@freebsd.org Fri May 26 16:54:41 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CAC40D83B53; Fri, 26 May 2017 16:54:41 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 827C3195B; Fri, 26 May 2017 16:54:41 +0000 (UTC) (envelope-from adamw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v4QGseWW013912; Fri, 26 May 2017 16:54:40 GMT (envelope-from adamw@FreeBSD.org) Received: (from adamw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v4QGseaT013910; Fri, 26 May 2017 16:54:40 GMT (envelope-from adamw@FreeBSD.org) Message-Id: <201705261654.v4QGseaT013910@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adamw set sender to adamw@FreeBSD.org using -f From: Adam Weinberger Date: Fri, 26 May 2017 16:54:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441799 - in head/www/fcgiwrap: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 16:54:41 -0000 Author: adamw Date: Fri May 26 16:54:40 2017 New Revision: 441799 URL: https://svnweb.freebsd.org/changeset/ports/441799 Log: Fix stale processes not being terminated by the rc(8) script. Previously, when fcgiwrap_flags="-c [n]" with n > 1, only the controlling process was terminated, with the children running. This patch fixes this behaviour, terminating the children. PR: 217297 Submitted by: lstewart Reported by: spry anarchy in the ph MFH: 2017Q2 Modified: head/www/fcgiwrap/Makefile head/www/fcgiwrap/files/fcgiwrap.in Modified: head/www/fcgiwrap/Makefile ============================================================================== --- head/www/fcgiwrap/Makefile Fri May 26 16:49:48 2017 (r441798) +++ head/www/fcgiwrap/Makefile Fri May 26 16:54:40 2017 (r441799) @@ -2,7 +2,7 @@ PORTNAME= fcgiwrap PORTVERSION= 1.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MAINTAINER= ports@FreeBSD.org Modified: head/www/fcgiwrap/files/fcgiwrap.in ============================================================================== --- head/www/fcgiwrap/files/fcgiwrap.in Fri May 26 16:49:48 2017 (r441798) +++ head/www/fcgiwrap/files/fcgiwrap.in Fri May 26 16:54:40 2017 (r441799) @@ -87,7 +87,18 @@ fcgiwrap_postcmd() { fi } -fcgiwrap_cleansocket() { +fcgiwrap_stop() { + fcgiwrap_pgrp=$(/bin/ps -o ppid= $(cat ${pidfile})) + if [ -z "$fcgiwrap_pgrp" ] || ! kill -0 $fcgiwrap_pgrp; then + [ -n "$rc_fast" ] && return 0 + _run_rc_notrunning + return 1 + fi + fcgiwrap_pgrp_pids=$(/bin/pgrep -d ' ' -g ${fcgiwrap_pgrp}) + echo "Stopping ${name}." + kill -TERM -- -${fcgiwrap_pgrp} + wait_for_pids ${fcgiwrap_pgrp_pids} + # Workaround the fact that fcgiwrap doesn't cleanup his socket at stopping case ${fcgiwrap_socket} in unix*) @@ -104,7 +115,7 @@ procname="%%PREFIX%%/sbin/${name}" command="/usr/sbin/daemon" start_precmd="fcgiwrap_precmd" start_postcmd="fcgiwrap_postcmd" -stop_postcmd="fcgiwrap_cleansocket" +stop_cmd="fcgiwrap_stop" load_rc_config $name