diff --git a/docker/Makefile b/docker/Makefile
index 82a5fa02..de9d7040 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=docker
-PKG_VERSION:=29.5.3
+PKG_VERSION:=29.6.0-rc.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/docker/cli/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=7608d82f33ce0ebbbed5bf8f6997319375c30a46d325496f3e8974c9a0c8ce6b
+PKG_HASH:=d9c8575b73281f019cd91aeb01a9d25400eebff96a992f9c333cfc54289c2e1d
 PKG_BUILD_DIR:=$(BUILD_DIR)/cli-$(PKG_VERSION)
 PKG_GIT_SHORT_COMMIT:=$(shell $(CURDIR)/git-short-commit.sh 'github.com/docker/cli' 'v$(PKG_VERSION)' '$(TMP_DIR)/git-short-commit/$(PKG_NAME)-$(PKG_VERSION)')
 
diff --git a/luci-app-log/htdocs/luci-static/resources/view/log-viewer/log-base.js b/luci-app-log/htdocs/luci-static/resources/view/log-viewer/log-base.js
index d0e31fda..b34c8574 100644
--- a/luci-app-log/htdocs/luci-static/resources/view/log-viewer/log-base.js
+++ b/luci-app-log/htdocs/luci-static/resources/view/log-viewer/log-base.js
@@ -302,12 +302,15 @@ return baseclass.extend({
 		actionButtons        : [],
 
 		htmlEntities(str) {
+			/*
 			return String(str).replace(
 				/&/g, '&').replace(
 				/</g, '&#60;').replace(
 				/>/g, '&#62;').replace(
 				/"/g, '&#34;').replace(
 				/'/g, '&#39;');
+			*/
+			return str;
 		},
 
 		checkZeroValue(value) {
diff --git a/v2ray-geodata/Makefile b/v2ray-geodata/Makefile
index 85a0db2e..21963352 100644
--- a/v2ray-geodata/Makefile
+++ b/v2ray-geodata/Makefile
@@ -21,13 +21,13 @@ define Download/geoip
   HASH:=a322dfb6bfd8987c83453c39582a07771c9deddf9f8f7d2d19c7927ebd5e76c8
 endef
 
-GEOSITE_VER:=20260612102123
+GEOSITE_VER:=20260612151339
 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:=843c2f1c6c7783594b1163dc5d7998f4c0f175b3ffc509fc7433c426effeddf2
+  HASH:=b0c1d450d422766f72ca63674cb166a91b555acb55469472ba544375bccce9a8
 endef
 
 GEOSITE_IRAN_VER:=202606080206