From 349b89bb475ae2d86c1a4841933261bb5f53a675 Mon Sep 17 00:00:00 2001 From: fkr Date: Wed, 10 Nov 2010 13:50:04 +0000 Subject: [PATCH] update to openvpn 2.1.4, which is a bug fix release only. ok dcoppa@, benoit@ --- net/openvpn/Makefile | 7 +++---- net/openvpn/distinfo | 10 +++++----- net/openvpn/patches/patch-configure | 12 ++++++------ net/openvpn/patches/patch-route_c | 10 +++++----- 4 files changed, 19 insertions(+), 20 deletions(-) diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index 91502ef1aa6..a4b8b17190c 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.33 2010/10/18 21:50:39 sthen Exp $ +# $OpenBSD: Makefile,v 1.34 2010/11/10 13:50:04 fkr Exp $ COMMENT= easy-to-use, robust, and highly configurable VPN -VERSION= 2.1.2 +VERSION= 2.1.4 DISTNAME= openvpn-${VERSION} -REVISION= 0 CATEGORIES= net security HOMEPAGE= http://openvpn.net/ @@ -19,7 +18,7 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= c crypto ssl pthread -MASTER_SITES= ${HOMEPAGE}/release/ +MASTER_SITES= http://swupdate.openvpn.net/community/releases/ LIB_DEPENDS= lzo2::archivers/lzo2 diff --git a/net/openvpn/distinfo b/net/openvpn/distinfo index c77fc012d41..71efc14fc78 100644 --- a/net/openvpn/distinfo +++ b/net/openvpn/distinfo @@ -1,5 +1,5 @@ -MD5 (openvpn-2.1.2.tar.gz) = VDow2vze/h1nwOR7gHQXVQ== -RMD160 (openvpn-2.1.2.tar.gz) = XZYGv4sLpxbWjvE8gaPoTYtambM= -SHA1 (openvpn-2.1.2.tar.gz) = Ah+Ai7p5viOL0KOM/Li5LdBLhaM= -SHA256 (openvpn-2.1.2.tar.gz) = Nuw3uhe1Nraao0WaiRwVvmIY8coOwynfi36mO7aV4VM= -SIZE (openvpn-2.1.2.tar.gz) = 861104 +MD5 (openvpn-2.1.4.tar.gz) = lqEYaAgmhYAkiSVPA/873g== +RMD160 (openvpn-2.1.4.tar.gz) = PUvi/mJYg1mDcNdOj32SdOtApjY= +SHA1 (openvpn-2.1.4.tar.gz) = B8WcW4m3YnYb/hppl+yEcnn1oto= +SHA256 (openvpn-2.1.4.tar.gz) = Z/545d74LUTSrU72/G2HkBGVhJ0QtrPKuB+gMlf1KvU= +SIZE (openvpn-2.1.4.tar.gz) = 863726 diff --git a/net/openvpn/patches/patch-configure b/net/openvpn/patches/patch-configure index eb9dcfd9b0e..fcf62a3a63f 100644 --- a/net/openvpn/patches/patch-configure +++ b/net/openvpn/patches/patch-configure @@ -1,12 +1,12 @@ -$OpenBSD: patch-configure,v 1.2 2009/10/10 13:35:34 sthen Exp $ ---- configure.orig Wed Oct 7 13:11:23 2009 -+++ configure Sat Oct 10 15:33:07 2009 -@@ -10373,8 +10373,6 @@ if test x"$acx_pthread_ok" = xyes; then +$OpenBSD: patch-configure,v 1.3 2010/11/10 13:50:04 fkr Exp $ +--- configure.orig Thu Nov 4 20:37:13 2010 ++++ configure Fri Nov 5 21:20:33 2010 +@@ -11658,8 +11658,6 @@ if test x"$acx_pthread_ok" = xyes; then case "$target" in *openbsd*) -- { echo "$as_me:$LINENO: result: WARNING: pthread support on OpenBSD is unstable!" >&5 --echo "${ECHO_T}WARNING: pthread support on OpenBSD is unstable!" >&6; } +- { $as_echo "$as_me:$LINENO: result: WARNING: pthread support on OpenBSD is unstable!" >&5 +-$as_echo "WARNING: pthread support on OpenBSD is unstable!" >&6; } CFLAGS="$CFLAGS -pthread" ;; esac diff --git a/net/openvpn/patches/patch-route_c b/net/openvpn/patches/patch-route_c index cd4b992ef9e..53c56eab4b2 100644 --- a/net/openvpn/patches/patch-route_c +++ b/net/openvpn/patches/patch-route_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-route_c,v 1.4 2010/08/30 18:32:20 fkr Exp $ ---- route.c.orig Mon Jul 12 03:54:09 2010 -+++ route.c Sun Aug 22 16:10:24 2010 -@@ -1946,7 +1946,7 @@ get_default_gateway (in_addr_t *ret, in_addr_t *netmas +$OpenBSD: patch-route_c,v 1.5 2010/11/10 13:50:04 fkr Exp $ +--- route.c.orig Thu Nov 4 20:29:40 2010 ++++ route.c Fri Nov 5 21:12:15 2010 +@@ -1948,7 +1948,7 @@ get_default_gateway (in_addr_t *ret, in_addr_t *netmas } } @@ -10,7 +10,7 @@ $OpenBSD: patch-route_c,v 1.4 2010/08/30 18:32:20 fkr Exp $ #include #include -@@ -1995,6 +1995,169 @@ struct rt_msghdr { +@@ -1997,6 +1997,169 @@ struct rt_msghdr { int rtm_errno; /* why failed */ int rtm_use; /* from rtentry */ u_long rtm_inits; /* which metrics we are initializing */