From 3232f1d5747c2e68701381ae33fd6dceb1daa878 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 25 Jun 2026 08:44:59 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B6=20Sync=202026-06-25=2008:44:59?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- luci-app-ssr-plus/Makefile | 2 +- .../root/etc/init.d/shadowsocksr | 19 +++++---- luci-theme-aurora/Makefile | 2 +- luci-theme-aurora/README.md | 42 ++++++++++++++++++- luci-theme-aurora/README_zh.md | 42 ++++++++++++++++++- natflow/Makefile | 4 +- quickfile/Makefile | 4 +- 7 files changed, 99 insertions(+), 16 deletions(-) diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 03e0d2cc..1c5f2055 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:=195 -PKG_RELEASE:=31 +PKG_RELEASE:=32 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \ diff --git a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 13363b4e..89f44eaf 100755 --- a/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -2589,14 +2589,17 @@ stop() { uci -q del "dhcp.@dnsmasq[0]._unused_ssrp_changed" uci -q commit "dhcp" fi - if [ -f "$DNSMASQ_CONF_DIR/dnsmasq-ssrplus.conf" ]; then - rm -rf $DNSMASQ_CONF_DIR/dnsmasq-ssrplus.conf \ - $TMP_DNSMASQ_PATH \ - $TMP_PATH/*-ssr-*.json \ - $TMP_PATH/3proxy* \ - $TMP_PATH/clash-* \ - $TMP_PATH/ssr-server*.json \ - $TMP_PATH/*-config-*.json + if [ -f "$DNSMASQ_CONF_DIR/dnsmasq-ssrplus.conf" ]; then + rm -rf $DNSMASQ_CONF_DIR/dnsmasq-ssrplus.conf \ + $TMP_DNSMASQ_PATH \ + $TMP_PATH/*-ssr-*.json \ + $TMP_PATH/3proxy* \ + $TMP_PATH/clash-* \ + $TMP_PATH/v2ray-* \ + $TMP_PATH/tuic-* \ + $TMP_PATH/ss-* \ + $TMP_PATH/ssr-server*.json \ + $TMP_PATH/*-config-*.json /etc/init.d/dnsmasq restart >/dev/null 2>&1 fi diff --git a/luci-theme-aurora/Makefile b/luci-theme-aurora/Makefile index 7b9b1c16..7bad52ab 100644 --- a/luci-theme-aurora/Makefile +++ b/luci-theme-aurora/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=Aurora Theme (A modern browser theme built with Vite and Tailwind CS LUCI_DEPENDS:=+luci-base PKG_VERSION:=1.0.0 -PKG_RELEASE:=33 +PKG_RELEASE:=34 PKG_LICENSE:=Apache-2.0 LUCI_MINIFY_CSS:= diff --git a/luci-theme-aurora/README.md b/luci-theme-aurora/README.md index 97614b33..7b9e46f0 100644 --- a/luci-theme-aurora/README.md +++ b/luci-theme-aurora/README.md @@ -51,7 +51,7 @@ - **Safari 16.4+** _(released March 2023)_ - **Firefox 128+** _(released July 2024)_ -## Installation +## Install a pre-built release OpenWrt 25.12+ and snapshots use `apk`; other versions use `opkg`: @@ -68,6 +68,46 @@ OpenWrt 25.12+ and snapshots use `apk`; other versions use `opkg`: cd /tmp && uclient-fetch -O luci-theme-aurora.apk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora-1.0.0-r20260619.apk && apk add --allow-untrusted luci-theme-aurora.apk ``` +## Build from source + +Build the package yourself with the OpenWrt build system. Host prerequisites: [Build system setup](https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem). The build writes the package to `bin/packages//base/` (e.g. `bin/packages/x86_64/base/luci-theme-aurora_*_all.ipk`); copy it to your router and install it as above. + +### Via the OpenWrt buildroot + +```sh +# Clone OpenWrt — the openwrt-24.10 branch builds an .ipk, the main branch builds an .apk +git clone https://github.com/openwrt/openwrt.git +cd openwrt +git checkout openwrt-24.10 # omit to stay on main (snapshots → .apk) + +# Add this package and install feeds (provides luci-base) +git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora +./scripts/feeds update -a +./scripts/feeds install -a + +# Select the theme in menuconfig: LuCI → Themes → luci-theme-aurora +make menuconfig + +# Build host tools + toolchain, then compile the package +make tools/install -j$(nproc) +make toolchain/install -j$(nproc) +make package/luci-theme-aurora/compile -j$(nproc) V=s +``` + +### Via the prebuilt SDK (faster) + +The [OpenWrt SDK](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk) bundles a prebuilt toolchain, so the `tools/install` / `toolchain/install` steps are skipped. Download the SDK for your target from [downloads.openwrt.org](https://downloads.openwrt.org) (a release SDK builds `.ipk`, a snapshot SDK builds `.apk`), extract it, then from the SDK directory: + +```sh +git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora +./scripts/feeds update -a +./scripts/feeds install -a + +# Select the theme in menuconfig: LuCI → Themes → luci-theme-aurora +make menuconfig +make package/luci-theme-aurora/compile -j$(nproc) V=s +``` + ## Contributing Aurora uses **Vite** and a modern front-end toolchain, and is experimenting with end-to-end AI integration across the full development workflow. See [Development Documentation](.dev/docs/DEVELOPMENT.md) to get started. Suggestions and PRs are always welcome. diff --git a/luci-theme-aurora/README_zh.md b/luci-theme-aurora/README_zh.md index c886b516..59c5116c 100644 --- a/luci-theme-aurora/README_zh.md +++ b/luci-theme-aurora/README_zh.md @@ -51,7 +51,7 @@ - **Safari 16.4+** _(2023 年 3 月发布)_ - **Firefox 128+** _(2024 年 7 月发布)_ -## 安装 +## 安装预编译包 OpenWrt 25.12+ 和 Snapshot 版本使用 `apk`；其他版本使用 `opkg`： @@ -69,6 +69,46 @@ OpenWrt 25.12+ 和 Snapshot 版本使用 `apk`；其他版本使用 `opkg`： cd /tmp && uclient-fetch -O luci-theme-aurora.apk https://github.com/eamonxg/luci-theme-aurora/releases/latest/download/luci-theme-aurora-1.0.0-r20260619.apk && apk add --allow-untrusted luci-theme-aurora.apk ``` +## 从源码构建 + +使用 OpenWrt 构建系统自行编译。主机前置条件见 [Build system setup](https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem)。产物位于 `bin/packages//base/`（例如 `bin/packages/x86_64/base/luci-theme-aurora_*_all.ipk`），拷贝到路由器后按上文方式安装即可。 + +### 通过 OpenWrt buildroot + +```sh +# 克隆 OpenWrt——openwrt-24.10 分支构建 .ipk，main 分支构建 .apk +git clone https://github.com/openwrt/openwrt.git +cd openwrt +git checkout openwrt-24.10 # 省略则停留在 main（snapshot → .apk） + +# 加入本软件包并安装 feeds（提供 luci-base） +git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora +./scripts/feeds update -a +./scripts/feeds install -a + +# 在 menuconfig 中勾选主题：LuCI → Themes → luci-theme-aurora +make menuconfig + +# 先编译主机工具与工具链，再编译本软件包 +make tools/install -j$(nproc) +make toolchain/install -j$(nproc) +make package/luci-theme-aurora/compile -j$(nproc) V=s +``` + +### 通过预编译 SDK（更快） + +[OpenWrt SDK](https://openwrt.org/docs/guide-developer/toolchain/using_the_sdk) 自带预编译工具链，可省去 `tools/install` / `toolchain/install` 步骤。从 [downloads.openwrt.org](https://downloads.openwrt.org) 下载与目标匹配的 SDK（release SDK 构建 `.ipk`，snapshot SDK 构建 `.apk`）并解压，然后在 SDK 目录中执行： + +```sh +git clone https://github.com/eamonxg/luci-theme-aurora.git package/luci-theme-aurora +./scripts/feeds update -a +./scripts/feeds install -a + +# 在 menuconfig 中勾选主题：LuCI → Themes → luci-theme-aurora +make menuconfig +make package/luci-theme-aurora/compile -j$(nproc) V=s +``` + ## 加入贡献 Aurora 使用 **Vite** 与现代前端工具链构建，并尝试将 AI 融入开发全链路。详见[开发文档](.dev/docs/DEVELOPMENT.md)。欢迎提交建议或 PR。 diff --git a/natflow/Makefile b/natflow/Makefile index 182b10d4..d4ab5917 100644 --- a/natflow/Makefile +++ b/natflow/Makefile @@ -10,12 +10,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=natflow PKG_VERSION:=20260531 -PKG_RELEASE:=20 +PKG_RELEASE:=21 PKG_SOURCE:=$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/ptpt52/natflow.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=c1f7aae14a67a8a2f8edd9641c69ccf77654c42a +PKG_SOURCE_VERSION:=486646d3f0fc136db0a9e6caebe290400d18a8c8 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MAINTAINER:=Chen Minqiang PKG_LICENSE:=GPL-2.0 diff --git a/quickfile/Makefile b/quickfile/Makefile index 7da5841a..ff2321cc 100644 --- a/quickfile/Makefile +++ b/quickfile/Makefile @@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=quickfile -PKG_VERSION:=1.0.24 -PKG_RELEASE:=9 +PKG_VERSION:=1.0.25 +PKG_RELEASE:=10 PKG_SOURCE:=quickfile-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://r2.cooluc.com/source