同步源码于2024年08月12号-07点21分

luci-app-openvpn-client/root/etc/init.d/luci-app-openvpn-client

@@ -104,6 +104,9 @@ start_instance() {
 
 	echo "#!/bin/sh" > ${TMP_OVPN_PATH}/${cfgid}/up.sh
 	echo "#!/bin/sh" > ${TMP_OVPN_PATH}/${cfgid}/down.sh
+	echo "#!/bin/sh" > ${TMP_OVPN_PATH}/${cfgid}/ipchange.sh
+	echo "#!/bin/sh" > ${TMP_OVPN_PATH}/${cfgid}/tls-verify.sh
+	echo "#!/bin/sh" > ${TMP_OVPN_PATH}/${cfgid}/route-up.sh
 	[ ! -s "/var/etc/${CONFIG}.include" ] && echo '#!/bin/sh' > /var/etc/${CONFIG}.include
 
 	cat <<-EOF >> ${TMP_OVPN_PATH}/${cfgid}/up.sh
@@ -126,11 +129,11 @@ start_instance() {
 	cat <<-EOF >> ${TMP_OVPN_PATH}/${cfgid}/iptables_add.sh
 		${TMP_OVPN_PATH}/${cfgid}/iptables_del.sh
 		#允许服务端配置静态路由表访问内网
-		iptables -t nat -I postrouting_rule -s \$(cat ${TMP_OVPN_PATH}/${cfgid}/network)/\$(cat ${TMP_OVPN_PATH}/${cfgid}/mask) -m comment --comment "${c_dev}" -j MASQUERADE
-		iptables -t nat -I postrouting_rule -o ${c_dev} -m comment --comment "${c_dev}" -j MASQUERADE
-		iptables -I input_rule -s \$(cat ${TMP_OVPN_PATH}/${cfgid}/network)/\$(cat ${TMP_OVPN_PATH}/${cfgid}/mask) -m comment --comment "${c_dev}" -j ${c_allow_access_action}
-		iptables -I forwarding_rule -i ${c_dev} -m comment --comment "${c_dev}" -j ACCEPT
-		iptables -I forwarding_rule -o ${c_dev} -m comment --comment "${c_dev}" -j ACCEPT
+		iptables -w -t nat -I postrouting_rule -s \$(cat ${TMP_OVPN_PATH}/${cfgid}/network)/\$(cat ${TMP_OVPN_PATH}/${cfgid}/mask) -m comment --comment "${c_dev}" -j MASQUERADE
+		iptables -w -t nat -I postrouting_rule -o ${c_dev} -m comment --comment "${c_dev}" -j MASQUERADE
+		iptables -w -I input_rule -s \$(cat ${TMP_OVPN_PATH}/${cfgid}/network)/\$(cat ${TMP_OVPN_PATH}/${cfgid}/mask) -m comment --comment "${c_dev}" -j ${c_allow_access_action}
+		iptables -w -I forwarding_rule -i ${c_dev} -m comment --comment "${c_dev}" -j ACCEPT
+		iptables -w -I forwarding_rule -o ${c_dev} -m comment --comment "${c_dev}" -j ACCEPT
 	EOF
 
 	cat <<-EOF >> ${TMP_OVPN_PATH}/${cfgid}/iptables_del.sh
@@ -140,9 +143,21 @@ start_instance() {
 				\$1 -w -D \$2 \$index 2>/dev/null
 			done
 		}
-		ipt_del "iptables" "input_rule"
-		ipt_del "iptables" "forwarding_rule"
-		ipt_del "iptables -t nat" "postrouting_rule"
+		ipt_del "iptables -w" "input_rule"
+		ipt_del "iptables -w" "forwarding_rule"
+		ipt_del "iptables -w -t nat" "postrouting_rule"
+	EOF
+
+	cat <<-EOF >> ${TMP_OVPN_PATH}/${cfgid}/ipchange.sh
+		[ -s "${TMP_OVPN_PATH}/${cfgid}/ip" ] && ${TMP_OVPN_PATH}/${cfgid}/iptables_add.sh
+	EOF
+
+	cat <<-EOF >> ${TMP_OVPN_PATH}/${cfgid}/tls-verify.sh
+		#tls-verify script
+	EOF
+
+	cat <<-EOF >> ${TMP_OVPN_PATH}/${cfgid}/route-up.sh
+		#route-up script
 	EOF
 
 	cat <<-EOF >> /var/etc/${CONFIG}.include
@@ -155,11 +170,11 @@ start_instance() {
 			local c_network=$(echo -n "${c_route}" | awk -F ',' '{print $1}')
 			local c_gateway=$(echo -n "${c_route}" | awk -F ',' '{print $2}')
 			if [ -n "${c_gateway}" ]; then
-				echo "route add -net ${c_network} gw ${c_gateway} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/up.sh
-				echo "route del -net ${c_network} gw ${c_gateway} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/down.sh
+				echo "route add -net ${c_network} gw ${c_gateway} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/iptables_add.sh
+				echo "route del -net ${c_network} gw ${c_gateway} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/iptables_del.sh
 			else
-				echo "route add -net ${c_network} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/up.sh
-				echo "route del -net ${c_network} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/down.sh
+				echo "route add -net ${c_network} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/iptables_add.sh
+				echo "route del -net ${c_network} dev ${c_dev} >/dev/null 2>&1" >> ${TMP_OVPN_PATH}/${cfgid}/iptables_del.sh
 			fi
 		done
 	}
@@ -191,6 +206,9 @@ start_instance() {
 
 		up up.sh
 		down down.sh
+		tls-verify tls-verify.sh
+		ipchange ipchange.sh
+		route-up route-up.sh
 		script-security 3
 		log         openvpn.log
 		log-append  openvpn.log

luci-app-uugamebooster/Makefile

@@ -1,9 +1,16 @@
+# Copyright (C) 2021 Openwrt.org
+#
+# This is free software, licensed under the Apache License, Version 2.0 .
+#
+
 include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=LuCI support for UUgamebooster
 LUCI_DEPENDS:=+uugamebooster
 LUCI_PKGARCH:=all
 
+PKG_NAME:=luci-app-uugamebooster
+
 include $(TOPDIR)/feeds/luci/luci.mk
 
 # call BuildPackage - OpenWrt buildroot signature

luci-app-uugamebooster/luasrc/controller/uuplugin.lua

@@ -0,0 +1,17 @@
+module("luci.controller.uuplugin", package.seeall)
+
+function index()
+	if not nixio.fs.access("/etc/config/uuplugin") then
+		return
+	end
+
+	entry({"admin", "services", "uuplugin"}, cbi("uuplugin"), ("UU GameAcc"), 99).dependent = true
+	entry({"admin", "services", "uuplugin", "status"}, call("act_status")).leaf = true
+end
+
+function act_status()
+	local e = {}
+	e.running = luci.sys.call("pgrep -f uuplugin >/dev/null") == 0
+	luci.http.prepare_content("application/json")
+	luci.http.write_json(e)
+end

luci-app-uugamebooster/luasrc/model/cbi/uuplugin.lua

@@ -0,0 +1,19 @@
+require("luci.util")
+
+mp = Map("uuplugin")
+mp.title = translate("UU Game Accelerator")
+mp.description = translate("A Paid Game Acceleration service")
+
+mp:section(SimpleSection).template  = "uuplugin/uuplugin_status"
+
+s = mp:section(TypedSection, "uuplugin")
+s.anonymous = true
+s.addremove = false
+
+o = s:option(Flag, "enabled", translate("Enable"))
+o.default = 0
+o.optional = false
+
+mp:section(SimpleSection).template  = "uuplugin/uuplugin_qcode"
+
+return mp

luci-app-uugamebooster/luasrc/view/uuplugin/uuplugin_qcode.htm

@@ -0,0 +1,6 @@
+
+<fieldset class="cbi-section">
+	<p id="uugamebooster_qcode">
+		<img src="/uuios.png" height="300" /><img src="/uuandriod.png" height="300" />
+	</p>
+</fieldset>

luci-app-uugamebooster/luasrc/view/uugamebooster/uugamebooster_status.htm → luci-app-uugamebooster/luasrc/view/uuplugin/uuplugin_status.htm

@@ -1,7 +1,7 @@
 <script type="text/javascript">//<![CDATA[
-XHR.poll(3, '<%=url([[admin]], [[services]], [[uugamebooster]], [[status]])%>', null,
+XHR.poll(3, '<%=url([[admin]], [[services]], [[uuplugin]], [[status]])%>', null,
 	function(x, data) {
-		var tb = document.getElementById('uugamebooster_status');
+		var tb = document.getElementById('uuplugin_status');
 		if (data && tb) {
 			if (data.running) {
 				tb.innerHTML = '<em><b><font color=green>UU GameAcc <%:RUNNING%></font></b></em>';
@@ -15,7 +15,7 @@
 </script>
 <style>.mar-10 {margin-left: 50px; margin-right: 10px;}</style>
 <fieldset class="cbi-section">
-	<p id="uugamebooster_status">
+	<p id="uuplugin_status">
 		<em><%:Collecting data...%></em>
 	</p>
 </fieldset>

luci-app-uugamebooster/po/zh-cn/uugamebooster.po → luci-app-uugamebooster/po/zh-cn/uuplugin.po

@@ -1,3 +1,4 @@
+
 msgid "Enable"
 msgstr "启用"
 
@@ -8,4 +9,4 @@ msgid "UU Game Accelerator"
 msgstr "UU游戏加速器"
 
 msgid "A Paid Game Acceleration service"
-msgstr "一个付费主机游戏加速器 (开启服务后，使用手机APP绑定路由器并指定加速主机)"
+msgstr "一个富家子弟用的主机游戏加速器 (开启服务后，使用手机APP绑定路由器并指定加速主机)"

luci-app-uugamebooster/root/etc/config/uuplugin

@@ -0,0 +1,4 @@
+
+config uuplugin 'uuplugin'
+	option enabled '0'
+

luci-app-uugamebooster/root/etc/init.d/uuplugin

@@ -0,0 +1,23 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=10
+
+USE_PROCD=1
+
+NAME="uugamebooster"
+UU_BIN="/usr/share/uugamebooster/uuplugin"
+UU_CONF="/usr/share/uugamebooster/uu.conf"
+UU_LOGFILE="/tmp/uugamebooster.log"
+
+start_service() {
+  config_load uuplugin
+	local enable
+	config_get_bool enable uuplugin enabled
+	if [ "$enable" -eq 1 ]; then
+    procd_open_instance
+    procd_set_param command $UU_BIN $UU_CONF >$UU_LOGFILE 2>&1
+    procd_set_param respawn
+    procd_close_instance
+	fi
+}

luci-app-uugamebooster/root/etc/uci-defaults/45_luci-uuplugin

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+uci -q batch <<-EOF >/dev/null
+	delete ucitrack.@uuplugin[-1]
+	add ucitrack uuplugin
+	set ucitrack.@uuplugin[-1].init=uuplugin
+	commit ucitrack
+EOF
+
+rm -f /tmp/luci-indexcache
+exit 0

luci-app-uugamebooster/root/usr/share/rpcd/acl.d/luci-app-uugamebooster.json

@@ -2,10 +2,10 @@
 	"luci-app-uugamebooster": {
 		"description": "Grant UCI access for luci-app-uugamebooster",
 		"read": {
-			"uci": [ "uugamebooster" ]
+			"uci": [ "uuplugin" ]
 		},
 		"write": {
-			"uci": [ "uugamebooster" ]
+			"uci": [ "uuplugin" ]
 		}
 	}
 }

relevance/UnblockNeteaseMusic/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UnblockNeteaseMusic
 PKG_BASE_VERSION:=0.27.0
-PKG_RELEASE:=306
+PKG_RELEASE:=307
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/UnblockNeteaseMusic/server.git
 PKG_SOURCE_DATE:=2022-10-09
-PKG_SOURCE_VERSION:=80738251f810dfb692d1d5df43cd5d5599e06f40
+PKG_SOURCE_VERSION:=095b60b83ec0ed1e668d600a238d745ebc38dfed
 PKG_MIRROR_HASH:=skip
 
 PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION))

relevance/base-files/Makefile

@@ -13,7 +13,7 @@ include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
 PKG_FLAGS:=nonshared
-PKG_RELEASE:=54
+PKG_RELEASE:=55
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=usign/host ucert/host

relevance/base-files/files/etc/banner

@@ -1,11 +1,6 @@
-                                                 _____
-      _____________________________      __________  /_
-      _  __ \__  __ \  _ \_  __ \_ | /| / /_  ___/  __/
-      / /_/ /_  /_/ /  __/  / / /_ |/ |/ /_  /   / /_
-      \____/_  .___/\___//_/ /_/____/|__/ /_/    \__/
-            /_/    
-         _________________________________________
-
-               %D %C by Kiddin'
-         _________________________________________
-
+
+                       |\__/,|   (`\
+                     _.|o o  |_   ) )
+       -------------(((---(((-------------------
+              %D %C by Kiddin'
+       -----------------------------------------