aboutsummaryrefslogtreecommitdiffstats
path: root/security/vpnc
diff options
context:
space:
mode:
authorehaupt <ehaupt@FreeBSD.org>2008-03-23 18:45:18 +0800
committerehaupt <ehaupt@FreeBSD.org>2008-03-23 18:45:18 +0800
commitf748b457e1b217532336ece3b23610bafc46b07a (patch)
tree28e5de0611c9099dd2dd221852498ea8a3372726 /security/vpnc
parent312d41300eaec4c711564d7a52f125a6e88b06f3 (diff)
downloadfreebsd-ports-gnome-f748b457e1b217532336ece3b23610bafc46b07a.tar.gz
freebsd-ports-gnome-f748b457e1b217532336ece3b23610bafc46b07a.tar.zst
freebsd-ports-gnome-f748b457e1b217532336ece3b23610bafc46b07a.zip
Follow the change of the pid file in the rc script.
Submitted by: Dominic Fandrey <kamikaze@bsdforen.de>
Diffstat (limited to 'security/vpnc')
-rw-r--r--security/vpnc/Makefile2
-rw-r--r--security/vpnc/files/vpnc.in7
2 files changed, 5 insertions, 4 deletions
diff --git a/security/vpnc/Makefile b/security/vpnc/Makefile
index 993c6815e1d4..731fcc5219c4 100644
--- a/security/vpnc/Makefile
+++ b/security/vpnc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= vpnc
PORTVERSION= 0.5.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= security
MASTER_SITES= http://www.unix-ag.uni-kl.de/~massar/vpnc/ \
http://critical.ch/distfiles/ \
diff --git a/security/vpnc/files/vpnc.in b/security/vpnc/files/vpnc.in
index 094f15f68f50..2422d0c1d73b 100644
--- a/security/vpnc/files/vpnc.in
+++ b/security/vpnc/files/vpnc.in
@@ -17,6 +17,7 @@
# Default settings - don't change this.
: ${vpnc_enable="NO"}
: ${vpnc_pid_dir="/var/run"}
+: ${vpnc_pid_file="vpnc/pid"}
: ${vpnc_conf_dir="%%PREFIX%%/etc"}
: ${vpnc_record="$vpnc_pid_dir/vpnc.record"}
@@ -52,12 +53,12 @@ vpnc_start() {
fi
# Wait for the system to catch up.
- /bin/sleep 2
+ /bin/sleep 1
# Copy files to allow a clean shutdown
# of multiple connections.
- /bin/cp "$vpnc_pid_dir/vpnc.pid" "$vpnc_pid_dir/vpnc.$config.pid"
+ /bin/cp "$vpnc_pid_dir/$vpnc_pid_file" "$vpnc_pid_dir/vpnc.$config.pid"
/bin/cp "$vpnc_pid_dir/vpnc.defaultroute" "$vpnc_pid_dir/vpnc.$config.defaultroute" 2> /dev/null
/bin/cp "$vpnc_pid_dir/vpnc.resolv.conf-backup" "$vpnc_pid_dir/vpnc.$config.resolv.conf-backup" 2> /dev/null
echo "$config" >> "$vpnc_record"
@@ -84,7 +85,7 @@ vpnc_stop() {
# Move the vpnc files back into position.
- /bin/mv "$vpnc_pid_dir/vpnc.$config.pid" "$vpnc_pid_dir/vpnc.pid"
+ /bin/mv "$vpnc_pid_dir/vpnc.$config.pid" "$vpnc_pid_dir/$vpnc_pid_file"
/bin/mv "$vpnc_pid_dir/vpnc.$config.defaultroute" "$vpnc_pid_dir/vpnc.defaultroute" 2> /dev/null
/bin/mv "$vpnc_pid_dir/vpnc.$config.resolv.conf-backup" "$vpnc_pid_dir/vpnc.resolv.conf-backup" 2> /dev/null