Attachment 98577 Details for Bug 137516 – openvpn-devel-2.1.r19.patch

[patch] openvpn-devel-2.1.r19.patch

openvpn-devel-2.1.r19.patch (text/plain), 3.04 KB, created by Matthias Andree on 2009-08-07 14:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthias Andree

Created: 2009-08-07 14:40:01 UTC

Size: 3.04 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/security/openvpn-devel/Makefile /usr/home/emma/ports/security/openvpn-devel/Makefile
>--- /usr/ports/security/openvpn-devel/Makefile	2009-06-14 00:55:19.000000000 +0200
>+++ /usr/home/emma/ports/security/openvpn-devel/Makefile	2009-08-07 15:12:08.000000000 +0200
>@@ -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 -ruN --exclude=CVS /usr/ports/security/openvpn-devel/distinfo /usr/home/emma/ports/security/openvpn-devel/distinfo
>--- /usr/ports/security/openvpn-devel/distinfo	2009-06-14 00:55:19.000000000 +0200
>+++ /usr/home/emma/ports/security/openvpn-devel/distinfo	2009-08-07 15:19:05.000000000 +0200
>@@ -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 -ruN --exclude=CVS /usr/ports/security/openvpn-devel/files/patch-tun.c /usr/home/emma/ports/security/openvpn-devel/files/patch-tun.c
>--- /usr/ports/security/openvpn-devel/files/patch-tun.c	1970-01-01 01:00:00.000000000 +0100
>+++ /usr/home/emma/ports/security/openvpn-devel/files/patch-tun.c	2009-08-07 15:21:38.000000000 +0200
>@@ -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));
>++      }
>+     }
>+ }
>+

Actions: View | Diff

Attachments on bug 137516: 98577