From 24a1fdb2459ef674fc2c3645bd50304b39dc59a1 Mon Sep 17 00:00:00 2001
From: action <actions@github.com>
Date: Sun, 17 May 2026 14:41:26 +0800
Subject: [PATCH] update 2026-05-17 14:41:26

---
 gn/Makefile                                   |  2 +-
 .../cbi/passwall/server/type/hysteria2.lua    |  1 +
 shadowsocks-libev/Makefile                    | 74 ++++++++++++-------
 3 files changed, 51 insertions(+), 26 deletions(-)

diff --git a/gn/Makefile b/gn/Makefile
index d860013f..dbcba070 100644
--- a/gn/Makefile
+++ b/gn/Makefile
@@ -11,7 +11,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://gn.googlesource.com/gn.git
 PKG_SOURCE_DATE:=2026-05-11
 PKG_SOURCE_VERSION:=068dd892acb22dc21d9e17691266c8499ba2d6c8
-PKG_MIRROR_HASH:=59b79363d17069ed121106c7fc1b7e24792a4d64d68ccd35c47a75e8a0ded82d
+PKG_MIRROR_HASH:=21738e255e5cc63aac72d61e017043cf00c9ae9a98b7f2ae82577b7456e7d09e
 
 PKG_LICENSE:=BSD 3-Clause
 PKG_LICENSE_FILES:=LICENSE
diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/hysteria2.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/hysteria2.lua
index 89135cd6..d015a8af 100644
--- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/hysteria2.lua
+++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/hysteria2.lua
@@ -24,6 +24,7 @@ o = s:option(Flag, _n("custom"), translate("Use Custom Config"))
 
 o = s:option(Value, _n("port"), translate("Listen Port"))
 o.datatype = "port"
+o.rmempty = false
 o:depends({ [_n("custom")] = false })
 
 o = s:option(Flag, _n("realms"), translate("Realms"))
diff --git a/shadowsocks-libev/Makefile b/shadowsocks-libev/Makefile
index 75996cbb..0d586097 100644
--- a/shadowsocks-libev/Makefile
+++ b/shadowsocks-libev/Makefile
@@ -18,9 +18,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev.git
-PKG_SOURCE_DATE:=2026-2-9
+PKG_SOURCE_DATE:=2026-02-09
 PKG_SOURCE_VERSION:=c5e8788013a37afe54ea1c2b7c03395cccc663cf
-PKG_MIRROR_HASH:=54418f553d166d596b07c7de1f34758be2d62948769d89029d9ccfc661b0b491
+PKG_MIRROR_HASH:=96d0b486a0c8dbb2acf2af56534f6c765565c127c3695c98b5157b24993a4839
 
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
 
@@ -45,30 +45,54 @@ CMAKE_OPTIONS += \
 	-DENABLE_NFTABLES=OFF
 
 define Package/shadowsocks-libev/Default
-  define Package/shadowsocks-libev-$(1)
-    SECTION:=net
-    CATEGORY:=Network
-    SUBMENU:=Web Servers/Proxies
-    TITLE:=shadowsocks-libev $(1)
-    URL:=https://github.com/shadowsocks/shadowsocks-libev
-    DEPENDS:=+libev +libmbedtls +libpthread +libsodium +libcares +libpcre2
-  endef
-
-  define Package/shadowsocks-libev-$(1)/install
-	$$(INSTALL_DIR) $$(1)/usr/bin
-	$$(INSTALL_BIN) $$(PKG_INSTALL_DIR)/usr/bin/$(1) $$(1)/usr/bin
-  endef
-
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  URL:=https://github.com/shadowsocks/shadowsocks-libev
+  DEPENDS:=+libev +libmbedtls +libpthread +libsodium +libcares +libpcre2
 endef
 
-SHADOWSOCKS_COMPONENTS:=ss-local ss-redir ss-tunnel ss-server
-define shadowsocks-libev/templates
-  $(foreach component,$(SHADOWSOCKS_COMPONENTS),
-    $(call Package/shadowsocks-libev/Default,$(component))
-  )
+define Package/shadowsocks-libev-ss-local
+  $(call Package/shadowsocks-libev/Default)
+  TITLE:=shadowsocks-libev ss-local
 endef
-$(eval $(call shadowsocks-libev/templates))
 
-$(foreach component,$(SHADOWSOCKS_COMPONENTS), \
-  $(eval $(call BuildPackage,shadowsocks-libev-$(component))) \
-)
+define Package/shadowsocks-libev-ss-redir
+  $(call Package/shadowsocks-libev/Default)
+  TITLE:=shadowsocks-libev ss-redir
+endef
+
+define Package/shadowsocks-libev-ss-tunnel
+  $(call Package/shadowsocks-libev/Default)
+  TITLE:=shadowsocks-libev ss-tunnel
+endef
+
+define Package/shadowsocks-libev-ss-server
+  $(call Package/shadowsocks-libev/Default)
+  TITLE:=shadowsocks-libev ss-server
+endef
+
+define Package/shadowsocks-libev-ss-local/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ss-local $(1)/usr/bin
+endef
+
+define Package/shadowsocks-libev-ss-redir/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ss-redir $(1)/usr/bin
+endef
+
+define Package/shadowsocks-libev-ss-tunnel/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ss-tunnel $(1)/usr/bin
+endef
+
+define Package/shadowsocks-libev-ss-server/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ss-server $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,shadowsocks-libev-ss-local))
+$(eval $(call BuildPackage,shadowsocks-libev-ss-redir))
+$(eval $(call BuildPackage,shadowsocks-libev-ss-tunnel))
+$(eval $(call BuildPackage,shadowsocks-libev-ss-server))