From owner-svn-ports-head@freebsd.org  Tue Apr  5 02:08:05 2016
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:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 877D4B03654;
 Tue,  5 Apr 2016 02:08:05 +0000 (UTC)
 (envelope-from mandree@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 54CC01955;
 Tue,  5 Apr 2016 02:08:05 +0000 (UTC)
 (envelope-from mandree@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u35284p0004972;
 Tue, 5 Apr 2016 02:08:04 GMT (envelope-from mandree@FreeBSD.org)
Received: (from mandree@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u35284kJ004970;
 Tue, 5 Apr 2016 02:08:04 GMT (envelope-from mandree@FreeBSD.org)
Message-Id: <201604050208.u35284kJ004970@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mandree set sender to
 mandree@FreeBSD.org using -f
From: Matthias Andree <mandree@FreeBSD.org>
Date: Tue, 5 Apr 2016 02:08:04 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r412540 - in head/security/openvpn: . 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.21
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, 05 Apr 2016 02:08:05 -0000

Author: mandree
Date: Tue Apr  5 02:08:04 2016
New Revision: 412540
URL: https://svnweb.freebsd.org/changeset/ports/412540

Log:
  Work around 10.3-RELEASE's service(8) shortcomings
  
  PR:		208534
  Reported by:	allan@saddi.com

Modified:
  head/security/openvpn/Makefile
  head/security/openvpn/files/openvpn.in

Modified: head/security/openvpn/Makefile
==============================================================================
--- head/security/openvpn/Makefile	Tue Apr  5 01:36:34 2016	(r412539)
+++ head/security/openvpn/Makefile	Tue Apr  5 02:08:04 2016	(r412540)
@@ -3,6 +3,7 @@
 
 PORTNAME=		openvpn
 DISTVERSION=		2.3.10
+PORTREVISION=		1
 CATEGORIES=		security net
 MASTER_SITES=		http://swupdate.openvpn.net/community/releases/ \
 			http://build.openvpn.net/downloads/releases/

Modified: head/security/openvpn/files/openvpn.in
==============================================================================
--- head/security/openvpn/files/openvpn.in	Tue Apr  5 01:36:34 2016	(r412539)
+++ head/security/openvpn/files/openvpn.in	Tue Apr  5 02:08:04 2016	(r412540)
@@ -64,6 +64,12 @@
 
 . /etc/rc.subr
 
+# service(8) does not create an authentic environment, try to guess,
+# and as of 10.3-RELEASE-p0, it will not find the indented name=
+# assignments below. So give it a default.
+# Trailing semicolon also for service(8)'s benefit:
+name="$file" ;
+
 case "$0" in
 /etc/rc*)
 	# during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
@@ -75,6 +81,9 @@ case "$0" in
 	;;
 esac
 
+# default name to "openvpn" if guessing failed
+# Trailing semicolon also for service(8)'s benefit:
+name="${name:-openvpn}" ;
 name="${name##*/}"
 rcvar=${name}_enable