From owner-svn-ports-head@freebsd.org  Tue Oct  2 10:58:38 2018
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5173E10BF7EB;
 Tue,  2 Oct 2018 10:58:38 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 0811F867E6;
 Tue,  2 Oct 2018 10:58:38 +0000 (UTC)
 (envelope-from garga@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 02AFC2ED0B;
 Tue,  2 Oct 2018 10:58:38 +0000 (UTC)
 (envelope-from garga@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w92AwbpW072882;
 Tue, 2 Oct 2018 10:58:37 GMT (envelope-from garga@FreeBSD.org)
Received: (from garga@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w92AwbLn072881;
 Tue, 2 Oct 2018 10:58:37 GMT (envelope-from garga@FreeBSD.org)
Message-Id: <201810021058.w92AwbLn072881@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: garga set sender to
 garga@FreeBSD.org using -f
From: Renato Botelho <garga@FreeBSD.org>
Date: Tue, 2 Oct 2018 10:58:37 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r481110 - head/security/strongswan/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: garga
X-SVN-Commit-Paths: head/security/strongswan/files
X-SVN-Commit-Revision: 481110
X-SVN-Commit-Repository: ports
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.27
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2018 10:58:38 -0000

Author: garga
Date: Tue Oct  2 10:58:37 2018
New Revision: 481110
URL: https://svnweb.freebsd.org/changeset/ports/481110

Log:
  security/strongswan: Fix rc startup script to support rc.conf settings like
  _nice, _fib
  
  Do not bump version since I'll commit the upgrade to 5.7.1 just after it
  
  PR:		211108
  Submitted by:	Dmitry Wagin <dmitry.wagin@ya.ru>
  Approved by:	maintainer
  Sponsored by:	Rubicon Communications, LLC (Netgate)

Modified:
  head/security/strongswan/files/strongswan.in

Modified: head/security/strongswan/files/strongswan.in
==============================================================================
--- head/security/strongswan/files/strongswan.in	Tue Oct  2 09:41:24 2018	(r481109)
+++ head/security/strongswan/files/strongswan.in	Tue Oct  2 10:58:37 2018	(r481110)
@@ -7,27 +7,31 @@
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
-command="%%PREFIX%%/sbin/ipsec"
 . /etc/rc.subr
 
-name="strongswan"
-rcvar=${name}_enable
+name=strongswan
+rcvar=strongswan_enable
+
 extra_commands="reload statusall"
 
 load_rc_config $name
 
-start_cmd="strongswan_command start"
-stop_cmd="strongswan_command stop"
-restart_cmd="strongswan_command restart"
-status_cmd="strongswan_command status"
-reload_cmd="strongswan_command reload"
-statusall_cmd="strongswan_command statusall"
+command="%%PREFIX%%/sbin/ipsec"
 
+start_precmd="strongswan_precmd"
+stop_cmd="strongswan_cmd"
+status_cmd="strongswan_cmd"
+reload_cmd="strongswan_cmd"
+statusall_cmd="strongswan_cmd"
 
-strongswan_command()
+strongswan_precmd()
 {
-	$command ${rc_arg}
+	command_args=${rc_arg}
 }
 
-run_rc_command "$1"
+strongswan_cmd()
+{
+	${command} ${rc_arg}
+}
 
+run_rc_command "$1"