Permalink
Browse files

Changes 2.3.4:

The most important change in this release is that TLS version negotiation is no longer used unless it's explicitly turned on in the configuration files, thus reverting back to the 2.3.2 behaviour as interoperability issues were encountered in 2.3.3. Other notable changes include addition of SSL library version reporting, fixing of SOCKSv5 authentication logic and making serial env exporting consistent between OpenSSL and PolarSSL. This release also contains a number of other bug fixes and small enhancements.
  • Loading branch information...
1 parent eccdd65 commit 727f4b0543323882d5b69580085d417901572a2f adam committed Jul 20, 2014
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2013/08/30 22:38:14 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.6 2014/07/20 17:43:29 adam Exp $
.include "../../net/openvpn/Makefile.common"
DISTNAME= openvpn-acct-wtmpx-20130210
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://ftp.espci.fr/pub/openvpn-acct-wtmpx/
EXTRACT_SUFX= .tgz
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2013/08/30 22:38:14 joerg Exp $
+$NetBSD: distinfo,v 1.7 2014/07/20 17:43:29 adam Exp $
-SHA1 (openvpn-2.3.2.tar.gz) = 23a2e0b6867c7d45f6448029b8a8e13eb299eec0
-RMD160 (openvpn-2.3.2.tar.gz) = 3fdaada730908f5130a4a7c65fac0ce32644b47a
-Size (openvpn-2.3.2.tar.gz) = 1145108 bytes
+SHA1 (openvpn-2.3.4.tar.xz) = 20adb275760b0cfe99eb9cb34228d74bccb48ad8
+RMD160 (openvpn-2.3.4.tar.xz) = 849a00f399283778facc64e4198d3ee201ea3573
+Size (openvpn-2.3.4.tar.xz) = 791676 bytes
SHA1 (openvpn-acct-wtmpx-20130210.tgz) = cf7bc26b12a65493cdf5db93b03bbb938a2f0f33
RMD160 (openvpn-acct-wtmpx-20130210.tgz) = d9000789f04606bfa17db1597a45a4235b1119ea
Size (openvpn-acct-wtmpx-20130210.tgz) = 2778 bytes
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2013/08/30 22:38:47 joerg Exp $
-#
+# $NetBSD: Makefile,v 1.3 2014/07/20 17:43:29 adam Exp $
.include "../../net/openvpn/Makefile.common"
DISTNAME= openvpn-nagios-20130210
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${OPENVPN_DISTFILE}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net
MASTER_SITES= http://ftp.espci.fr/pub/openvpn-nagios/
EXTRACT_SUFX= .tgz
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2013/08/30 22:38:47 joerg Exp $
+$NetBSD: distinfo,v 1.4 2014/07/20 17:43:29 adam Exp $
-SHA1 (openvpn-2.3.2.tar.gz) = 23a2e0b6867c7d45f6448029b8a8e13eb299eec0
-RMD160 (openvpn-2.3.2.tar.gz) = 3fdaada730908f5130a4a7c65fac0ce32644b47a
-Size (openvpn-2.3.2.tar.gz) = 1145108 bytes
+SHA1 (openvpn-2.3.4.tar.xz) = 20adb275760b0cfe99eb9cb34228d74bccb48ad8
+RMD160 (openvpn-2.3.4.tar.xz) = 849a00f399283778facc64e4198d3ee201ea3573
+Size (openvpn-2.3.4.tar.xz) = 791676 bytes
SHA1 (openvpn-nagios-20130210.tgz) = 8a0fd4e3eba27584aa53c5589c13d4b38af43ba2
RMD160 (openvpn-nagios-20130210.tgz) = 2a47893ec2db2c280adc7b9fbbea97794ec1a6f4
Size (openvpn-nagios-20130210.tgz) = 3034 bytes
View
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2014/02/12 23:18:24 tron Exp $
+# $NetBSD: Makefile,v 1.53 2014/07/20 17:43:29 adam Exp $
DISTNAME= ${OPENVPN_DISTNAME}
-PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${OPENVPN_MASTER_SITES}
+EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://openvpn.net/
@@ -13,8 +13,7 @@ LICENSE= gnu-gpl-v2
PKG_DESTDIR_SUPPORT= user-destdir
USE_LIBTOOL= yes
-USE_TOOLS+= grep:run
-USE_TOOLS+= pkg-config
+USE_TOOLS+= aclocal autoconf autom4te grep:run pkg-config
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-debug
CONFIGURE_ARGS+= --disable-dependency-tracking
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2013/07/31 06:53:21 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2014/07/20 17:43:29 adam Exp $
# used by net/openvpn/Makefile
# used by net/openvpn-acct-wtmpx/Makefile
# used by net/openvpn-nagios/Makefile
-OPENVPN_DISTNAME= openvpn-2.3.2
-OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.gz
+OPENVPN_DISTNAME= openvpn-2.3.4
+OPENVPN_DISTFILE= ${OPENVPN_DISTNAME}.tar.xz
OPENVPN_MASTER_SITES= http://swupdate.openvpn.net/community/releases/
SITES.${OPENVPN_DISTFILE}= ${OPENVPN_MASTER_SITES}
View
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.29 2013/07/31 06:53:21 adam Exp $
+$NetBSD: distinfo,v 1.30 2014/07/20 17:43:29 adam Exp $
-SHA1 (openvpn-2.3.2.tar.gz) = 23a2e0b6867c7d45f6448029b8a8e13eb299eec0
-RMD160 (openvpn-2.3.2.tar.gz) = 3fdaada730908f5130a4a7c65fac0ce32644b47a
-Size (openvpn-2.3.2.tar.gz) = 1145108 bytes
-SHA1 (patch-aa) = e856b156656c575bfcb339eee17ed694b541872e
+SHA1 (openvpn-2.3.4.tar.xz) = 20adb275760b0cfe99eb9cb34228d74bccb48ad8
+RMD160 (openvpn-2.3.4.tar.xz) = 849a00f399283778facc64e4198d3ee201ea3573
+Size (openvpn-2.3.4.tar.xz) = 791676 bytes
SHA1 (patch-ac) = d1918a08f8b3dd150b44737a236da58be7fa1f8c
SHA1 (patch-ad) = 1406764c57687665df34a489474255ab0c3c8179
SHA1 (patch-ae) = e6e3e5977d1d9c09c0638d84e599c1c4956e27c8
SHA1 (patch-af) = 6c5cbb2fcd465a8519e947532cd8b09eb3499f65
SHA1 (patch-src_compat_compat-basename.c) = 45a58ef2e05f6e0265f229da8540760e60e65143
-SHA1 (patch-src_openvpn_socket.c) = 714e3bc08f4748ea7aef8c44594a185551758034
+SHA1 (patch-src_openvpn_socket.c) = 74668d39f5e6fdab64825d38d4b287c8004f5af3
SHA1 (patch-src_openvpn_socket.h) = b4b952af347e0f2d0aff307a5025b3d27a2e6ee5
@@ -1,16 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2013/02/10 05:55:07 manu Exp $
-
---- src/openvpn/route.c.orig 2010-11-04 19:29:40.000000000 +0000
-+++ src/openvpn/route.c
-@@ -1614,7 +1614,11 @@ get_default_gateway (in_addr_t *gateway,
- #define RTA_NETMASK 0x4
-
- #define RTM_GET 0x4
-+#if defined(TARGET_DRAGONFLY) && __DragonFly_version >= 200000
-+#define RTM_VERSION 6
-+#else
- #define RTM_VERSION 5
-+#endif
-
- #define RTF_UP 0x1
- #define RTF_GATEWAY 0x2
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_openvpn_socket.c,v 1.1 2013/07/31 06:53:21 adam Exp $
+$NetBSD: patch-src_openvpn_socket.c,v 1.2 2014/07/20 17:43:29 adam Exp $
Fix for systems without ipi_spec_dst in struct in_pktinfo.
---- src/openvpn/socket.c.orig 2013-07-31 06:14:52.000000000 +0000
+--- src/openvpn/socket.c.orig 2014-05-01 11:12:22.000000000 +0000
+++ src/openvpn/socket.c
-@@ -652,7 +652,7 @@ create_socket_udp (const unsigned int fl
+@@ -654,7 +654,7 @@ create_socket_udp (const unsigned int fl
else if (flags & SF_USE_IP_PKTINFO)
{
int pad = 1;
@@ -13,7 +13,7 @@ Fix for systems without ipi_spec_dst in struct in_pktinfo.
if (setsockopt (sd, SOL_IP, IP_PKTINFO,
(void*)&pad, sizeof(pad)) < 0)
msg(M_ERR, "UDP: failed setsockopt for IP_PKTINFO");
-@@ -2252,7 +2252,7 @@ print_link_socket_actual_ex (const struc
+@@ -2254,7 +2254,7 @@ print_link_socket_actual_ex (const struc
struct openvpn_sockaddr sa;
CLEAR (sa);
sa.addr.in4.sin_family = AF_INET;
@@ -22,7 +22,7 @@ Fix for systems without ipi_spec_dst in struct in_pktinfo.
sa.addr.in4.sin_addr = act->pi.in4.ipi_spec_dst;
if_indextoname(act->pi.in4.ipi_ifindex, ifname);
#elif defined(IP_RECVDSTADDR)
-@@ -2649,7 +2649,7 @@ link_socket_read_tcp (struct link_socket
+@@ -2651,7 +2651,7 @@ link_socket_read_tcp (struct link_socket
struct openvpn_in4_pktinfo
{
struct cmsghdr cmsghdr;
@@ -31,7 +31,7 @@ Fix for systems without ipi_spec_dst in struct in_pktinfo.
struct in_pktinfo pi4;
#elif defined(IP_RECVDSTADDR)
struct in_addr pi4;
-@@ -2694,7 +2694,7 @@ link_socket_read_udp_posix_recvmsg (stru
+@@ -2696,7 +2696,7 @@ link_socket_read_udp_posix_recvmsg (stru
cmsg = CMSG_FIRSTHDR (&mesg);
if (cmsg != NULL
&& CMSG_NXTHDR (&mesg, cmsg) == NULL
@@ -40,7 +40,7 @@ Fix for systems without ipi_spec_dst in struct in_pktinfo.
&& cmsg->cmsg_level == SOL_IP
&& cmsg->cmsg_type == IP_PKTINFO
#elif defined(IP_RECVDSTADDR)
-@@ -2705,7 +2705,7 @@ link_socket_read_udp_posix_recvmsg (stru
+@@ -2707,7 +2707,7 @@ link_socket_read_udp_posix_recvmsg (stru
#endif
&& cmsg->cmsg_len >= sizeof (struct openvpn_in4_pktinfo))
{
@@ -49,12 +49,12 @@ Fix for systems without ipi_spec_dst in struct in_pktinfo.
struct in_pktinfo *pkti = (struct in_pktinfo *) CMSG_DATA (cmsg);
from->pi.in4.ipi_ifindex = pkti->ipi_ifindex;
from->pi.in4.ipi_spec_dst = pkti->ipi_spec_dst;
-@@ -2803,7 +2803,7 @@ link_socket_write_udp_posix_sendmsg (str
+@@ -2802,7 +2802,7 @@ link_socket_write_udp_posix_sendmsg (str
+ mesg.msg_namelen = sizeof (struct sockaddr_in);
+ mesg.msg_control = &opi;
mesg.msg_flags = 0;
- cmsg = CMSG_FIRSTHDR (&mesg);
- cmsg->cmsg_len = sizeof (struct openvpn_in4_pktinfo);
-#ifdef HAVE_IN_PKTINFO
+#if defined(HAVE_IN_PKTINFO) && defined(HAVE_IPI_SPEC_DST)
- cmsg->cmsg_level = SOL_IP;
- cmsg->cmsg_type = IP_PKTINFO;
- {
+ mesg.msg_controllen = sizeof (struct openvpn_in4_pktinfo);
+ cmsg = CMSG_FIRSTHDR (&mesg);
+ cmsg->cmsg_len = sizeof (struct openvpn_in4_pktinfo);

0 comments on commit 727f4b0

Please sign in to comment.