From ba51b7ce5b9ebb8529466fd5b308d6c91bc3f73c Mon Sep 17 00:00:00 2001 From: etnperlong Date: Mon, 11 Jul 2016 17:27:41 +0800 Subject: [PATCH 1/8] Update shadowsocks.lua make tls1.2_ticket_auth option visible --- files/luci/model/cbi/shadowsocks.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/files/luci/model/cbi/shadowsocks.lua b/files/luci/model/cbi/shadowsocks.lua index d384a10..cdb1687 100644 --- a/files/luci/model/cbi/shadowsocks.lua +++ b/files/luci/model/cbi/shadowsocks.lua @@ -49,6 +49,7 @@ obfs = { "plain", "http_simple", "tls1.0_session_auth", + "tls1.2_ticket_auth", } ipkg.list_installed("shadowsocks-libev-spec-polarssl", function(n, v, d) From 4ad41484c31bfd53c9e925c1c64f94cf08b6cbda Mon Sep 17 00:00:00 2001 From: etnperlong Date: Mon, 11 Jul 2016 17:47:35 +0800 Subject: [PATCH 2/8] Update README.md renew README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ``` From fc78394c55decdc8de374c386be46487e46fd70b Mon Sep 17 00:00:00 2001 From: etnerlong Date: Sat, 16 Jul 2016 10:49:15 +0800 Subject: [PATCH 3/8] Fix obfs_param and renew Makefile(Testing...) Signed-off-by: etnerlong --- Makefile | 8 ++++++-- files/luci/i18n/chinadns.zh-cn.lmo | Bin 376 -> 0 bytes files/luci/i18n/redsocks2.zh-cn.lmo | Bin 320 -> 0 bytes files/luci/i18n/shadowsocks.zh-cn.lmo | Bin 1132 -> 0 bytes files/luci/i18n/shadowsocks.zh-cn.po | 5 ++++- files/luci/i18n/shadowvpn.zh-cn.lmo | Bin 572 -> 0 bytes files/luci/model/cbi/shadowsocks.lua | 2 ++ 7 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 files/luci/i18n/chinadns.zh-cn.lmo delete mode 100644 files/luci/i18n/redsocks2.zh-cn.lmo delete mode 100644 files/luci/i18n/shadowsocks.zh-cn.lmo delete mode 100644 files/luci/i18n/shadowvpn.zh-cn.lmo diff --git a/Makefile b/Makefile index e8f5067..946a02f 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 @@ -18,6 +18,9 @@ PKG_MAINTAINER:=Jian Chang PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +# Compile PO2LMO +PO2LMO:=$(BUILD_DIR)/luci/tools/po2lmo + include $(INCLUDE_DIR)/package.mk define Package/openwrt-dist-luci/Default @@ -70,7 +73,8 @@ define Package/openwrt-dist-luci/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller $(INSTALL_DATA) ./files/luci/controller/$(2).lua $(1)/usr/lib/lua/luci/controller/$(2).lua $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - $(INSTALL_DATA) ./files/luci/i18n/$(2).*.lmo $(1)/usr/lib/lua/luci/i18n + ## $(INSTALL_DATA) ./files/luci/i18n/$(2).*.lmo $(1)/usr/lib/lua/luci/i18n + $(PO2LMO) ./files/luci/i18n/$(2).*.po $(1)/usr/lib/lua/luci/i18n/$(2).*.lmo $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi $(INSTALL_DATA) ./files/luci/model/cbi/$(2).lua $(1)/usr/lib/lua/luci/model/cbi/$(2).lua $(INSTALL_DIR) $(1)/etc/uci-defaults diff --git a/files/luci/i18n/chinadns.zh-cn.lmo b/files/luci/i18n/chinadns.zh-cn.lmo deleted file mode 100644 index 71fe3eb3e851a8a2ecf7f2b5c7bffe5ffcfaea5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmZ?H$jnQ0@e5XXv46sgg*{JptYu(uhKW6!vkD^2!0>ebu4i-ByjZvI`QCL;C#-)y zWd%?SOh4`Kc{*X@i~a4-b}s>m^*o!t4Z?e}yYK1jy-$}+1DgM0|CFb*=RKd*;u-K{ z$1ad?TPu+FeD~yM^X4!xFaQmII%mW4)$5=3FNVmz*bcO1Fw++ps@i! zY-;?sq+r`gR~sN(1BiJNY<9IU=RDdEWP`+nk}GAd9p5i(2V{$Y_!Wl)qW7|^fcPdr z%r?_)TWG-hUsr)_pbr`NXL&D_^uKFs2xLzI@fU1bv|!5lUv)q>2na1+c`<%F2S-;)%$lAH<*8|yGfLH;DuK)ln2(=Rc diff --git a/files/luci/i18n/redsocks2.zh-cn.lmo b/files/luci/i18n/redsocks2.zh-cn.lmo deleted file mode 100644 index c4b764fe0965219e10734aa217642b1377e799a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmWGaO$p9V&Mr1mc(H%Ni-kQ;cC2Lxf{Q(yvkD^2@O1vJXLHuPShw%_-gQqWtbaab z1p~wLWsP7ODDia8hUcr-KkZ-qWcT9d6WX3{-2HT3H-xR=8Nk5602K$TdC|V=Y1fLU z9ZQ}~Tl;)%=hJxnz!_65|AAO#GK|@$M<~P zk@_9T1_5FJ;>DMy_a3Z4#+kEVz$LAF9t5S^m`kS?E;ct`rKjX zj*3;2fb0?w|8Sa!mK@Kgl|Z%#5DTBby2E+_>y=U7ZVVrT=V zr3Hb?yt-CO_-J?QXIp4X$^MvRA!E*EVNv+Ud+xoJ2qu~s12I0wOR(9Ryy^2h&--=G zrB;vB(oG1h<=*`llpQP8{aBzYIZ<^$D~GMJ!zB2BAtdTtD{{SxLr`bvrnmGmKOlv8 zMT?x7UUJa(?%AGEmB=s5%11vb(Dgoz2>!!U%75VXq!m#Ntz^StQui9VxfX%+%r>@J7g)Y7EfBf2HKm*UONm-%qS#*2+zwBCzh zSV6m1`}K}I`G$*zLsDz!-h5hblO1?^BDJ75GVNimA4QA9g@{Zc9k8kJeHML zAp7v0ZYlYZ8`r3_Evggy4#9p*lJDJA>h|X2Y;JDOjy!5KNTH_at?+&U12xpjykFS_ zDgQrnwxRdCTEQO>ISiRyI<9!~;Xg&!35iLN43yL5D7=(bgGv>Jx_*T z2VU~clzY5=w88|<_DQL(I#9MS{XsVTA(mhL>!QPMs$Fs5yWj-xba6@cA7?*+ zX7~9x%wNs+b9y!`9g+NK(-Nm{JoP;Ee1wV))R=Zp#cV@;2Kd8>t>KgJ9k1DYyAcat fnQOKe*Cl2`k0LbFJF841$7g)Vw}TV#9k#p$Aztsp diff --git a/files/luci/i18n/shadowsocks.zh-cn.po b/files/luci/i18n/shadowsocks.zh-cn.po index d000f87..74413e7 100644 --- a/files/luci/i18n/shadowsocks.zh-cn.po +++ b/files/luci/i18n/shadowsocks.zh-cn.po @@ -14,7 +14,7 @@ msgid "ShadowSocksR is running" msgstr "ShadowSocksR 运行中" msgid "ShadowSocks is not running" -msgstr "ShadowSocks 未运行" +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/i18n/shadowvpn.zh-cn.lmo b/files/luci/i18n/shadowvpn.zh-cn.lmo deleted file mode 100644 index 4301ce73bc277399dd039297b5fc3d5d3722abb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 572 zcmWH}NKDBu4-4>9c(H%Ni-kQ;cC2LxhKoI$vkD^2@O1vJXLHuPShw%_-gQqWtbaab z1p~vgIlWK27CxQ1;^~|XPv>W=h^Z?CU12TE-gy(xFLTvU8 z31tA<+qV>G{L=}&&zEm_u^s4^jSyJ~``LR*39VAbZI) zs4lSHXVcoB?B2%tc=L;f52qgijRyf?DTa$tN4lf5f$TXz%%hPV7TI3YBLHMS0r8Fh zmK1C|>1qRHYk>Hc1}2ZPcN8fD*#|&;?{y9gN9@WJfb26MeuP+QlY^{)7?Aw|#80(| zOP;`WWHylf2gI*9BoMuqUBwQ_HUVO`S|u&%^wfr#K(+`F3wQc_;N2{|4rCU{PX7K$ zolB~ZiA@EvGk} Date: Sat, 16 Jul 2016 11:13:17 +0800 Subject: [PATCH 4/8] Renew Makefile(Testing 2) Signed-off-by: etnerlong --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 946a02f..c180d7c 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ PKG_MAINTAINER:=Jian Chang PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) # Compile PO2LMO -PO2LMO:=$(BUILD_DIR)/luci/tools/po2lmo +PO2LMO:=./file/luci/tools/po2lmo include $(INCLUDE_DIR)/package.mk From 9b54478fbd4d965d548be416dbcf5ccd61c783a4 Mon Sep 17 00:00:00 2001 From: etnerlong Date: Sat, 16 Jul 2016 11:21:00 +0800 Subject: [PATCH 5/8] Fang Qi Zheng Zha QAQ >_< Signed-off-by: etnerlong --- Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Makefile b/Makefile index c180d7c..f5c2a24 100644 --- a/Makefile +++ b/Makefile @@ -18,9 +18,6 @@ PKG_MAINTAINER:=Jian Chang PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -# Compile PO2LMO -PO2LMO:=./file/luci/tools/po2lmo - include $(INCLUDE_DIR)/package.mk define Package/openwrt-dist-luci/Default @@ -73,8 +70,7 @@ define Package/openwrt-dist-luci/install $(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller $(INSTALL_DATA) ./files/luci/controller/$(2).lua $(1)/usr/lib/lua/luci/controller/$(2).lua $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - ## $(INSTALL_DATA) ./files/luci/i18n/$(2).*.lmo $(1)/usr/lib/lua/luci/i18n - $(PO2LMO) ./files/luci/i18n/$(2).*.po $(1)/usr/lib/lua/luci/i18n/$(2).*.lmo + $(INSTALL_DATA) ./files/luci/i18n/$(2).*.lmo $(1)/usr/lib/lua/luci/i18n $(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi $(INSTALL_DATA) ./files/luci/model/cbi/$(2).lua $(1)/usr/lib/lua/luci/model/cbi/$(2).lua $(INSTALL_DIR) $(1)/etc/uci-defaults From 3fa43578a1dd57074c1994ffd4c10b97122be3ef Mon Sep 17 00:00:00 2001 From: etnerlong Date: Sat, 16 Jul 2016 11:36:57 +0800 Subject: [PATCH 6/8] generated lmo i18n files may be athe final version Signed-off-by: etnerlong --- files/luci/i18n/chinadns.zh-cn.lmo | Bin 0 -> 376 bytes files/luci/i18n/redsocks2.zh-cn.lmo | Bin 0 -> 320 bytes files/luci/i18n/shadowsocks.zh-cn.lmo | Bin 0 -> 1168 bytes files/luci/i18n/shadowvpn.zh-cn.lmo | Bin 0 -> 572 bytes 4 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 files/luci/i18n/chinadns.zh-cn.lmo create mode 100644 files/luci/i18n/redsocks2.zh-cn.lmo create mode 100644 files/luci/i18n/shadowsocks.zh-cn.lmo create mode 100644 files/luci/i18n/shadowvpn.zh-cn.lmo diff --git a/files/luci/i18n/chinadns.zh-cn.lmo b/files/luci/i18n/chinadns.zh-cn.lmo new file mode 100644 index 0000000000000000000000000000000000000000..71fe3eb3e851a8a2ecf7f2b5c7bffe5ffcfaea5d GIT binary patch literal 376 zcmZ?H$jnQ0@e5XXv46sgg*{JptYu(uhKW6!vkD^2!0>ebu4i-ByjZvI`QCL;C#-)y zWd%?SOh4`Kc{*X@i~a4-b}s>m^*o!t4Z?e}yYK1jy-$}+1DgM0|CFb*=RKd*;u-K{ z$1ad?TPu+FeD~yM^X4!xFaQmII%mW4)$5=3FNVmz*bcO1Fw++ps@i! zY-;?sq+r`gR~sN(1BiJNY<9IU=RDdEWP`+nk}GAd9p5i(2V{$Y_!Wl)qW7|^fcPdr z%r?_)TWG-hUsr)_pbr`NXL&D_^uKFs2xLzI@fU1bv|!5lUv)q>2na1+c`<%F2S-;)%$lAH<*8|yGfLH;DuK)ln2(=Rc literal 0 HcmV?d00001 diff --git a/files/luci/i18n/redsocks2.zh-cn.lmo b/files/luci/i18n/redsocks2.zh-cn.lmo new file mode 100644 index 0000000000000000000000000000000000000000..c4b764fe0965219e10734aa217642b1377e799a6 GIT binary patch literal 320 zcmWGaO$p9V&Mr1mc(H%Ni-kQ;cC2Lxf{Q(yvkD^2@O1vJXLHuPShw%_-gQqWtbaab z1p~wLWsP7ODDia8hUcr-KkZ-qWcT9d6WX3{-2HT3H-xR=8Nk5602K$TdC|V=Y1fLU z9ZQ}~Tl;)%=hJxnz!_65|AAO#GK|@$M<~P zk@_9T1_5FJ;>DMy_a3Z4#+kEVz$LAF9t5S^m`kS?E;ct`rKjX zj*3;2fb0?w|8Sa!mK@Kgl|Z%#5DTBby2E+_>y=UF9L5h2>r09iMJ8&r8dP-XqQ>d6MN#pCSO`jt@eQX;gAuLDqFrzc7}@}7 zxdnlWR&AvOu=N(-`a)Yu_F1SOm_3Kf7}F;I^!c6V|8~x$ zRSqR)D%Re z64aH69%t-^S@xEXC~#pHZ~=sMjPp%5jfs2c*~- zq+w17JLIkl)WXR;FZ%tW-z0K%Ldd6R%AFS*I{w`P_mLwW%GD}&8$X8KRq;l5lKE)N z#)~zrw9(l6WxOg{{LKS>nm|Z=8hHBZoPpE*_fs|S_klHQ4L>bAE`lkmj&6lhg&Vh~_X1wjqy_NB&UY>x~Av8G?kMwlU<5wbo8uPbTw7<9(+^>aZ{gd`3 z=vD774bDXUMev*h1D?L7-s5IymY-rM*-$JU*iD~Ph*-v%;t8KyE zzM*3H2%XR!`{9`h&=rVTQT}rFFY0f*q09c(H%Ni-kQ;cC2LxhKoI$vkD^2@O1vJXLHuPShw%_-gQqWtbaab z1p~vgIlWK27CxQ1;^~|XPv>W=h^Z?CU12TE-gy(xFLTvU8 z31tA<+qV>G{L=}&&zEm_u^s4^jSyJ~``LR*39VAbZI) zs4lSHXVcoB?B2%tc=L;f52qgijRyf?DTa$tN4lf5f$TXz%%hPV7TI3YBLHMS0r8Fh zmK1C|>1qRHYk>Hc1}2ZPcN8fD*#|&;?{y9gN9@WJfb26MeuP+QlY^{)7?Aw|#80(| zOP;`WWHylf2gI*9BoMuqUBwQ_HUVO`S|u&%^wfr#K(+`F3wQc_;N2{|4rCU{PX7K$ zolB~ZiA@EvGk} Date: Sat, 16 Jul 2016 11:56:58 +0800 Subject: [PATCH 7/8] OK I fixed the i18n QAQ Signed-off-by: etnerlong --- files/luci/i18n/shadowsocks.zh-cn.lmo | Bin 1168 -> 1168 bytes files/luci/i18n/shadowsocks.zh-cn.po | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/files/luci/i18n/shadowsocks.zh-cn.lmo b/files/luci/i18n/shadowsocks.zh-cn.lmo index 8c25b26c1796dc6513e7a1880dbd08608d2b19d9..6704a1c5f66d241e868d495f238b6707947874d2 100644 GIT binary patch delta 43 vcmbQhIe~M7EQ|cHgJ{M7t;$$ diff --git a/files/luci/i18n/shadowsocks.zh-cn.po b/files/luci/i18n/shadowsocks.zh-cn.po index 74413e7..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,7 +13,7 @@ msgstr "停用" msgid "ShadowSocksR is running" msgstr "ShadowSocksR 运行中" -msgid "ShadowSocks is not running" +msgid "ShadowSocksR is not running" msgstr "ShadowSocksR 未运行" msgid "Global Setting" From ed1e9218539912d187c31364dd2d698175df20cf Mon Sep 17 00:00:00 2001 From: etnerlong Date: Sun, 21 Aug 2016 01:07:14 +0800 Subject: [PATCH 8/8] remove depreciated tls1.0_session_auth Signed-off-by: etnerlong --- files/luci/model/cbi/shadowsocks.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/files/luci/model/cbi/shadowsocks.lua b/files/luci/model/cbi/shadowsocks.lua index 2a25a28..83cadce 100644 --- a/files/luci/model/cbi/shadowsocks.lua +++ b/files/luci/model/cbi/shadowsocks.lua @@ -48,7 +48,6 @@ local protocol = { obfs = { "plain", "http_simple", - "tls1.0_session_auth", "tls1.2_ticket_auth", }