update 2026-11-08 19:04:57

honk/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=honk
-PKG_VERSION:=2026.11.08.1
+PKG_VERSION:=2026.11.08.2
 PKG_RELEASE:=1
 
 # Pinned honk-core revision (upstream daeuniverse/honk main), cross-compiled by

honk/files/honk.init

@@ -75,6 +75,12 @@ start_service() {
 # procd 默认的 stop→start 太快，start 的 preflight 会把还没清掉的 dae0 当残留
 # 拒绝，restart 完服务就停在停止状态。走 lifecycle 先排空再起。
 restart() {
+	# 没启用时 start 本来就会拒绝，走 lifecycle 只会多打一句误导性的
+	# “new managed core did not become stable and own its API listener”。
+	if [ "$(uci get honk.main.enabled 2>/dev/null)" != 1 ]; then
+		logger -t honk "restart skipped: service is not enabled"
+		return 0
+	fi
 	. /usr/share/honk/lifecycle.sh || return 1
 	honk_lifecycle_restart 30
 }

luci-app-honk/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-honk
-PKG_VERSION:=2026.11.08.1
+PKG_VERSION:=2026.11.08.2
 PKG_RELEASE:=1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

luci-app-honk/root/usr/share/luci-app-honk/update-pkg.sh

@@ -74,11 +74,16 @@ fi
 	trap 'rm -f "$LOCK"; [ "${0#/tmp/.honk-upd-}" != "$0" ] && rm -f "$0"' EXIT INT TERM
 
 	echo "$(date '+%F %T') begin upgrade: $PKG"
-	if [ "$(jsonfilter -i /usr/share/honk/core-capabilities.json -e '@.lane' 2>/dev/null)" = linux66 ]; then
+	# 按包管理器/内核目标判断，而不是按车道一律拒绝：24.10 的源本身就是 6.6 通道，
-		echo "result: 实验兼容版请从独立兼容通道手动更新，暂不使用稳定源升级"
+	# 一律拒绝会把这条通道自己的更新也挡掉。
-		echo "✗"
+	core_lane=$(jsonfilter -i /usr/share/honk/core-capabilities.json -e '@.lane' 2>/dev/null)
-		exit 1
+	case "$core_lane:$(command -v apk >/dev/null 2>&1 && echo apk || echo opkg)" in
-	fi
+		linux66:apk|stable:opkg)
+			echo "result: 当前核心与软件源不是同一条通道（$core_lane + $(command -v apk >/dev/null 2>&1 && echo APK || echo IPK)），已拒绝升级"
+			echo "✗"
+			exit 1
+			;;
+	esac
 	was_running=0
 	service_running && was_running=1
 	echo "升级前服务状态: $([ "$was_running" = 1 ] && echo 运行中 || echo 已停止)"

luci-app-passwall/luasrc/view/passwall/app_update/app_version.htm

@@ -336,6 +336,17 @@ local com = self.com
 		font-weight: normal;
 		opacity: .7;
 	}
+	/* Keep action controls out of theme help-text folding. */
+	#app_version .app-update-actions {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: .5rem;
+	}
+	#app_version .app-update-actions > span {
+		min-width: 0;
+		overflow-wrap: anywhere;
+	}
 </style>
 
 <div class="cbi-value">
@@ -343,13 +354,13 @@ local com = self.com
 		<span class="app-version-sub"><%=api.get_version()%></span>
 	</label>
 	<div class="cbi-value-field">
-		<!--div class="cbi-value-description"-->
+		<div class="app-update-actions">
 			<input class="btn cbi-button cbi-button-apply" type="button" id="<%=api.appname%>-check_btn" data-update-app="<%=api.appname%>"
 				onclick="onBtnClick(this, appname);" value="<%:Check update%>" />
 			<input class="btn cbi-button cbi-button-apply" type="button" id="_<%=api.appname%>-force_btn" data-update-app="<%=api.appname%>"
 				onclick="doUpdate(this, appname);" value="<%:Force update%>" style="display:none" />
 			<span id="<%=api.appname%>-check_btn-detail"></span>
-		<!--/div-->
+		</div>
 	</div>
 </div>
 
@@ -362,13 +373,13 @@ local com = self.com
 		<span class="app-version-sub"><span class="com_version" key="<%=k%>"><%=translate("Null")%></span></span>
 	</label>
 	<div class="cbi-value-field">
-		<!--div class="cbi-value-description"-->
+		<div class="app-update-actions">
 			<input class="btn cbi-button cbi-button-apply" type="button" id="_<%=k%>-check_btn" data-update-app="<%=k%>"
 				onclick="onBtnClick(this,'<%=k%>');" value="<%:Check update%>" />
 			<input class="btn cbi-button cbi-button-apply" type="button" id="_<%=k%>-force_btn" data-update-app="<%=k%>"
 				onclick="doUpdate(this,'<%=k%>');" value="<%:Force update%>" style="display:none"/>
 			<span id="_<%=k%>-check_btn-detail"></span>
-		<!--/div-->
+		</div>
 	</div>
 </div>
 <%end%>

luci-app-passwall2/luasrc/view/passwall2/app_update/app_version.htm

@@ -344,6 +344,17 @@ local com = self.com
 		font-weight: normal;
 		opacity: .7;
 	}
+	/* Keep action controls out of theme help-text folding. */
+	#app_version .app-update-actions {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		gap: .5rem;
+	}
+	#app_version .app-update-actions > span {
+		min-width: 0;
+		overflow-wrap: anywhere;
+	}
 </style>
 
 <div class="cbi-value">
@@ -351,7 +362,7 @@ local com = self.com
 		<span class="app-version-sub"><%=api.get_version()%></span>
 	</label>
 	<div class="cbi-value-field">
-		<div class="cbi-value-description">
+		<div class="app-update-actions">
 			<input class="btn cbi-button cbi-button-apply" type="button" id="<%=api.appname%>-check_btn" data-update-app="<%=api.appname%>"
 				onclick="onBtnClick(this, appname);" value="<%:Check update%>" />
 			<input class="btn cbi-button cbi-button-apply" type="button" id="_<%=api.appname%>-force_btn" data-update-app="<%=api.appname%>"
@@ -370,7 +381,7 @@ local com = self.com
 		<span class="app-version-sub"><span class="com_version" key="<%=k%>"><%=translate("Null")%></span></span>
 	</label>
 	<div class="cbi-value-field">
-		<div class="cbi-value-description">
+		<div class="app-update-actions">
 			<input class="btn cbi-button cbi-button-apply" type="button" id="_<%=k%>-check_btn" data-update-app="<%=k%>"
 				onclick="onBtnClick(this,'<%=k%>');" value="<%:Check update%>" />
 			<input class="btn cbi-button cbi-button-apply" type="button" id="_<%=k%>-force_btn" data-update-app="<%=k%>"

v2ray-geodata/Makefile

@@ -12,7 +12,7 @@ PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
 
 include $(INCLUDE_DIR)/package.mk
 
-GEOIP_VER:=202611050539
+GEOIP_VER:=202611080027
 GEOIP_FILE:=geoip.dat.$(GEOIP_VER)
 define Download/geoip
   URL:=https://github.com/v2fly/geoip/releases/download/$(GEOIP_VER)/
@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=eedb24b3b9fcba27e06b92c0428dab90d9496083091ae4cf39e11387fd99d0e2
 endef
 
-GEOSITE_VER:=20261107193411
+GEOSITE_VER:=20261108011013
 GEOSITE_FILE:=dlc.dat.$(GEOSITE_VER)
 define Download/geosite
   URL:=https://github.com/v2fly/domain-list-community/releases/download/$(GEOSITE_VER)/
   URL_FILE:=dlc.dat
   FILE:=$(GEOSITE_FILE)
-  HASH:=3cfc831cba5fa501698c0ff29bce98b7b55d9fbc693a517f7c88e459e10c5e88
+  HASH:=dc4192dd1b644a38276ed06136d26e729fa674d25785adb38c87e040e92376b2
 endef
 
 GEOSITE_IRAN_VER:=202610230802