From: Yousong Zhou <redacted>
Date: Mon, 24 Jul 2017 05:08:58 +0000 (+0800)
Subject: shadowsocks-libev: fix cases where passwords contain dquote
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=57114609c458980bd710637a097b1df053407aff;p=openwrt-packages.git

shadowsocks-libev: fix cases where passwords contain dquote

Signed-off-by: Yousong Zhou <redacted>
---

diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index b36d9a3a8..cd1bbe058 100644
--- a/net/shadowsocks-libev/Makefile
+++ b/net/shadowsocks-libev/Makefile
@@ -19,7 +19,7 @@ include $(TOPDIR)/rules.mk
 #
 PKG_NAME:=shadowsocks-libev
 PKG_VERSION:=3.0.6
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION)
diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init
index f59b74955..f4887d307 100644
--- a/net/shadowsocks-libev/files/shadowsocks-libev.init
+++ b/net/shadowsocks-libev/files/shadowsocks-libev.init
@@ -47,6 +47,7 @@ ss_mkjson_server_conf() {
 
 ss_mkjson_server_conf_() {
 	[ -n "$server_port" ] || return 1
+	password="${password//\"/\\\"}"
 	cat <<-EOF
 		${server:+${q}server${q}: ${q}$server${q},}
 		"server_port": $server_port,