svn commit: r356399 - in head/net/openbgpd: . files

[Hiroki Sato]

Author: hrs
Date: Tue Jun  3 19:50:10 2014
New Revision: 356399
URL: http://svnweb.freebsd.org/changeset/ports/356399
QAT: https://qat.redports.org/buildarchive/r356399/

Log:
  Make rc.d/openbgpd send signals only to the parent daemon process to fix
  a race condition.
  
  Submitted by:	naddy

Modified:
  head/net/openbgpd/Makefile
  head/net/openbgpd/files/openbgpd.in

Modified: head/net/openbgpd/Makefile
==============================================================================
--- head/net/openbgpd/Makefile	Tue Jun  3 19:42:40 2014	(r356398)
+++ head/net/openbgpd/Makefile	Tue Jun  3 19:50:10 2014	(r356399)
@@ -2,7 +2,7 @@
 
 PORTNAME=	openbgpd
 PORTVERSION=	5.2.20121209
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_OPENBSD}
 MASTER_SITE_SUBDIR=	OpenBGPD

Modified: head/net/openbgpd/files/openbgpd.in
==============================================================================
--- head/net/openbgpd/files/openbgpd.in	Tue Jun  3 19:42:40 2014	(r356398)
+++ head/net/openbgpd/files/openbgpd.in	Tue Jun  3 19:50:10 2014	(r356399)
@@ -17,14 +17,19 @@
 
 . /etc/rc.subr
 
-name="openbgpd"
+name=openbgpd
 rcvar=openbgpd_enable
 
-extra_commands="reload"
+extra_commands=reload
 command="%%PREFIX%%/sbin/bgpd"
 required_files="%%PREFIX%%/etc/bgpd.conf"
 
-load_rc_config "$name"
-: ${openbgpd_enable="NO"}
+: ${openbgpd_enable=NO}
 
+check_process()
+{
+	/bin/pgrep -f 'bgpd: parent.*'
+}
+
+load_rc_config $name
 run_rc_command "$1"