svn commit: r441851 - in branches/2017Q2: sysutils/vimpager www/fcgi www/fcgiwrap www/fcgiwrap/files
Adam Weinberger
adamw at FreeBSD.org
Sat May 27 16:05:48 UTC 2017
Author: adamw
Date: Sat May 27 16:05:46 2017
New Revision: 441851
URL: https://svnweb.freebsd.org/changeset/ports/441851
Log:
MFH: r438923 r441799
r438923:
Release these ports to the collective.
r441799:
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
Approved by: ports-secteam (miwi)
Modified:
branches/2017Q2/sysutils/vimpager/Makefile
branches/2017Q2/www/fcgi/Makefile
branches/2017Q2/www/fcgiwrap/Makefile
branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in
Directory Properties:
branches/2017Q2/ (props changed)
Modified: branches/2017Q2/sysutils/vimpager/Makefile
==============================================================================
--- branches/2017Q2/sysutils/vimpager/Makefile Sat May 27 16:00:49 2017 (r441850)
+++ branches/2017Q2/sysutils/vimpager/Makefile Sat May 27 16:05:46 2017 (r441851)
@@ -5,7 +5,7 @@ PORTNAME= vimpager
DISTVERSION= 2.06
CATEGORIES= sysutils
-MAINTAINER= adamw at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= Use ViM as a pager
LICENSE= BSD2CLAUSE
Modified: branches/2017Q2/www/fcgi/Makefile
==============================================================================
--- branches/2017Q2/www/fcgi/Makefile Sat May 27 16:00:49 2017 (r441850)
+++ branches/2017Q2/www/fcgi/Makefile Sat May 27 16:05:46 2017 (r441851)
@@ -8,7 +8,7 @@ CATEGORIES= www
MASTER_SITES= LOCAL/adamw
PKGNAMESUFFIX= -devkit
-MAINTAINER= adamw at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= FastCGI Development Kit
LICENSE= Open_Market_FastCGI_license
Modified: branches/2017Q2/www/fcgiwrap/Makefile
==============================================================================
--- branches/2017Q2/www/fcgiwrap/Makefile Sat May 27 16:00:49 2017 (r441850)
+++ branches/2017Q2/www/fcgiwrap/Makefile Sat May 27 16:05:46 2017 (r441851)
@@ -2,10 +2,10 @@
PORTNAME= fcgiwrap
PORTVERSION= 1.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
-MAINTAINER= adamw at FreeBSD.org
+MAINTAINER= ports at FreeBSD.org
COMMENT= Simple FastCGI wrapper for CGI scripts
LICENSE= MIT
Modified: branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in
==============================================================================
--- branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in Sat May 27 16:00:49 2017 (r441850)
+++ branches/2017Q2/www/fcgiwrap/files/fcgiwrap.in Sat May 27 16:05:46 2017 (r441851)
@@ -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
More information about the svn-ports-all
mailing list