From e133691e671147c33a6e75d749597fe926309454 Mon Sep 17 00:00:00 2001
From: ehaupt <ehaupt@FreeBSD.org>
Date: Mon, 24 Nov 2008 00:27:46 +0000
Subject: Update to 0.5.3 (files forgotten in previous commit)

---
 security/vpnc/files/patch-vpnc-script    | 32 --------------------------------
 security/vpnc/files/patch-vpnc-script.in | 29 +++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 security/vpnc/files/patch-vpnc-script
 create mode 100644 security/vpnc/files/patch-vpnc-script.in

(limited to 'security')

diff --git a/security/vpnc/files/patch-vpnc-script b/security/vpnc/files/patch-vpnc-script
deleted file mode 100644
index 3d183f2d96a..00000000000
--- a/security/vpnc/files/patch-vpnc-script
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD$
-
---- vpnc-script.orig
-+++ vpnc-script
-@@ -56,8 +56,8 @@
- 		;;
- esac
- 
--DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
--RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
-+DEFAULT_ROUTE_FILE=/var/run/vpnc.defaultroute
-+RESOLV_CONF_BACKUP=/var/run/vpnc.resolv.conf-backup
- FULL_SCRIPTNAME=/usr/local/sbin/vpnc
- SCRIPTNAME=`basename $FULL_SCRIPTNAME`
- 
-@@ -407,11 +407,13 @@
- 			fi
- 		fi
- 	elif [ "$OS" = "FreeBSD" ]; then
--		if [ ! -e /dev/tun ]; then
-+		kldstat -q -m if_tun
-+		if [ ${?} != 0 ]; then
- 			kldload if_tun
- 		fi
- 	elif [ "$OS" = "GNU/kFreeBSD" ]; then
--		if [ ! -e /dev/tun ]; then
-+		kldstat -q -m if_tun
-+		if [ ${?} != 0 ]; then
- 			kldload if_tun
- 		fi
- 	elif [ "$OS" = "NetBSD" ]; then
diff --git a/security/vpnc/files/patch-vpnc-script.in b/security/vpnc/files/patch-vpnc-script.in
new file mode 100644
index 00000000000..591456134b6
--- /dev/null
+++ b/security/vpnc/files/patch-vpnc-script.in
@@ -0,0 +1,29 @@
+--- vpnc-script.in.orig	2008-11-24 00:18:37.000000000 +0100
++++ vpnc-script.in	2008-11-24 00:21:54.000000000 +0100
+@@ -48,8 +48,8 @@
+ 
+ OS="`uname -s`"
+ 
+-DEFAULT_ROUTE_FILE=/var/run/vpnc/defaultroute
+-RESOLV_CONF_BACKUP=/var/run/vpnc/resolv.conf-backup
++DEFAULT_ROUTE_FILE=/var/run/vpnc.defaultroute
++RESOLV_CONF_BACKUP=/var/run/vpnc.resolv.conf-backup
+ FULL_SCRIPTNAME=@PREFIX@/sbin/vpnc
+ SCRIPTNAME=`basename $FULL_SCRIPTNAME`
+ 
+@@ -420,11 +420,13 @@
+ 			fi
+ 		fi
+ 	elif [ "$OS" = "FreeBSD" ]; then
+-		if [ ! -e /dev/tun ]; then
++		kldstat -q -m if_tun
++		if [ ${?} != 0 ]; then
+ 			kldload if_tun
+ 		fi
+ 	elif [ "$OS" = "GNU/kFreeBSD" ]; then
+-		if [ ! -e /dev/tun ]; then
++		kldstat -q -m if_tun
++		if [ ${?} != 0 ]; then
+ 			kldload if_tun
+ 		fi
+ 	elif [ "$OS" = "NetBSD" ]; then
-- 
cgit