diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2009-10-14 10:34:55 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2009-10-14 10:34:55 +0000 |
| commit | 96f584131d7d794512be64f8b19d7651937a0fc7 (patch) | |
| tree | 4a22fc450a8a7407d804f66f3bf43aea8284764a | |
| parent | 28b56cffec84f0b5b472c6554a086b573a1e5d05 (diff) | |
| download | ports-96f584131d7d794512be64f8b19d7651937a0fc7.tar.gz ports-96f584131d7d794512be64f8b19d7651937a0fc7.zip | |
Notes
| -rw-r--r-- | security/openvpn-devel/Makefile | 4 | ||||
| -rw-r--r-- | security/openvpn-devel/distinfo | 6 | ||||
| -rw-r--r-- | security/openvpn-devel/files/patch-tun.c | 43 |
3 files changed, 5 insertions, 48 deletions
diff --git a/security/openvpn-devel/Makefile b/security/openvpn-devel/Makefile index 11c83de894f4..f1e985403e5c 100644 --- a/security/openvpn-devel/Makefile +++ b/security/openvpn-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openvpn -DISTVERSION= 2.1_rc19 +DISTVERSION= 2.1_rc20 CATEGORIES= security net MASTER_SITES= http://openvpn.net/release/ PKGNAMESUFFIX= -devel @@ -41,7 +41,7 @@ SUB_LIST+= RCSFX=${RC_SUBR_SUFFIX} CFLAGS+= -DLOG_OPENVPN=${LOG_OPENVPN} .endif -pre-fetch: +pre-configure: .ifdef (LOG_OPENVPN) @${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}" .else diff --git a/security/openvpn-devel/distinfo b/security/openvpn-devel/distinfo index bf105d26807d..bda9168c9099 100644 --- a/security/openvpn-devel/distinfo +++ b/security/openvpn-devel/distinfo @@ -1,3 +1,3 @@ -MD5 (openvpn-2.1_rc19.tar.gz) = ba2ee667a8b7606b125b7d32f47ca578 -SHA256 (openvpn-2.1_rc19.tar.gz) = d7f52e2217ed1cf367ca93257b27c8acb29fcae4fcaa31b4a94146a3c7a7de33 -SIZE (openvpn-2.1_rc19.tar.gz) = 839955 +MD5 (openvpn-2.1_rc20.tar.gz) = 8187f8f21507faac5e320e32747203b8 +SHA256 (openvpn-2.1_rc20.tar.gz) = 4d423b48cb3ccc66b5669b9404dcb028cb62af410361c09e6056db0c5d2a1267 +SIZE (openvpn-2.1_rc20.tar.gz) = 844253 diff --git a/security/openvpn-devel/files/patch-tun.c b/security/openvpn-devel/files/patch-tun.c deleted file mode 100644 index d2ebe6de6d01..000000000000 --- a/security/openvpn-devel/files/patch-tun.c +++ /dev/null @@ -1,43 +0,0 @@ -# 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)); -+ } - } - } - |