Skip to content

Commit 610721a

Browse files
coolsnowwolfcoolsnowwolf
committed
Version update to R9.7.6
1 parent c3eb916 commit 610721a

40 files changed

+18068
-3
lines changed

‎include/target.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ DEVICE_TYPE?=router
1616
DEFAULT_PACKAGES:=base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd block-mount coremark \
1717
kmod-nf-nathelper kmod-nf-nathelper-extra kmod-ipt-raw wget libustream-openssl ca-certificates \
1818
default-settings luci luci-app-ddns luci-app-sqm luci-app-upnp luci-app-adbyby-plus luci-app-autoreboot \
19-
luci-app-filetransfer luci-app-vsftpd ddns-scripts_aliyun \
19+
luci-app-filetransfer luci-app-vsftpd ddns-scripts_aliyun luci-app-ssr-plus \
2020
luci-app-pptp-server luci-app-arpbind luci-app-vlmcsd luci-app-wifischedule luci-app-wol luci-app-ramfree \
2121
luci-app-sfe luci-app-flowoffload luci-app-nlbwmon luci-app-usb-printer luci-app-accesscontrol luci-app-zerotier luci-app-xlnetacc
2222
# For nas targets

‎package/lean/default-settings/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=default-settings
1010
PKG_VERSION:=1.1
11-
PKG_RELEASE:=41
11+
PKG_RELEASE:=42
1212
PKG_LICENSE:=GPLv3
1313
PKG_LICENSE_FILES:=LICENSE
1414

‎package/lean/default-settings/files/zzz-default-settings

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
5555
wifi up
5656

5757
sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
58-
echo "DISTRIB_REVISION='R9.6.19'" >> /etc/openwrt_release
58+
echo "DISTRIB_REVISION='R9.7.6'" >> /etc/openwrt_release
5959
sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
6060
echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
6161

‎package/lean/luci-app-ssr-plus/Makefile

+86
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
include $(TOPDIR)/rules.mk
2+
3+
PKG_NAME:=luci-app-ssr-plus
4+
PKG_VERSION:=1
5+
PKG_RELEASE:=96
6+
7+
PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
8+
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
9+
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun \
10+
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server \
11+
CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks
12+
13+
include $(INCLUDE_DIR)/package.mk
14+
15+
define Package/$(PKG_NAME)/config
16+
config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks
17+
bool "Include Shadowsocks New Version"
18+
default n
19+
20+
config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
21+
bool "Include V2ray"
22+
default n
23+
24+
config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
25+
bool "Include Kcptun"
26+
default n
27+
28+
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server
29+
bool "Include ShadowsocksR Server"
30+
default n
31+
32+
config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks
33+
bool "Include ShadowsocksR Socks and Tunnel"
34+
default n
35+
endef
36+
37+
define Package/luci-app-ssr-plus
38+
SECTION:=luci
39+
CATEGORY:=LuCI
40+
SUBMENU:=3. Applications
41+
TITLE:=SS/SSR/V2Ray LuCI interface
42+
PKGARCH:=all
43+
DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget \
44+
+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks:shadowsocks-libev-ss-redir \
45+
+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
46+
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
47+
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Server:shadowsocksr-libev-server \
48+
+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Socks:shadowsocksr-libev-ssr-local
49+
endef
50+
51+
define Build/Prepare
52+
endef
53+
54+
define Build/Compile
55+
endef
56+
57+
define Package/luci-app-ssr-plus/install
58+
$(INSTALL_DIR) $(1)/usr/lib/lua/luci
59+
cp -pR ./luasrc/* $(1)/usr/lib/lua/luci
60+
$(INSTALL_DIR) $(1)/
61+
cp -pR ./root/* $(1)/
62+
$(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n
63+
po2lmo ./po/zh-cn/ssr-plus.po $(1)/usr/lib/lua/luci/i18n/ssr-plus.zh-cn.lmo
64+
endef
65+
66+
define Package/luci-app-ssr-plus/postinst
67+
#!/bin/sh
68+
if [ -z "$${IPKG_INSTROOT}" ]; then
69+
( . /etc/uci-defaults/luci-ssr-plus ) && rm -f /etc/uci-defaults/luci-ssr-plus
70+
rm -f /tmp/luci-indexcache
71+
chmod 755 /etc/init.d/shadowsocksr >/dev/null 2>&1
72+
/etc/init.d/shadowsocksr enable >/dev/null 2>&1
73+
fi
74+
exit 0
75+
endef
76+
77+
define Package/luci-app-ssr-plus/prerm
78+
#!/bin/sh
79+
if [ -z "$${IPKG_INSTROOT}" ]; then
80+
/etc/init.d/shadowsocksr disable
81+
/etc/init.d/shadowsocksr stop
82+
fi
83+
exit 0
84+
endef
85+
86+
$(eval $(call BuildPackage,luci-app-ssr-plus))

‎package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua

6.51 KB
Binary file not shown.

‎package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua

+59
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
local shadowsocksr = "shadowsocksr"
2+
local uci = luci.model.uci.cursor()
3+
local server_table = {}
4+
5+
uci:foreach(shadowsocksr, "servers", function(s)
6+
if s.alias then
7+
server_table[s[".name"]] = "[%s]:%s" %{string.upper(s.type), s.alias}
8+
elseif s.server and s.server_port then
9+
server_table[s[".name"]] = "[%s]:%s:%s" %{string.upper(s.type), s.server, s.server_port}
10+
end
11+
end)
12+
13+
local key_table = {}
14+
for key,_ in pairs(server_table) do
15+
table.insert(key_table,key)
16+
end
17+
18+
table.sort(key_table)
19+
20+
m = Map(shadowsocksr)
21+
22+
s = m:section(TypedSection, "global", translate("Server failsafe auto swith settings"))
23+
s.anonymous = true
24+
25+
o = s:option(Flag, "monitor_enable", translate("Enable Process Deamon"))
26+
o.rmempty = false
27+
28+
o = s:option(Flag, "enable_switch", translate("Enable Auto Switch"))
29+
o.rmempty = false
30+
31+
o = s:option(Value, "switch_time", translate("Switch check cycly(second)"))
32+
o.datatype = "uinteger"
33+
o:depends("enable_switch", "1")
34+
o.default = 3600
35+
36+
o = s:option(Value, "switch_timeout", translate("Check timout(second)"))
37+
o.datatype = "uinteger"
38+
o:depends("enable_switch", "1")
39+
o.default = 5
40+
41+
-- [[ SOCKS5 Proxy ]]--
42+
if nixio.fs.access("/usr/bin/ssr-local") then
43+
s = m:section(TypedSection, "socks5_proxy", translate("SOCKS5 Proxy"))
44+
s.anonymous = true
45+
46+
o = s:option(ListValue, "server", translate("Server"))
47+
o:value("nil", translate("Disable"))
48+
for _,key in pairs(key_table) do o:value(key,server_table[key]) end
49+
o.default = "nil"
50+
o.rmempty = false
51+
52+
o = s:option(Value, "local_port", translate("Local Port"))
53+
o.datatype = "port"
54+
o.default = 1080
55+
o.rmempty = false
56+
57+
end
58+
59+
return m

0 commit comments

Comments
 (0)