diff --git a/Makefile b/Makefile index e8f5067..f5c2a24 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openwrt-dist-luci PKG_VERSION:=1.3.8 -PKG_RELEASE:=1 +PKG_RELEASE:=7 PKG_LICENSE:=GPLv3 PKG_LICENSE_FILES:=LICENSE diff --git a/README.md b/README.md index 40c22c0..1b0f32e 100644 --- a/README.md +++ b/README.md @@ -32,11 +32,11 @@ APP 列表 tar xjf OpenWrt-SDK-ar71xx-for-linux-x86_64-gcc-4.8-linaro_uClibc-0.9.33.2.tar.bz2 cd OpenWrt-SDK-ar71xx-* # 获取 Makefile -git clone https://github.com/aa65535/openwrt-dist-luci.git package/openwrt-dist-luci +git clone -b shadowsocksR https://github.com/etnperlong/openwrt-dist-luci.git package/openwrt-dist-luci # 选择要编译的包 LuCI -> 3. Applications make menuconfig # 开始编译 -make V=99 +make -j4 V=99 ``` diff --git a/files/luci/i18n/shadowsocks.zh-cn.lmo b/files/luci/i18n/shadowsocks.zh-cn.lmo index 1f2169e..6704a1c 100644 Binary files a/files/luci/i18n/shadowsocks.zh-cn.lmo and b/files/luci/i18n/shadowsocks.zh-cn.lmo differ diff --git a/files/luci/i18n/shadowsocks.zh-cn.po b/files/luci/i18n/shadowsocks.zh-cn.po index d000f87..190f71f 100644 --- a/files/luci/i18n/shadowsocks.zh-cn.po +++ b/files/luci/i18n/shadowsocks.zh-cn.po @@ -1,8 +1,8 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8\n" -msgid "ShadowSocks" -msgstr "ShadowSocks" +msgid "ShadowSocksR" +msgstr "ShadowSocksR" msgid "Enable" msgstr "启用" @@ -13,8 +13,8 @@ msgstr "停用" msgid "ShadowSocksR is running" msgstr "ShadowSocksR 运行中" -msgid "ShadowSocks is not running" -msgstr "ShadowSocks 未运行" +msgid "ShadowSocksR is not running" +msgstr "ShadowSocksR 未运行" msgid "Global Setting" msgstr "全局设置" @@ -64,6 +64,9 @@ msgstr "传输协议" msgid "obfs" msgstr "混淆插件" +msgid "obfs_param(optional)" +msgstr "混淆参数(可选)" + msgid "UDP Forward" msgstr "UDP转发" diff --git a/files/luci/model/cbi/shadowsocks.lua b/files/luci/model/cbi/shadowsocks.lua index d384a10..83cadce 100644 --- a/files/luci/model/cbi/shadowsocks.lua +++ b/files/luci/model/cbi/shadowsocks.lua @@ -48,7 +48,7 @@ local protocol = { obfs = { "plain", "http_simple", - "tls1.0_session_auth", + "tls1.2_ticket_auth", } ipkg.list_installed("shadowsocks-libev-spec-polarssl", function(n, v, d) @@ -123,6 +123,8 @@ o = s:option(ListValue, "obfs", translate("obfs")) for _, v in ipairs(obfs) do o:value(v) end o.rmempty = false +o = s:option(Value, "obfs_param", translate("obfs_param(optional)")) + -- [[ UDP Forward ]]-- s = m:section(TypedSection, "udp_forward", translate("UDP Forward")) s.anonymous = true