bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
jow 2012-02-25 14:32:21 +00:00
parent e9a5ecf1a3
commit ffd23dbbbc
4 changed files with 7 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/openvpn-devel/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn-devel PKG_NAME:=openvpn-devel
PKG_VERSION:=201120 PKG_VERSION:=201120
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=openvpn-$(PKG_VERSION).tar.gz PKG_SOURCE:=openvpn-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel \ PKG_SOURCE_URL:=ftp://ftp.secure-computing.net/pub/FreeBSD/ports/openvpn-devel \

4
net/openvpn-polarssl/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn-polarssl PKG_NAME:=openvpn-polarssl
PKG_VERSION:=v2.2-RC2-345-g03ab4ea 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:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://openvpn.git.sourceforge.net/gitroot/openvpn/openvpn.git PKG_SOURCE_URL:=git://openvpn.git.sourceforge.net/gitroot/openvpn/openvpn.git

4
net/openvpn/Makefile
View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=openvpn PKG_NAME:=openvpn
PKG_VERSION:=2.2.1 PKG_VERSION:=2.2.1
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases @SF/openvpn PKG_SOURCE_URL:=http://swupdate.openvpn.net/community/releases @SF/openvpn

18
net/openvpn/files/openvpn.init
View File

@ -45,18 +45,6 @@ append_params() {
done 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() { section_enabled() {
config_get_bool enable "$1" 'enable' 0 config_get_bool enable "$1" 'enable' 0
config_get_bool enabled "$1" 'enabled' 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 \ 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 \ socks_proxy status status_version syslog tcp_queue_limit tls_auth \
tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \ tls_cipher tls_remote tls_timeout tls_verify tmp_dir topology tran_window \
tun_mtu tun_mtu_extra txqueuelen user verb tun_mtu tun_mtu_extra txqueuelen user verb down push up
# append multi-value params
append_params_quoted "$s" \
down push up
SERVICE_PID_FILE="/var/run/openvpn-$s.pid" SERVICE_PID_FILE="/var/run/openvpn-$s.pid"