opnsense-ports/security/vpnc/files/patch-vpnc-script.in
Franco Fichtner 8cb1a96ede ports: pull in a snapshot of the FreeBSD ports tree
Taken from:	https://github.com/freebsd/freebsd-ports.git
Commit id:	5070672073b68be364139bc6b3a89100bd17d331
2014-11-09 14:03:21 +01:00

40 lines
1.3 KiB
Text

--- vpnc-script.in.orig 2008-11-19 21:55:51.000000000 +0100
+++ vpnc-script.in 2011-11-10 22:41:12.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`
@@ -73,7 +73,9 @@
route_syntax_netmask="-netmask"
fi
-if [ -x /sbin/resolvconf ]; then # Optional tool on Debian, Ubuntu, Gentoo
+# Optional tool on Debian, Ubuntu, Gentoo. FreeBSD 9.0-RELEASE has a different,
+# incompatible /sbin/resolvconf implementation
+if [ -x /sbin/resolvconf ] && [ "$OS" = "Linux" ]; then
MODIFYRESOLVCONF=modify_resolvconf_manager
RESTORERESOLVCONF=restore_resolvconf_manager
elif [ -x /sbin/modify_resolvconf ]; then # Mandatory tool on Suse earlier than 11.1
@@ -420,11 +422,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