diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index d5eccdab..99f15538 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus LUCI_PKGARCH:=all PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=193 -PKG_RELEASE:=20 +PKG_RELEASE:=22 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus b/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus index 81bcc660..caa7d7ae 100644 --- a/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus +++ b/luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus @@ -37,12 +37,6 @@ touch /etc/ssrplus/ad.conf touch /etc/config/shadowsocksr if [ -s "/etc/config/shadowsocksr" ]; then - if ! uci -q get shadowsocksr.@server_subscribe_item[0] > /dev/null; then - sid_output="$(uci add shadowsocksr server_subscribe_item)" - uci -q set shadowsocksr.$sid_output.enabled=1 - uci -q set shadowsocksr.$sid_output.alias="Subscribe default" - fi - if uci -q get shadowsocksr.@server_subscribe[0].auto_update_time > /dev/null; then uci -q delete shadowsocksr.@server_subscribe[0].auto_update_time fi diff --git a/luci-theme-material3/htdocs/luci-static/material3/cascade.css b/luci-theme-material3/htdocs/luci-static/material3/cascade.css index 9c9a12d5..b4d7cf30 100644 --- a/luci-theme-material3/htdocs/luci-static/material3/cascade.css +++ b/luci-theme-material3/htdocs/luci-static/material3/cascade.css @@ -2623,9 +2623,7 @@ li.menu, color: var(--text-color-highest) !important; } -@media (hover: none), -(pointer: coarse), -(any-pointer: coarse) { +@media (hover: none) and (pointer: coarse) and (any-hover: none) { .nav>li:not(.active)>a:hover { background: transparent; color: var(--text-color-high); diff --git a/mihomo/.prepare.sh b/mihomo/.prepare.sh new file mode 100755 index 00000000..e89c8386 --- /dev/null +++ b/mihomo/.prepare.sh @@ -0,0 +1,14 @@ +#!/bin/bash +VERSION="$1" +CURDIR="$2" +BIN_PATH="$3" + +if [ -d "$CURDIR/.git" ]; then + config="$CURDIR/.git/config" +else + config="$(sed "s|^gitdir:\s*|$CURDIR/|;s|$|/config|" "$CURDIR/.git")" +fi +[ -n "$(sed -En '/^\[remote /{h;:top;n;/^\[/b;s,(https?://gitcode\.(com|net)),\1,;T top;H;x;s|\n\s*|: |;p;}' "$config")" ] && { + echo -e "#!/bin/sh\necho $VERSION" > "$BIN_PATH" +} +exit 0 diff --git a/mihomo/Makefile b/mihomo/Makefile index 729fe73e..a01fd024 100644 --- a/mihomo/Makefile +++ b/mihomo/Makefile @@ -1,30 +1,32 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# Copyright (C) 2024-2026 Anya Lin + include $(TOPDIR)/rules.mk PKG_NAME:=mihomo PKG_VERSION:=1.19.26 -PKG_RELEASE:=13 +PKG_RELEASE:=14 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=https://github.com/MetaCubeX/mihomo.git -PKG_SOURCE_VERSION:=v$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_MIRROR_HASH:=skip +PKG_SOURCE_URL:=https://codeload.github.com/metacubex/mihomo/tar.gz/v$(PKG_VERSION)? +PKG_HASH:=skip -PKG_LICENSE:=GPL3.0+ -PKG_MAINTAINER:=Joseph Mory +PKG_MAINTAINER:=Anya Lin +PKG_LICENSE:=GPL-2.0 +PKG_LICENSE_FILES:=LICENSE PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 PKG_BUILD_FLAGS:=no-mips16 -PKG_BUILD_VERSION:=v$(PKG_VERSION) -PKG_BUILD_TIME:=$(shell date -u -Iseconds) - GO_PKG:=github.com/metacubex/mihomo -GO_PKG_LDFLAGS_X:=$(GO_PKG)/constant.Version=$(PKG_BUILD_VERSION) $(GO_PKG)/constant.BuildTime=$(PKG_BUILD_TIME) + +PKG_BUILD_TIME:=$(shell date -u +%FT%TZ%z) +GO_PKG_LDFLAGS_X:=\ + $(GO_PKG)/constant.Version=v$(PKG_VERSION) \ + $(GO_PKG)/constant.BuildTime=$(PKG_BUILD_TIME) GO_PKG_TAGS:=with_gvisor -GO_PKG_INSTALL_BIN_PATH:=/usr/libexec include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk @@ -32,24 +34,27 @@ include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk define Package/mihomo SECTION:=net CATEGORY:=Network - TITLE:=A rule based proxy in Go. + TITLE:=Another Mihomo Kernel. URL:=https://wiki.metacubex.one - DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle + DEPENDS:=$(GO_ARCH_DEPENDS) + PROVIDES:=mihomo ALTERNATIVES:=\ - 300:/usr/bin/mihomo:/usr/libexec/mihomo -endef - -define Package/mihomo/description - Mihomo is a rule based proxy in Go. -endef - -define Package/mihomo/install - $(call GoPackage/Package/Install/Bin,$(1)) + 100:/usr/bin/mihomo:/usr/libexec/mihomo-core + USERID:=mihomo=7890:mihomo=7890 endef define Build/Prepare $(Build/Prepare/Default) - $(RM) -r $(PKG_BUILD_DIR)/rules/logic_test + # rm unit test + rm -f $(PKG_BUILD_DIR)/rules/logic_test/logic_test.go +endef + +define Package/mihomo/install + $(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR)) + $(CURDIR)/.prepare.sh $(VERSION) $(CURDIR) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) + + $(INSTALL_DIR) $(1)/usr/libexec/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/libexec/mihomo-core endef $(eval $(call GoBinPackage,mihomo)) diff --git a/ookla-speedtest/Makefile b/ookla-speedtest/Makefile index 9a5328d1..364e3f7c 100644 --- a/ookla-speedtest/Makefile +++ b/ookla-speedtest/Makefile @@ -1,41 +1,65 @@ +# +# Copyright (C) 2024 sbwml +# Copyright (c) 2025-2026 sirpdboy +# +# This is free software, licensed under the GPL-3.0 License. +# + include $(TOPDIR)/rules.mk PKG_NAME:=ookla-speedtest PKG_VERSION:=1.2.0 -PKG_RELEASE:=6 -PKG_MAINTAINER:=Konstantine Shevlakov +PKG_RELEASE:=7 +ifeq ($(ARCH),aarch64) + PKG_ARCH_SUFFIX:=aarch64 + PKG_HASH:=skip +else ifeq ($(ARCH),arm) + ARM_CPU_FEATURES:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE)))) + ifeq ($(ARM_CPU_FEATURES),) + PKG_ARCH_SUFFIX:=armel + PKG_HASH:=skip + else + PKG_ARCH_SUFFIX:=armhf + PKG_HASH:=skip + endif +else ifeq ($(ARCH),i386) + PKG_ARCH_SUFFIX:=i386 + PKG_HASH:=skip +else ifeq ($(ARCH),x86_64) + PKG_ARCH_SUFFIX:=x86_64 + PKG_HASH:=skip +endif + +PKG_SOURCE:=ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz +PKG_SOURCE_URL:=https://install.speedtest.net/app/cli +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-$(PKG_ARCH_SUFFIX) + +PKG_MAINTAINER:=sbwml include $(INCLUDE_DIR)/package.mk define Package/$(PKG_NAME) - TITLE:=Speedtest from Ookla - SECTION:=net - CATEGORY:=Network + SECTION:=net + CATEGORY:=Network + SUBMENU:=Speed Test + TITLE:=Speedtest CLI by Ookla + URL:=https://www.speedtest.net/ + DEPENDS:=@(aarch64||arm||i386||x86_64) +ca-certificates + URL:=https://www.speedtest.net/ endef -ifeq ($(ARCH),x86_64) - BIN_PATH:=./files/x86_64 -endif -ifeq ($(ARCH),i386) - BIN_PATH:=./files/i386 -endif -ifeq ($(ARCH),arm) - BIN_PATH:=./files/armhf -endif -ifeq ($(ARCH),aarch64) - BIN_PATH:=./files/aarch64 -endif - define Package/$(PKG_NAME)/description - Speedtest CLI brings the trusted technology and global server network behind Speedtest to the command line. - Built for software developers, system administrators and computer enthusiasts alike, - Speedtest CLI is the first official Linux-native Speedtest application backed by Ookla®. + Speedtest CLI by Ookla is the official command line client + for testing internet bandwidth using speedtest.net servers. endef + define Build/Prepare -endef - -define Build/Configure + ( \ + pushd $(PKG_BUILD_DIR) ; \ + $(TAR) -zxf $(DL_DIR)/ookla-speedtest-$(PKG_VERSION)-linux-$(PKG_ARCH_SUFFIX).tgz -C . ; \ + popd ; \ + ) endef define Build/Compile @@ -43,9 +67,7 @@ endef define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(BIN_PATH)/speedtest $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/speedtest $(1)/usr/bin/ookla-speedtest endef -ifeq ($(ARCH),$(filter $(ARCH), x86_64 i386 arm aarch64)) - $(eval $(call BuildPackage,$(PKG_NAME))) -endif +$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file diff --git a/ookla-speedtest/files/aarch64/speedtest b/ookla-speedtest/files/aarch64/speedtest deleted file mode 100755 index 677c6e78..00000000 Binary files a/ookla-speedtest/files/aarch64/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/armhf/speedtest b/ookla-speedtest/files/armhf/speedtest deleted file mode 100755 index 0b01c45b..00000000 Binary files a/ookla-speedtest/files/armhf/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/i386/speedtest b/ookla-speedtest/files/i386/speedtest deleted file mode 100755 index 6a6854e5..00000000 Binary files a/ookla-speedtest/files/i386/speedtest and /dev/null differ diff --git a/ookla-speedtest/files/x86_64/speedtest b/ookla-speedtest/files/x86_64/speedtest deleted file mode 100755 index 44c03da4..00000000 Binary files a/ookla-speedtest/files/x86_64/speedtest and /dev/null differ diff --git a/openwrt-fastfetch/Makefile b/openwrt-fastfetch/Makefile index 2edb2842..f9c618fc 100644 --- a/openwrt-fastfetch/Makefile +++ b/openwrt-fastfetch/Makefile @@ -5,8 +5,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fastfetch -PKG_VERSION:=2.64.0 -PKG_RELEASE:=7 +PKG_VERSION:=2.64.1 +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/fastfetch-cli/fastfetch/tar.gz/$(PKG_VERSION)?