cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pushed upstream.

Browse Source
This commit is contained in:
jca 2017-06-11 12:15:50 +00:00
parent d6e9599b47
commit acedfd1692
4 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/openvpn/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.77 2017/05/21 16:12:43 jca Exp $
# $OpenBSD: Makefile,v 1.78 2017/06/11 12:15:50 jca Exp $
COMMENT= easy-to-use, robust, and highly configurable VPN
DISTNAME= openvpn-2.4.2
REVISION= 1
REVISION= 2
CATEGORIES= net security
HOMEPAGE= https://openvpn.net/index.php/open-source/

4
net/openvpn/patches/patch-src_openvpn_route_c
View File

@ -1,7 +1,9 @@
$OpenBSD: patch-src_openvpn_route_c,v 1.9 2017/05/21 16:12:43 jca Exp $
$OpenBSD: patch-src_openvpn_route_c,v 1.10 2017/06/11 12:15:50 jca Exp $
- add support for on-link routes
- add support for non-0 routing tables
https://github.com/OpenVPN/openvpn/commit/3dd30bfe5fdf9f34afe7f847b4e30156982d9ff0
--- src/openvpn/route.c.orig Thu Mar 23 02:34:21 2017
+++ src/openvpn/route.c Wed Apr 12 18:06:40 2017

6
net/openvpn/patches/patch-src_openvpn_syshead_h
View File

@ -1,4 +1,8 @@
$OpenBSD: patch-src_openvpn_syshead_h,v 1.3 2017/02/16 21:16:55 kurt Exp $
$OpenBSD: patch-src_openvpn_syshead_h,v 1.4 2017/06/11 12:15:50 jca Exp $
- missing include
https://github.com/OpenVPN/openvpn/commit/e5b236eaba4512f86da917a0a63dd0f84e1b02db
--- src/openvpn/syshead.h.orig Wed Feb 15 11:34:39 2017
+++ src/openvpn/syshead.h Wed Feb 15 11:35:49 2017
@@ -288,6 +288,10 @@

17
net/openvpn/patches/patch-src_openvpn_tun_c
View File

@ -1,10 +1,13 @@
$OpenBSD: patch-src_openvpn_tun_c,v 1.13 2017/04/16 20:14:17 stsp Exp $
$OpenBSD: patch-src_openvpn_tun_c,v 1.14 2017/06/11 12:15:50 jca Exp $
- no need for link0 any more, we have separate tap interfaces
- fix bus error in write_tun_header() due to misaligned access
--- src/openvpn/tun.c.orig Wed Mar 22 16:34:21 2017
+++ src/openvpn/tun.c Sun Apr 16 17:36:51 2017
- fix bus error in write_tun_header() due to misaligned access
https://github.com/OpenVPN/openvpn/commit/3e4e300d6c5ea9c320e62def79e5b70f8e255248
Index: src/openvpn/tun.c
--- src/openvpn/tun.c.orig
+++ src/openvpn/tun.c
@@ -1201,7 +1201,7 @@ do_ifconfig(struct tuntap *tt,
if (tun)
{
@ -43,13 +46,13 @@ $OpenBSD: patch-src_openvpn_tun_c,v 1.13 2017/04/16 20:14:17 stsp Exp $
u_int32_t type;
struct iovec iv[2];
- struct ip *iph;
+ struct ip iph;
+ struct openvpn_iphdr *iph;
- iph = (struct ip *) buf;
+ memcpy(&iph, buf, sizeof(iph));
+ iph = (struct openvpn_iphdr *) buf;
- if (iph->ip_v == 6)
+ if (iph.ip_v == 6)
+ if (OPENVPN_IPH_GET_VER(iph->version_len) == 6)
{
type = htonl(AF_INET6);
}