From 084d671fa704786d003c2976836ad4f46a30a1e1 Mon Sep 17 00:00:00 2001 From: action Date: Thu, 30 Jul 2026 01:09:32 +0800 Subject: [PATCH] update 2026-07-30 01:09:32 --- ddns-go/Makefile | 4 +- luci-app-log/Makefile | 2 +- luci-app-log/README.md | 24 +++--- .../share/rpcd/acl.d/luci-app-log-viewer.json | 1 + .../share/rpcd/acl.d/luci-app-log-viewer.json | 3 +- sing-box/Makefile | 4 +- tuic-client/Makefile | 79 ++++++++++--------- 7 files changed, 60 insertions(+), 57 deletions(-) diff --git a/ddns-go/Makefile b/ddns-go/Makefile index 79ba95f4..a985fa38 100644 --- a/ddns-go/Makefile +++ b/ddns-go/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-go -PKG_VERSION:=6.17.2 +PKG_VERSION:=6.17.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/jeessy2/ddns-go/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=dcf9b5795c6e546c2d7d9fa0cccdb57589440273ee606dac8a0bbc8f6be54afb +PKG_HASH:=8d12594cd7a8b77effb068181b1a6d0a378e6321b5e4c3ec438e415de5fe4039 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=LICENSE diff --git a/luci-app-log/Makefile b/luci-app-log/Makefile index efe199d1..ac578974 100644 --- a/luci-app-log/Makefile +++ b/luci-app-log/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-log-viewer PKG_VERSION:=1.5.0 -PKG_RELEASE:=3 +PKG_RELEASE:=4 LUCI_TITLE:=Advanced syslog and kernel log (tail, search, etc) LUCI_DEPENDS:=+ucode +ucode-mod-fs LUCI_PKGARCH:=all diff --git a/luci-app-log/README.md b/luci-app-log/README.md index 1dd1fdb6..ce23536f 100644 --- a/luci-app-log/README.md +++ b/luci-app-log/README.md @@ -11,29 +11,29 @@ Supported LuCI themes: luci-theme-bootstrap, luci-theme-material, luci-theme-ope **OpenWrt >= 25.12:** - wget --no-check-certificate -O /tmp/luci-app-log-viewer-1.5.0-r3.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-app-log-viewer-1.5.0-r3.apk - apk --allow-untrusted add /tmp/luci-app-log-viewer-1.5.0-r3.apk - rm /tmp/luci-app-log-viewer-1.5.0-r3.apk + wget --no-check-certificate -O /tmp/luci-app-log-viewer-1.5.0-r4.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-app-log-viewer-1.5.0-r4.apk + apk --allow-untrusted add /tmp/luci-app-log-viewer-1.5.0-r4.apk + rm /tmp/luci-app-log-viewer-1.5.0-r4.apk service rpcd restart i18n-ru: - wget --no-check-certificate -O /tmp/luci-i18n-log-viewer-ru-1.5.0-r3.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-i18n-log-viewer-ru-1.5.0-r3.apk - apk --allow-untrusted add /tmp/luci-i18n-log-viewer-ru-1.5.0-r3.apk - rm /tmp/luci-i18n-log-viewer-ru-1.5.0-r3.apk + wget --no-check-certificate -O /tmp/luci-i18n-log-viewer-ru-1.5.0-r4.apk https://github.com/gSpotx2f/packages-openwrt/raw/master/25.12/luci-i18n-log-viewer-ru-1.5.0-r4.apk + apk --allow-untrusted add /tmp/luci-i18n-log-viewer-ru-1.5.0-r4.apk + rm /tmp/luci-i18n-log-viewer-ru-1.5.0-r4.apk **OpenWrt <= 24.10:** - wget --no-check-certificate -O /tmp/luci-app-log-viewer_1.5.0-r3_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-app-log-viewer_1.5.0-r3_all.ipk - opkg install /tmp/luci-app-log-viewer_1.5.0-r3_all.ipk - rm /tmp/luci-app-log-viewer_1.5.0-r3_all.ipk + wget --no-check-certificate -O /tmp/luci-app-log-viewer_1.5.0-r4_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-app-log-viewer_1.5.0-r4_all.ipk + opkg install /tmp/luci-app-log-viewer_1.5.0-r4_all.ipk + rm /tmp/luci-app-log-viewer_1.5.0-r4_all.ipk service rpcd restart i18n-ru: - wget --no-check-certificate -O /tmp/luci-i18n-log-viewer-ru_1.5.0-r3_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-i18n-log-viewer-ru_1.5.0-r3_all.ipk - opkg install /tmp/luci-i18n-log-viewer-ru_1.5.0-r3_all.ipk - rm /tmp/luci-i18n-log-viewer-ru_1.5.0-r3_all.ipk + wget --no-check-certificate -O /tmp/luci-i18n-log-viewer-ru_1.5.0-r4_all.ipk https://github.com/gSpotx2f/packages-openwrt/raw/master/24.10/luci-i18n-log-viewer-ru_1.5.0-r4_all.ipk + opkg install /tmp/luci-i18n-log-viewer-ru_1.5.0-r4_all.ipk + rm /tmp/luci-i18n-log-viewer-ru_1.5.0-r4_all.ipk ## Screenshots: diff --git a/luci-app-log/dev-mods-examples/mod-multilog/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json b/luci-app-log/dev-mods-examples/mod-multilog/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json index 619026f4..f4ae5c9d 100644 --- a/luci-app-log/dev-mods-examples/mod-multilog/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json +++ b/luci-app-log/dev-mods-examples/mod-multilog/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json @@ -6,6 +6,7 @@ "file": { "/sbin/logread*": [ "exec" ], "/usr/sbin/logread*": [ "exec" ], + "/usr/libexec/logread-ubox*": [ "exec" ], "/bin/dmesg -r": [ "exec" ], "/var/log/messages": [ "read" ], "/var/log/secure": [ "read" ], diff --git a/luci-app-log/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json b/luci-app-log/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json index e5b091ad..05f2bdcd 100644 --- a/luci-app-log/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json +++ b/luci-app-log/root/usr/share/rpcd/acl.d/luci-app-log-viewer.json @@ -6,7 +6,8 @@ "file": { "/sbin/logread*": [ "exec" ], "/usr/sbin/logread*": [ "exec" ], - "/bin/dmesg -r": [ "exec" ] + "/bin/dmesg -r": [ "exec" ], + "/usr/libexec/logread-ubox*": [ "exec" ] }, "ubus": { "system": [ "info" ], diff --git a/sing-box/Makefile b/sing-box/Makefile index b84e9a71..6f054ec0 100644 --- a/sing-box/Makefile +++ b/sing-box/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.13.14 +PKG_VERSION:=1.13.15 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=d18294eb00128743b1dbf1d5f4f01902bdfd59a2d2858cda809abe5351a9cd40 +PKG_HASH:=b43456c0cb2d4d7b81664010b2149a35ed6e3f6c245d78bcc7caf27c46eca816 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE diff --git a/tuic-client/Makefile b/tuic-client/Makefile index 0d8cdb6f..01e32bcf 100644 --- a/tuic-client/Makefile +++ b/tuic-client/Makefile @@ -5,26 +5,53 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tuic-client -PKG_VERSION:=2.0.0-de +PKG_UPSTREAM_VERSION:=2.0.0-dev1 +PKG_VERSION:=2.0.0_pre1 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://codeload.github.com/Itsusinn/tuic/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=4513c9add6b3a1ffb49026d7308fe488b33e8b0b2d3d1f1c89c06768b479b56a -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +TUIC_HASH_AARCH64:=07e4be99f22f760ce7fe77daf7547266cbab1080b405887458b540f18c4c6c29 +TUIC_HASH_ARMV7:=c7320a7f1a0d5feeebb6b9aab5e22d3570f511b4d5c34fe513fb96d951f9da6b +TUIC_HASH_ARMV7HF:=9498bc6d0c88756a426b6f5cf5f4b926aac896037a1d1a718f2c5e7bd39103cb +TUIC_HASH_I686:=151ea3783738130b14801620d5a972a9be27d708f16eea0f20ffceb673e93e5d +TUIC_HASH_X86_64:=ce57a4f9c2136739c5869e2744fb0a5fdb425a8deef02516d68af12c8c74328f PKG_MAINTAINER:=Tianling Shen -PKG_LICENSE:=GPL-3.0-only +PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE include $(INCLUDE_DIR)/package.mk -PKG_BUILD_DEPENDS:=rust/host -PKG_BUILD_PARALLEL:=1 -include $(TOPDIR)/feeds/packages/lang/rust/rust-package.mk +ifeq ($(ARCH),aarch64) + TUIC_ARCH:=tuic-client-aarch64-linux-musl + PKG_HASH:=$(TUIC_HASH_AARCH64) +else ifeq ($(ARCH),arm) + ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) + ifeq ($(ARM_CPU_FEATURES),) + TUIC_ARCH:=tuic-client-armv7-linux-musl + PKG_HASH:=$(TUIC_HASH_ARMV7) + else + TUIC_ARCH:=tuic-client-armv7-linux-muslhf + PKG_HASH:=$(TUIC_HASH_ARMV7HF) + endif +else ifeq ($(ARCH),i386) + TUIC_ARCH:=tuic-client-i686-linux-musl + PKG_HASH:=$(TUIC_HASH_I686) +else ifeq ($(ARCH),x86_64) + TUIC_ARCH:=tuic-client-x86_64-linux-musl + PKG_HASH:=$(TUIC_HASH_X86_64) +else + PKG_SOURCE:=dummy + PKG_HASH:=dummy +endif -TAR_OPTIONS += --strip-components 1 -TAR_CMD=$(HOST_TAR) -C $(1) $(TAR_OPTIONS) +define Download/tuic-client + URL:=https://github.com/Itsusinn/tuic/releases/download/v$(PKG_UPSTREAM_VERSION)/ + URL_FILE:=$(TUIC_ARCH) + FILE:=$(TUIC_ARCH)-$(PKG_UPSTREAM_VERSION) + HASH:=$(PKG_HASH) +endef + +$(eval $(call Download,tuic-client)) define Package/tuic-client SECTION:=net @@ -32,45 +59,19 @@ define Package/tuic-client SUBMENU:=Web Servers/Proxies TITLE:=TUIC proxy protocol client URL:=https://github.com/Itsusinn/tuic - DEPENDS:=@(aarch64||arm||mips||mipsel||x86_64||i386||i686||riscv64||loongarch64) + DEPENDS:=@USE_MUSL @(aarch64||arm_v7||i386||x86_64) @!(TARGET_x86_geode||TARGET_x86_legacy) endef define Package/tuic-client/description Delicately-TUICed 0-RTT proxy protocol client. endef -define Select/Features -$(strip \ - $(if $(findstring x86_64,$(RUSTC_TARGET_ARCH)),--features jemallocator) \ - $(if $(findstring aarch64,$(RUSTC_TARGET_ARCH)),--features jemallocator) \ - $(if $(or \ - $(findstring arm,$(RUSTC_TARGET_ARCH)), \ - $(findstring mips,$(RUSTC_TARGET_ARCH)), \ - $(findstring mipsel,$(RUSTC_TARGET_ARCH)), \ - $(findstring i686,$(RUSTC_TARGET_ARCH)), \ - $(findstring i386,$(RUSTC_TARGET_ARCH)), \ - $(findstring riscv64,$(RUSTC_TARGET_ARCH)), \ - $(findstring loongarch64,$(RUSTC_TARGET_ARCH)) \ - ),--no-default-features --features ring) \ -) -endef - define Build/Compile - ( \ - pushd $(PKG_BUILD_DIR) ; \ - $(CARGO_PKG_CONFIG_VARS) \ - cargo build --release \ - -p tuic-client \ - --target $(RUSTC_TARGET_ARCH) \ - $(call Select/Features) ; \ - popd ; \ - ) endef define Package/tuic-client/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/target/$(RUSTC_TARGET_ARCH)/release/tuic-client $(1)/usr/bin/ + $(INSTALL_BIN) $(DL_DIR)/$(TUIC_ARCH)-$(PKG_UPSTREAM_VERSION) $(1)/usr/bin/tuic-client endef -$(eval $(call RustBinPackage,tuic-client)) $(eval $(call BuildPackage,tuic-client))