update 2022-10-06 23:51:14

luci-app-amlogic/Makefile

@@ -16,7 +16,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-amlogic
-PKG_VERSION:=3.1.128
+PKG_VERSION:=3.1.129
 PKG_RELEASE:=1
 
 PKG_LICENSE:=GPL-2.0 License

luci-app-amlogic/root/usr/sbin/openwrt-install-amlogic

@@ -134,6 +134,7 @@ else
 # Amlogic G12A Family
 31:X96 Max 4GB:s905x2:meson-g12a-x96-max.dtb:u-boot-x96max.bin:/lib/u-boot/x96max-u-boot.bin.sd.bin:NA:4C@1908Mhz,4GB Mem,1Gb Nic
 32:X96 Max 2GB:s905x2:meson-g12a-x96-max-rmii.dtb:u-boot-x96max.bin:/lib/u-boot/x96max-u-boot.bin.sd.bin:NA:4C@1908Mhz,2GB Mem,100M Nic
+33:CM311-1a-YST:s905l3a:meson-g12a-s905l3a-cm311.dtb:u-boot-e900v22c.bin:NA:NA:4C@1908Mhz,2+16G,Bluetooth rtl8761b,100Mb Nic
 
 # Amlogic G12B Family
 41:Beelink GT-King:s922x:meson-g12b-gtking.dtb:u-boot-gtking.bin:/lib/u-boot/gtking-u-boot.bin.sd.bin:NA:2C@1800Mhz(A53)+4C@1908Mhz(A73),4GB Mem,1Gb Nic,brcm4356 wifi

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 \
-	+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
+	+microsocks +resolveip +tcping +unzip
 
 define Package/$(PKG_NAME)/config
-menu "Configuration"
+	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
 
-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)_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)_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_Brook
+				bool "Include Brook"
+				select PACKAGE_brook
+				default n
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_Brook
-	bool "Include Brook"
-	default n
+			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_ChinaDNS_NG
-	bool "Include ChinaDNS-NG"
-	select PACKAGE_ipset
-	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_Haproxy
-	bool "Include Haproxy"
-	default y if aarch64||arm||i386||x86_64
+			config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
+				bool "Include Hysteria"
+				select PACKAGE_hysteria
+				default n
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_Hysteria
-	bool "Include Hysteria"
-	default n
+			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_NaiveProxy
-	bool "Include NaiveProxy"
-	depends on !(arc||(arm&&TARGET_gemini)||armeb||mips||mips64||powerpc)
-	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_Shadowsocks_Libev_Client
-	bool "Include Shadowsocks Libev Client"
-	default y
+			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_Server
-	bool "Include Shadowsocks Libev Server"
-	default y if aarch64||arm||i386||x86_64
+			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_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_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_Server
-	bool "Include Shadowsocks Rust Server"
-	depends on aarch64||arm||i386||mips||mipsel||x86_64
-	default n
+			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_ShadowsocksR_Libev_Client
-	bool "Include ShadowsocksR Libev Client"
-	default y
+			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_Server
-	bool "Include ShadowsocksR Libev Server"
-	default n
+			config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
+				bool "Include Simple-Obfs (Shadowsocks Plugin)"
+				select PACKAGE_simple-obfs
+				default y
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_Simple_Obfs
-	bool "Include Simple-Obfs (Shadowsocks Plugin)"
-	default y
+			config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO
+				bool "Include Trojan-GO"
+				select PACKAGE_trojan-go
+				default n
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_GO
-	bool "Include Trojan-GO"
-	default n
+			config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus
+				bool "Include Trojan-Plus"
+				select PACKAGE_trojan-plus
+				default y
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan_Plus
-	bool "Include Trojan-Plus"
-	default y
+			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_V2ray
-	bool "Include V2ray"
-	default y if aarch64||arm||i386||x86_64
+			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_Plugin
-	bool "Include V2ray-Plugin (Shadowsocks Plugin)"
-	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_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
+			config PACKAGE_$(PKG_NAME)_INCLUDE_Xray_Plugin
+				bool "Include Xray-Plugin (Shadowsocks Plugin)"
+				select PACKAGE_xray-plugin
+				default n
+		endmenu
+	endif
 endef
 
 define Package/$(PKG_NAME)/conffiles

qtbase/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qtbase
 PKG_BASE:=5.15
-PKG_BUGFIX:=4
+PKG_BUGFIX:=6
 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
 PKG_RELEASE:=1
 
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \
 		http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
-PKG_HASH:=f93207bbf86663bd7abd16fac91deb4c753c1c133d3ac768fe61464b17ae8a18
+PKG_HASH:=396bc6b0d773ac6a7c691a4c3d901999f571e3e7033d7fd6f65e4ef2b6eb7340
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)
 

qtbase/patches/010-gcc11.patch

@@ -1,12 +0,0 @@
-diff --color -uNr a/src/corelib/text/qbytearraymatcher.h b/src/corelib/text/qbytearraymatcher.h
---- a/src/corelib/text/qbytearraymatcher.h	2020-10-27 16:02:11.000000000 +0800
-+++ b/src/corelib/text/qbytearraymatcher.h	2021-07-19 06:22:30.139372013 +0800
-@@ -41,7 +41,7 @@
- #define QBYTEARRAYMATCHER_H
- 
- #include <QtCore/qbytearray.h>
--
-+#include <limits>
- QT_BEGIN_NAMESPACE
- 
- 

qttools/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qttools
 PKG_BASE:=5.15
-PKG_BUGFIX:=4
+PKG_BUGFIX:=6
 PKG_VERSION:=$(PKG_BASE).$(PKG_BUGFIX)
 PKG_RELEASE:=1
 
@@ -17,7 +17,7 @@ PKG_SOURCE_URL:= \
 		http://master.qt.io/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://mirrors.tuna.tsinghua.edu.cn/qt/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules \
 		http://qt.mirror.constant.com/archive/qt/$(PKG_BASE)/$(PKG_VERSION)/submodules
-PKG_HASH:=4c5ccf8fdae70f3d4c731419935f456203950f9f4fce325d81b686f05e60b333
+PKG_HASH:=2c1486ab7e6dad76fb34642cd4f91d533e5dfeec0ee527129c2c2ed4ab283c3b
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-everywhere-src-$(PKG_VERSION)