diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2009-08-07 17:47:28 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2009-08-07 17:47:28 +0000 |
| commit | 4b769888fd88f50eda73cb398c4ded91d6438183 (patch) | |
| tree | a7b9860107d8d25aac03a6dbc14f49b9c2bdd98c /security/openvpn-devel | |
| parent | - Add OPTIONS (diff) | |
- Update to 2.1_rc19
- Fix on FreeBSD 8.x
PR: 137516
Submitted by: Matthias Andree <matthias.andree@gmx.de> (maintainer)
Notes
Notes:
svn path=/head/; revision=239097
Diffstat (limited to 'security/openvpn-devel')
| -rw-r--r-- | security/openvpn-devel/Makefile | 2 | ||||
| -rw-r--r-- | security/openvpn-devel/distinfo | 6 | ||||
| -rw-r--r-- | security/openvpn-devel/files/patch-tun.c | 43 |
3 files changed, 47 insertions, 4 deletions
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index 6f6e4c9d9cf0..11c83de894f4 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openvpn -DISTVERSION= 2.1_rc18 +DISTVERSION= 2.1_rc19 CATEGORIES= security net MASTER_SITES= http://openvpn.net/release/ PKGNAMESUFFIX= -devel diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo index 553c249e43a7..bf105d26807d 100644 --- a/security/openvpn-devel/distinfo +++ b/security/openvpn-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (openvpn-2.1_rc18.tar.gz) = af330c94da5200df94c4e84798ea39be -SHA256 (openvpn-2.1_rc18.tar.gz) = 5ddd900ab1293aa8882e8be4cadddb419c3c76b1d28079183323ebb1e9e333a2 -SIZE (openvpn-2.1_rc18.tar.gz) = 838716 +MD5 (openvpn-2.1_rc19.tar.gz) = ba2ee667a8b7606b125b7d32f47ca578 +SHA256 (openvpn-2.1_rc19.tar.gz) = d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33 +SIZE (openvpn-2.1_rc19.tar.gz) = 839955 diff --git a/security/openvpn-devel/files/patch-tun.c b/security/openvpn-devel/files/patch-tun.c new file mode 100644 index 000000000000..d2ebe6de6d01 --- /dev/null +++ b/security/openvpn-devel/files/patch-tun.c @@ -0,0 +1,43 @@ +# This patch by Stefan Bethke fixes FreeBSD 8 compatibility +# in topology subnet mode, # and makes sure that the tun interface is +# correctly configured. Contact: stb at lassitu dot de + +--- /home/stb/tun.c.orig 2009-08-05 14:25:55.204943408 +0200 ++++ tun.c 2009-08-05 17:57:51.886753309 +0200 +@@ -863,11 +863,10 @@ + else { + if (tt->topology == TOP_SUBNET) + argv_printf (&argv, +- "%s %s %s %s netmask %s mtu %d up", ++ "%s %s %s netmask %s mtu %d up", + IFCONFIG_PATH, + actual, + ifconfig_local, +- ifconfig_local, + ifconfig_remote_netmask, + tun_mtu + ); +@@ -1745,14 +1744,19 @@ + { + open_tun_generic (dev, dev_type, dev_node, ipv6, true, true, tt); + +- if (tt->fd >= 0) ++ if (tt->fd >= 0 && tt->type == DEV_TYPE_TUN) + { + int i = 0; + +- /* Disable extended modes */ +- ioctl (tt->fd, TUNSLMODE, &i); ++ i = tt->topology == TOP_SUBNET ? IFF_BROADCAST : IFF_POINTOPOINT; ++ i |= IFF_MULTICAST; ++ if (ioctl (tt->fd, TUNSIFMODE, &i) < 0) { ++ msg (M_WARN | M_ERRNO, "ioctl(TUNSIFMODE): %s", strerror(errno)); ++ } + i = 1; +- ioctl (tt->fd, TUNSIFHEAD, &i); ++ if (ioctl (tt->fd, TUNSIFHEAD, &i) < 0) { ++ msg (M_WARN | M_ERRNO, "ioctl(TUNSIFHEAD): %s", strerror(errno)); ++ } + } + } + |