svn commit: r412540 - in head/security/openvpn: . files

[Matthias Andree]

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 at 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