diff --git a/package/lean/luci-app-turboacc/Makefile b/package/ctcgfw/luci-app-turboacc/Makefile similarity index 100% rename from package/lean/luci-app-turboacc/Makefile rename to package/ctcgfw/luci-app-turboacc/Makefile diff --git a/package/lean/luci-app-turboacc/luasrc/controller/turboacc.lua b/package/ctcgfw/luci-app-turboacc/luasrc/controller/turboacc.lua similarity index 100% rename from package/lean/luci-app-turboacc/luasrc/controller/turboacc.lua rename to package/ctcgfw/luci-app-turboacc/luasrc/controller/turboacc.lua diff --git a/package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua b/package/ctcgfw/luci-app-turboacc/luasrc/model/cbi/turboacc.lua similarity index 100% rename from package/lean/luci-app-turboacc/luasrc/model/cbi/turboacc.lua rename to package/ctcgfw/luci-app-turboacc/luasrc/model/cbi/turboacc.lua diff --git a/package/lean/luci-app-turboacc/luasrc/view/turboacc/status.htm b/package/ctcgfw/luci-app-turboacc/luasrc/view/turboacc/status.htm similarity index 100% rename from package/lean/luci-app-turboacc/luasrc/view/turboacc/status.htm rename to package/ctcgfw/luci-app-turboacc/luasrc/view/turboacc/status.htm diff --git a/package/lean/luci-app-turboacc/po/zh-cn/turboacc.po b/package/ctcgfw/luci-app-turboacc/po/zh-cn/turboacc.po similarity index 100% rename from package/lean/luci-app-turboacc/po/zh-cn/turboacc.po rename to package/ctcgfw/luci-app-turboacc/po/zh-cn/turboacc.po diff --git a/package/lean/luci-app-turboacc/root/etc/config/turboacc b/package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc similarity index 100% rename from package/lean/luci-app-turboacc/root/etc/config/turboacc rename to package/ctcgfw/luci-app-turboacc/root/etc/config/turboacc diff --git a/package/lean/luci-app-turboacc/root/etc/init.d/turboacc b/package/ctcgfw/luci-app-turboacc/root/etc/init.d/turboacc similarity index 100% rename from package/lean/luci-app-turboacc/root/etc/init.d/turboacc rename to package/ctcgfw/luci-app-turboacc/root/etc/init.d/turboacc diff --git a/package/lean/luci-app-turboacc/root/etc/uci-defaults/turboacc b/package/ctcgfw/luci-app-turboacc/root/etc/uci-defaults/turboacc similarity index 100% rename from package/lean/luci-app-turboacc/root/etc/uci-defaults/turboacc rename to package/ctcgfw/luci-app-turboacc/root/etc/uci-defaults/turboacc diff --git a/package/lean/luci-app-turboacc/root/usr/share/dnscache/dnscache-while.sh b/package/ctcgfw/luci-app-turboacc/root/usr/share/dnscache/dnscache-while.sh similarity index 100% rename from package/lean/luci-app-turboacc/root/usr/share/dnscache/dnscache-while.sh rename to package/ctcgfw/luci-app-turboacc/root/usr/share/dnscache/dnscache-while.sh diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile index 7e08b05bf9..f7e847c898 100644 --- a/package/lean/luci-app-unblockmusic/Makefile +++ b/package/lean/luci-app-unblockmusic/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockmusic PKG_VERSION:=2.3.5 -PKG_RELEASE:=9 +PKG_RELEASE:=10 PKG_CONFIG_DEPENDS := \ CONFIG_UnblockNeteaseMusic_Go \ diff --git a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua index 55a50b29a9..265a1bd6b9 100644 --- a/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua +++ b/package/lean/luci-app-unblockmusic/luasrc/model/cbi/unblockmusic.lua @@ -39,13 +39,16 @@ speedtype:depends("apptype", "go") cloudserver = s:option(Value, "cloudserver", translate("服务器位置")) cloudserver:value("cdn-shanghai.service.project-openwrt.eu.org:30000:30001", translate("[CTCGFW] 腾讯云上海（高音质）")) -cloudserver:value("hyird.xyz:30000:30001", translate("[hyird] 阿里云北京（高音质）")) -cloudserver:value("39.96.56.58:30000:30000", translate("[Sunsky] 阿里云北京（高音质）")) cloudserver.description = translate("自定义服务器格式为 IP[域名]:HTTP端口:HTTPS端口
如果服务器为LAN内网IP，需要将这个服务器IP放入例外客户端 (不代理HTTP和HTTPS)") cloudserver.default = "cdn-shanghai.service.project-openwrt.eu.org:30000:30001" cloudserver.rmempty = true cloudserver:depends("apptype", "cloud") +search_limit = s:option(Value, "search_limit", translate("搜索结果限制")) +search_limit.description = translate("在搜索页面显示其他平台搜索结果个数，可填（0-3）") +search_limit.default = "0" +search_limit:depends("apptype", "go") + flac = s:option(Flag, "flac_enabled", translate("启用无损音质")) flac.default = "1" flac.rmempty = false diff --git a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic index 24612c0d94..9d7a11cfe7 100755 --- a/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic +++ b/package/lean/luci-app-unblockmusic/root/etc/init.d/unblockmusic @@ -65,6 +65,7 @@ ENABLE=$(uci_get_by_type unblockmusic enabled 0) TYPE=$(uci_get_by_type unblockmusic musicapptype default) AUTOUPDATE=$(uci_get_by_type unblockmusic autoupdate 0) APPTYPE=$(uci_get_by_type unblockmusic apptype go) +SEARCHLIMIT=$(uci_get_by_type unblockmusic search_limit 0) FLAC=$(uci_get_by_type unblockmusic flac_enabled 0) FORCE=$(uci_get_by_type unblockmusic force_enabled 0) @@ -187,7 +188,7 @@ start() if [ $FLAC -eq 1 ]; then ENABLE_FLAC="-b " fi - UnblockNeteaseMusic $ENABLE_FLAC -p 5200 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e >>/tmp/unblockmusic.log 2>&1 & + UnblockNeteaseMusic $ENABLE_FLAC -p 5200 -sp 5201 -m 0 -c /usr/share/UnblockNeteaseMusicGo/server.crt -k /usr/share/UnblockNeteaseMusicGo/server.key -m 0 -e -sl ${SEARCHLIMIT} -l /tmp/unblockmusic.log & echo "$(date -R) # UnblockNeteaseMusic Golang Version (http:5200, https:5201)" >>/tmp/unblockmusic.log else kill -9 $(busybox ps -w | grep 'sleep 60m' | grep -v grep | awk '{print $1}') >/dev/null 2>&1 diff --git a/package/lean/luci-app-vlmcsd/root/etc/uci-defaults/luci-app-vlmcsd b/package/lean/luci-app-vlmcsd/root/etc/uci-defaults/luci-app-vlmcsd index d28b2ec9f8..4820aef8b2 100755 --- a/package/lean/luci-app-vlmcsd/root/etc/uci-defaults/luci-app-vlmcsd +++ b/package/lean/luci-app-vlmcsd/root/etc/uci-defaults/luci-app-vlmcsd @@ -7,15 +7,5 @@ uci -q batch <<-EOF >/dev/null commit ucitrack EOF -uci delete firewall.kms -uci add firewall rule -uci rename firewall.@rule[-1]="kms" -uci set firewall.@rule[-1].name="kms" -uci set firewall.@rule[-1].target="ACCEPT" -uci set firewall.@rule[-1].src="wan" -uci set firewall.@rule[-1].proto="tcp" -uci set firewall.@rule[-1].dest_port="1688" -uci commit firewall - rm -f /tmp/luci-indexcache exit 0 diff --git a/package/lean/shadowsocksr-libev/Makefile b/package/lean/shadowsocksr-libev/Makefile index 501638e03a..7437956a03 100644 --- a/package/lean/shadowsocksr-libev/Makefile +++ b/package/lean/shadowsocksr-libev/Makefile @@ -28,14 +28,17 @@ define Package/shadowsocksr-libev SUBMENU:=Web Servers/Proxies TITLE:=Lightweight Secured Socks5 Proxy URL:=https://github.com/shadowsocksrr/shadowsocksr-libev - DEPENDS:=+libopenssl +libpthread +libpcre +zlib + DEPENDS:=+libev +libsodium +libopenssl +libpthread +libpcre +libudns +zlib endef Package/shadowsocksr-libev-server = $(Package/shadowsocksr-libev) Package/shadowsocksr-libev-alt = $(Package/shadowsocksr-libev) Package/shadowsocksr-libev-ssr-local = $(Package/shadowsocksr-libev) -CONFIGURE_ARGS += --disable-documentation --disable-ssp --disable-assert +CONFIGURE_ARGS += --disable-documentation --disable-ssp --disable-assert \ + --enable-system-shared-lib + +TARGET_CFLAGS += -flto TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed define Package/shadowsocksr-libev/install diff --git a/package/lean/vlmcsd/files/vlmcsd.init b/package/lean/vlmcsd/files/vlmcsd.init index fe628d708a..f6e07d3a80 100755 --- a/package/lean/vlmcsd/files/vlmcsd.init +++ b/package/lean/vlmcsd/files/vlmcsd.init @@ -6,10 +6,6 @@ START=90 start(){ if [ ! -f "/tmp/vlmcsd.pid" ]; then /usr/bin/vlmcsd -i /etc/vlmcsd.ini -p /tmp/vlmcsd.pid -L 0.0.0.0:1688 - iptables -D input_rule -p tcp --dport 1688 -j ACCEPT - iptables -A input_rule -p tcp --dport 1688 -j ACCEPT - sed -i '/## luci-app-vlmcsd/d' /etc/firewall.user - echo "iptables -A input_rule -p tcp --dport 1688 -j ACCEPT ## luci-app-vlmcsd" >> /etc/firewall.user echo "KMS Server has started." else echo "KMS Server has already started." @@ -23,8 +19,6 @@ stop(){ pid=`cat /tmp/vlmcsd.pid` kill $pid rm -f /tmp/vlmcsd.pid - iptables -D input_rule -p tcp --dport 1688 -j ACCEPT - sed -i '/## luci-app-vlmcsd/d' /etc/firewall.user echo "KMS Server has stopped." fi } diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index f0734615f2..5aa2339957 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -1213,7 +1213,7 @@ define Device/youku_yk-l2 IMAGE_SIZE := 16064k DEVICE_VENDOR := Youku DEVICE_MODEL := YK-L2 - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ + DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 kmod-sdhci-mt7620 \ kmod-usb-ledtrig-usbport endef TARGET_DEVICES += youku_yk-l2