Menu
▾
▴
[Astlinux-commits] SF.net SVN: astlinux:[8062] branches/1.0
|
From: <abe...@us...> - 2017-01-02 18:25:25
|
Revision: 8062
http://sourceforge.net/p/astlinux/code/8062
Author: abelbeck
Date: 2017-01-02 18:25:22 +0000 (Mon, 02 Jan 2017)
Log Message:
-----------
openvpn, version bump to 2.4.0, major new features are AEAD (GCM) cipher and Elliptic Curve DH key exchange support. Additionally some cleanup, including removing old deprecated rc.conf variables OVPN_PUSH1-4 and OVPN_OTHER1-2
Modified Paths:
--------------
branches/1.0/astlinux-ast11.config
branches/1.0/astlinux-ast13.config
branches/1.0/package/openvpn/Config.in
branches/1.0/package/openvpn/openvpn.init
branches/1.0/package/openvpn/openvpn.mk
branches/1.0/x86_64-configs/astlinux-ast11.config
branches/1.0/x86_64-configs/astlinux-ast13.config
Modified: branches/1.0/astlinux-ast11.config
===================================================================
--- branches/1.0/astlinux-ast11.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/astlinux-ast11.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:56 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:16 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -759,7 +759,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
Modified: branches/1.0/astlinux-ast13.config
===================================================================
--- branches/1.0/astlinux-ast13.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/astlinux-ast13.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:56 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:16 2017
#
BR2_HAVE_DOT_CONFIG=y
# BR2_arm is not set
@@ -759,7 +759,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
Modified: branches/1.0/package/openvpn/Config.in
===================================================================
--- branches/1.0/package/openvpn/Config.in 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/package/openvpn/Config.in 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,5 +1,6 @@
config BR2_PACKAGE_OPENVPN
bool "openvpn"
+ select BR2_PACKAGE_OPENSSL
help
OpenVPN is a full-featured SSL VPN solution which can
accomodate a wide range of configurations, including road
@@ -8,20 +9,15 @@
remote access solutions with load balancing, failover, and
fine-grained access-controls.
- http://openvpn.sourceforge.net/
+ http://openvpn.net/
+if BR2_PACKAGE_OPENVPN
+
config BR2_PACKAGE_OPENVPN_LZO
bool "LZO compression"
default y
- depends on BR2_PACKAGE_OPENVPN
select BR2_PACKAGE_LZO
help
Enable LZO compression.
-config BR2_PACKAGE_OPENVPN_OPENSSL
- bool "OpenSSL support"
- default y
- depends on BR2_PACKAGE_OPENVPN
- select BR2_PACKAGE_OPENSSL
- help
- Enable TLS-based key exchange and OpenSSL crypto support.
+endif
Modified: branches/1.0/package/openvpn/openvpn.init
===================================================================
--- branches/1.0/package/openvpn/openvpn.init 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/package/openvpn/openvpn.init 2017-01-02 18:25:22 UTC (rev 8062)
@@ -63,32 +63,12 @@
server $OVPN_SERVER${OVPN_SERVERV6:+
server-ipv6 $OVPN_SERVERV6}
verb $OVPN_VERBOSITY" > /tmp/etc/openvpn.conf
- # push settings from the server to the client
- if [ -n "$OVPN_PUSH1" ]; then
- echo "push \"$OVPN_PUSH1\"" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_PUSH2" ]; then
- echo "push \"$OVPN_PUSH2\"" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_PUSH3" ]; then
- echo "push \"$OVPN_PUSH3\"" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_PUSH4" ]; then
- echo "push \"$OVPN_PUSH4\"" >> /tmp/etc/openvpn.conf
- fi
- # Deprecate OVPN_PUSH1-4 in favor of OVPN_PUSH
+
IFS=$'\n'
for i in $OVPN_PUSH; do
echo "push \"$i\"" >> /tmp/etc/openvpn.conf
done
- if [ -n "$OVPN_OTHER1" ]; then
- echo "$OVPN_OTHER1" >> /tmp/etc/openvpn.conf
- fi
- if [ -n "$OVPN_OTHER2" ]; then
- echo "$OVPN_OTHER2" >> /tmp/etc/openvpn.conf
- fi
- # Deprecate OVPN_OTHER1-2 in favor of OVPN_OTHER
IFS=$'\n'
for i in $OVPN_OTHER; do
echo "$i" >> /tmp/etc/openvpn.conf
Modified: branches/1.0/package/openvpn/openvpn.mk
===================================================================
--- branches/1.0/package/openvpn/openvpn.mk 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/package/openvpn/openvpn.mk 2017-01-02 18:25:22 UTC (rev 8062)
@@ -4,11 +4,18 @@
#
#############################################################
-OPENVPN_VERSION = 2.3.14
+OPENVPN_VERSION = 2.4.0
OPENVPN_SITE = http://swupdate.openvpn.net/community/releases
-OPENVPN_DEPENDENCIES = host-pkg-config
-OPENVPN_CONF_OPT = --disable-plugins --enable-iproute2
-OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \
+OPENVPN_DEPENDENCIES = host-pkg-config openssl
+
+OPENVPN_CONF_OPT = \
+ --disable-debug \
+ --disable-plugins \
+ --enable-iproute2 \
+ --with-crypto-library=openssl
+
+OPENVPN_CONF_ENV = \
+ IFCONFIG=/sbin/ifconfig \
NETSTAT=/bin/netstat \
ROUTE=/sbin/route
@@ -24,11 +31,6 @@
OPENVPN_CONF_OPT += --disable-lzo
endif
-ifeq ($(BR2_PACKAGE_OPENVPN_OPENSSL),y)
- OPENVPN_CONF_OPT += --with-crypto-library=openssl
- OPENVPN_DEPENDENCIES += openssl
-endif
-
define OPENVPN_INSTALL_TARGET_CMDS
$(INSTALL) -m 755 $(@D)/src/openvpn/openvpn $(TARGET_DIR)/usr/sbin/openvpn
$(INSTALL) -m 755 -D package/openvpn/openvpn.init $(TARGET_DIR)/etc/init.d/openvpn
Modified: branches/1.0/x86_64-configs/astlinux-ast11.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast11.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/x86_64-configs/astlinux-ast11.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:57 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:17 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -740,7 +740,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
Modified: branches/1.0/x86_64-configs/astlinux-ast13.config
===================================================================
--- branches/1.0/x86_64-configs/astlinux-ast13.config 2016-12-30 16:21:13 UTC (rev 8061)
+++ branches/1.0/x86_64-configs/astlinux-ast13.config 2017-01-02 18:25:22 UTC (rev 8062)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Buildroot astlinux-1.x-svn8012-dirty Configuration
-# Sun Dec 4 22:03:57 2016
+# Buildroot astlinux-1.x-svn8061-dirty Configuration
+# Mon Jan 2 10:45:17 2017
#
BR2_HAVE_DOT_CONFIG=y
BR2_ARCH_IS_64=y
@@ -740,7 +740,6 @@
BR2_PACKAGE_OPENSSH=y
BR2_PACKAGE_OPENVPN=y
BR2_PACKAGE_OPENVPN_LZO=y
-BR2_PACKAGE_OPENVPN_OPENSSL=y
BR2_PACKAGE_P910ND=y
# BR2_PACKAGE_PORTMAP is not set
BR2_PACKAGE_PPPD=y
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
