From owner-svn-ports-all@FreeBSD.ORG  Tue Jun  3 19:50:11 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 9B66ACF4;
 Tue,  3 Jun 2014 19:50:11 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::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 885842319;
 Tue,  3 Jun 2014 19:50:11 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s53JoBKB047930;
 Tue, 3 Jun 2014 19:50:11 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s53JoBrN047925;
 Tue, 3 Jun 2014 19:50:11 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201406031950.s53JoBrN047925@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 3 Jun 2014 19:50:11 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r356399 - in head/net/openbgpd: . 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-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jun 2014 19:50:11 -0000

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"