From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 25 Feb 2012 14:32:21 +0000 (+0000)
Subject: [package] openvpn, openvpn-devel, openvpn-polarssl: remove special quoted parameter... 
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ae01622598baf205e9511edbe65d0689765f9439;p=openwrt%2Fsvn-archive%2Farchive.git

[package] openvpn, openvpn-devel, openvpn-polarssl: remove special quoted parameter handling
The append_params_quoted procedure was only needed while the final OpenVPN was eval'd, now
that the service wrappers pass the command line through to ssd unmangled, the extraneous
quotes cause issues in the openvpn command line parser, so remove them.


SVN-Revision: 30719
---

diff --git a/net/openvpn-devel/Makefile b/net/openvpn-devel/Makefile
index 44ca487263..1c2e7fc75f 100644
--- a/net/openvpn-devel/Makefile
+++ b/net/openvpn-devel/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2010-2011 OpenWrt.org
+# Copyright (C) 2010-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn-devel
 PKG_VERSION:=201120
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=openvpn-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel \
diff --git a/net/openvpn-polarssl/Makefile b/net/openvpn-polarssl/Makefile
index c5ebff2252..f642a7b1a2 100644
--- a/net/openvpn-polarssl/Makefile
+++ b/net/openvpn-polarssl/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2011 OpenWrt.org
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn-polarssl
 PKG_VERSION:=v2.2-RC2-345-g03ab4ea
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_RELEASE=$(PKG_SOURCE_VERSION)-2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_URL:=git://openvpn.git.sourceforge.net/gitroot/openvpn/openvpn.git
diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile
index c80c587e22..dd31fbdff7 100644
--- a/net/openvpn/Makefile
+++ b/net/openvpn/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openvpn
 PKG_VERSION:=2.2.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases @SF/openvpn
diff --git a/net/openvpn/files/openvpn.init b/net/openvpn/files/openvpn.init
index c5f3f95ca8..d114e8adc1 100644
--- a/net/openvpn/files/openvpn.init
+++ b/net/openvpn/files/openvpn.init
@@ -45,18 +45,6 @@ append_params() {
 	done
 }
 
-append_params_quoted() {
-	local p; local v; local s="$1"; shift
-	for p in $*; do
-		config_get v "$s" "$p"
-		IFS="$LIST_SEP"
-		for v in $v; do
-			[ -n "$v" ] && append_param "$p" && ARGS="$ARGS '$v'"
-		done
-		unset IFS
-	done
-}
-
 section_enabled() {
 	config_get_bool enable  "$1" 'enable'  0
 	config_get_bool enabled "$1" 'enabled' 0
@@ -101,11 +89,7 @@ start_instance() {
 		route_metric route_up rport script_security secret server server_bridge setenv shaper sndbuf \
 		socks_proxy status status_version syslog tcp_queue_limit tls_auth \
 		tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \
-		tun_mtu tun_mtu_extra txqueuelen user verb
-
-	# append multi-value params
-	append_params_quoted "$s" \
-		down push up
+		tun_mtu tun_mtu_extra txqueuelen user verb down push up
 
 
 	SERVICE_PID_FILE="/var/run/openvpn-$s.pid"