From ef2a2962e19751998258a7962e9c2d1556a33308 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 4 Jan 2018 14:33:47 +0800 Subject: [PATCH] shadowsocks-libev: remove option manager_address It's an option that is supposed to be fed by ss-manager. It can be in the form of host:port or path to unix dgram socket. Drop it now with the assumption that it has no real user at the moment Signed-off-by: Yousong Zhou --- net/shadowsocks-libev/Makefile | 2 +- net/shadowsocks-libev/files/shadowsocks-libev.init | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index d85887f156..26dd782a69 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.1.2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 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 3ff54ddf46..7564f348e3 100644 --- a/net/shadowsocks-libev/files/shadowsocks-libev.init +++ b/net/shadowsocks-libev/files/shadowsocks-libev.init @@ -117,7 +117,6 @@ ss_xxx() { [ "$verbose" = 0 ] || procd_append_param command -v [ "$no_delay" = 0 ] || procd_append_param command --no-delay [ -z "$bind_address" ] || procd_append_param command -b "$bind_address" - [ -z "$manager_address" ] || procd_append_param command --manager-address "$manager_address" procd_set_param file "$confjson" procd_set_param respawn procd_close_instance @@ -306,8 +305,7 @@ validate_ss_server_section() { validate_common_server_options_ ss_server "$1" \ validate_common_options_ \ "${2}" \ - 'bind_address:ipaddr' \ - 'manager_address:host' + 'bind_address:ipaddr' } validate_ss_tunnel_section() {