[package] openvpn, openvpn-devel, openvpn-polarssl: remove special quoted parameter...

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.

git-svn-id: svn://svn.openwrt.org/openwrt/packages@30719 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/net/openvpn-devel/Makefile b/net/openvpn-devel/Makefile
index 44ca487..1c2e7fc 100644 (file)
--- 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 c5ebff2..f642a7b 100644 (file)
--- 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 c80c587..dd31fbd 100644 (file)
--- 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 c5f3f95..d114e8a 100644 (file)
--- 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"