update 2022-10-17 23:56:17

2022-10-17 23:56:17 +08:00 · 2022-10-17 23:56:17 +08:00 · 2ae001cc35
parent 18c46fa078
commit 2ae001cc35
4 changed files with 111 additions and 111 deletions
--- a/dnsproxy/files/dnsproxy.init
+++ b/dnsproxy/files/dnsproxy.init
@ -88,7 +88,7 @@ load_config_param() {
 start_service() {
 	config_load "$CONF"

-	is_enabled "global" "enabled" || exit 1
+	is_enabled "global" "enabled" || return 1

 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"
--- a/luci-app-passwall/Makefile
+++ b/luci-app-passwall/Makefile
@ -35,131 +35,131 @@ LUCI_TITLE:=LuCI support for PassWall
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+coreutils +coreutils-base64 +coreutils-nohup +curl \
 	+dns2socks +dns2tcp +ip-full +libuci-lua +lua +luci-compat +luci-lib-jsonc \
-	+microsocks +resolveip +tcping +unzip
+	+microsocks +resolveip +tcping +unzip \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Brook:brook \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG:chinadns-ng \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy:haproxy \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria:hysteria \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-local \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client:shadowsocks-libev-ss-redir \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server:shadowsocks-libev-ss-server \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client:shadowsocks-rust-sslocal \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server:shadowsocks-rust-ssserver \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-local \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client:shadowsocksr-libev-ssr-redir \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs:simple-obfs \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO:trojan-go \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus:trojan-plus \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray-core \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin:v2ray-plugin \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin:xray-plugin

 define Package/$(PKG_NAME)/config
-	if PACKAGE_$(PKG_NAME)
-		menu "PassWall Configuration"
-			config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy
-				bool "Iptables Transparent Proxy"
-				select PACKAGE_dnsmasq-full
-				select PACKAGE_ipset
-				select PACKAGE_ipt2socks
-				select PACKAGE_iptables
-				select PACKAGE_iptables-legacy
-				select PACKAGE_iptables-mod-conntrack-extra
-				select PACKAGE_iptables-mod-iprange
-				select PACKAGE_iptables-mod-socket
-				select PACKAGE_iptables-mod-tproxy
-				select PACKAGE_kmod-ipt-nat
-				default y if ! PACKAGE_firewall4
+menu "Configuration"

-			config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy
-				bool "Nftables Transparent Proxy"
-				select PACKAGE_dnsmasq-full
-				select PACKAGE_nftables
-				select PACKAGE_kmod-nft-socket
-				select PACKAGE_kmod-nft-tproxy
-				select PACKAGE_kmod-nft-nat
-				default y if PACKAGE_firewall4
+config PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy
+	bool "Iptables Transparent Proxy"
+	select PACKAGE_dnsmasq-full
+	select PACKAGE_ipset
+	select PACKAGE_ipt2socks
+	select PACKAGE_iptables
+	select PACKAGE_iptables-legacy
+	select PACKAGE_iptables-mod-conntrack-extra
+	select PACKAGE_iptables-mod-iprange
+	select PACKAGE_iptables-mod-socket
+	select PACKAGE_iptables-mod-tproxy
+	select PACKAGE_kmod-ipt-nat
+	default y if ! PACKAGE_firewall4

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Brook
-				bool "Include Brook"
-				select PACKAGE_brook
-				default n
+config PACKAGE_$(PKG_NAME)_Nftables_Transparent_Proxy
+	bool "Nftables Transparent Proxy"
+	select PACKAGE_dnsmasq-full
+	select PACKAGE_nftables
+	select PACKAGE_kmod-nft-socket
+	select PACKAGE_kmod-nft-tproxy
+	select PACKAGE_kmod-nft-nat
+	default y if PACKAGE_firewall4

-			config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
-				bool "Include ChinaDNS-NG"
-				select PACKAGE_ipset
-				select PACKAGE_chinadns-ng
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_Brook
+	bool "Include Brook"
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy
-				bool "Include Haproxy"
-				select PACKAGE_haproxy
-				default y if aarch64||arm||i386||x86_64
+config PACKAGE_$(PKG_NAME)_INCLUDE_ChinaDNS_NG
+	bool "Include ChinaDNS-NG"
+	select PACKAGE_ipset
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
-				bool "Include Hysteria"
-				select PACKAGE_hysteria
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_Haproxy
+	bool "Include Haproxy"
+	default y if aarch64||arm||i386||x86_64

-			config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
-				bool "Include NaiveProxy"
-				depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
-				select PACKAGE_naiveproxy
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
+	bool "Include Hysteria"
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
-				bool "Include Shadowsocks Libev Client"
-				select PACKAGE_shadowsocks-libev-ss-local
-				select PACKAGE_shadowsocks-libev-ss-redir
-				default y
+config PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy
+	bool "Include NaiveProxy"
+	depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
-				bool "Include Shadowsocks Libev Server"
-				select PACKAGE_shadowsocks-libev-ss-server
-				default y if aarch64||arm||i386||x86_64
+config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Client
+	bool "Include Shadowsocks Libev Client"
+	default y

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
-				bool "Include Shadowsocks Rust Client"
-				depends on aarch64||arm||i386||mips||mipsel||x86_64
-				select PACKAGE_shadowsocks-rust-sslocal
-				default y if aarch64
+config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Libev_Server
+	bool "Include Shadowsocks Libev Server"
+	default y if aarch64||arm||i386||x86_64

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
-				bool "Include Shadowsocks Rust Server"
-				depends on aarch64||arm||i386||mips||mipsel||x86_64
-				select PACKAGE_shadowsocks-rust-ssserver
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client
+	bool "Include Shadowsocks Rust Client"
+	depends on aarch64||arm||i386||mips||mipsel||x86_64
+	default y if aarch64

-			config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
-				bool "Include ShadowsocksR Libev Client"
-				select PACKAGE_shadowsocksr-libev-ssr-local
-				select PACKAGE_shadowsocksr-libev-ssr-redir
-				default y
+config PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Server
+	bool "Include Shadowsocks Rust Server"
+	depends on aarch64||arm||i386||mips||mipsel||x86_64
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
-				bool "Include ShadowsocksR Libev Server"
-				select PACKAGE_shadowsocksr-libev-ssr-server
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Client
+	bool "Include ShadowsocksR Libev Client"
+	default y

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
-				bool "Include Simple-Obfs (Shadowsocks Plugin)"
-				select PACKAGE_simple-obfs
-				default y
+config PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server
+	bool "Include ShadowsocksR Libev Server"
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO
-				bool "Include Trojan-GO"
-				select PACKAGE_trojan-go
-				default n
+config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
+	bool "Include Simple-Obfs (Shadowsocks Plugin)"
+	default y

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus
-				bool "Include Trojan-Plus"
-				select PACKAGE_trojan-plus
-				default y
+config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO
+	bool "Include Trojan-GO"
+	default n

-			config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
-				bool "Include V2ray"
-				select PACKAGE_v2ray-core
-				default y if aarch64||arm||i386||x86_64
+config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus
+	bool "Include Trojan-Plus"
+	default y

-			config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin
-				bool "Include V2ray-Plugin (Shadowsocks Plugin)"
-				select PACKAGE_v2ray-plugin
-				default y if aarch64||arm||i386||x86_64
+config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
+	bool "Include V2ray"
+	default y if aarch64||arm||i386||x86_64

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
-				bool "Include Xray"
-				select PACKAGE_xray-core
-				default y if aarch64||arm||i386||x86_64
+config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray_Plugin
+	bool "Include V2ray-Plugin (Shadowsocks Plugin)"
+	default y if aarch64||arm||i386||x86_64

-			config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin
-				bool "Include Xray-Plugin (Shadowsocks Plugin)"
-				select PACKAGE_xray-plugin
-				default n
-		endmenu
-	endif
+config PACKAGE_$(PKG_NAME)_INCLUDE_Xray
+	bool "Include Xray"
+	default y if aarch64||arm||i386||x86_64
+
+config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin
+	bool "Include Xray-Plugin (Shadowsocks Plugin)"
+	default n
+
+endmenu
 endef

 define Package/$(PKG_NAME)/conffiles
--- a/uugamebooster/Makefile
+++ b/uugamebooster/Makefile
@ -12,7 +12,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=uugamebooster
-PKG_VERSION:=v2.24.12
+PKG_VERSION:=v3.0.4
 PKG_RELEASE:=1

 include $(INCLUDE_DIR)/package.mk
@ -31,22 +31,22 @@ endef

 ifeq ($(ARCH),arm)
 	UU_ARCH:=arm
-	PKG_MD5SUM:=5926cf8c18aca92f8a6304c47739c226
+	PKG_MD5SUM:=275c903b5cc9d4a734d2a50fd729838f
 endif

 ifeq ($(ARCH),aarch64)
 	UU_ARCH:=aarch64
-	PKG_MD5SUM:=8a08b04960e7428d08cb13d8f9aaf962
+	PKG_MD5SUM:=0c688bb10472564e73f3ba7cd721ce20
 endif

 ifeq ($(ARCH),mipsel)
 	UU_ARCH:=mipsel
-	PKG_MD5SUM:=b878586944e92ea94ba57c45b063e80b
+	PKG_MD5SUM:=645da157d7c291cfb5b8e87f08a182b6
 endif

 ifeq ($(ARCH),x86_64)
 	UU_ARCH:=x86_64
-	PKG_MD5SUM:=78786fc3bc9bd411a908ddc527c35d21
+	PKG_MD5SUM:=00b35eca6dc0a124431ab8dc9c21c8a1
 endif

 PKG_SOURCE_URL:=https://uu.gdl.netease.com/uuplugin/openwrt-$(UU_ARCH)/$(PKG_VERSION)/uu.tar.gz?
--- a/v2raya/files/v2raya.init
+++ b/v2raya/files/v2raya.init
@ -34,7 +34,7 @@ append_env_bool() {
 start_service() {
 	config_load "$CONF"

-	is_enabled "config" "enabled" || exit 1
+	is_enabled "config" "enabled" || return 1

 	procd_open_instance "$CONF"
 	procd_set_param command "$PROG"