From 1b290e56806691d324e52c2fc1a40d70efef9346 Mon Sep 17 00:00:00 2001 From: kenzok8 Date: Sat, 13 Sep 2025 16:00:46 +0800 Subject: [PATCH] update 2025-09-13 16:00:46 --- filebrowser/Makefile | 4 +- sing-box/Makefile | 128 ++++++++++++++++++++++++++----------------- 2 files changed, 79 insertions(+), 53 deletions(-) diff --git a/filebrowser/Makefile b/filebrowser/Makefile index 81e06d73d..ed55e9639 100644 --- a/filebrowser/Makefile +++ b/filebrowser/Makefile @@ -5,12 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=filebrowser -PKG_VERSION:=2.42.5 +PKG_VERSION:=2.43.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/filebrowser/filebrowser/tar.gz/v${PKG_VERSION}? -PKG_HASH:=2311adc3106fbc3d1f1b95c941c62c51e08eac8cda5da8a980634839d68b30cd +PKG_HASH:=9c3acee7567986ceef331e3eea0236b4dd9a41bf3874449fbb9bdc22c00a0aab PKG_LICENSE:=Apache-2.0 PKG_LICENSE_FILES:=LICENSE diff --git a/sing-box/Makefile b/sing-box/Makefile index 40790043c..0d67a0276 100644 --- a/sing-box/Makefile +++ b/sing-box/Makefile @@ -5,29 +5,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sing-box -PKG_VERSION:=1.12.7 -PKG_RELEASE:=1 +PKG_VERSION:=1.12.8 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/SagerNet/sing-box/tar.gz/v$(PKG_VERSION)? -PKG_HASH:=cf2c6b9782c95287720f5a64dfcc937b0d417df0168fcd358ccd58c324f2b924 +PKG_HASH:=4d3da19e0819fdc12740539512dc3455ea030747c2fa04171967715fb26ff775 PKG_LICENSE:=GPL-3.0-or-later PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Tianling Shen PKG_CONFIG_DEPENDS:= \ - CONFIG_SING_BOX_BUILD_ACME \ - CONFIG_SING_BOX_BUILD_CLASH_API \ - CONFIG_SING_BOX_BUILD_DHCP \ - CONFIG_SING_BOX_BUILD_EMBEDDED_TOR \ - CONFIG_SING_BOX_BUILD_GRPC \ - CONFIG_SING_BOX_BUILD_GVISOR \ - CONFIG_SING_BOX_BUILD_QUIC \ - CONFIG_SING_BOX_BUILD_TAILSCALE \ - CONFIG_SING_BOX_BUILD_UTLS \ - CONFIG_SING_BOX_BUILD_V2RAY_API \ - CONFIG_SING_BOX_BUILD_WIREGUARD + CONFIG_SING_BOX_TINY_BUILD_ACME \ + CONFIG_SING_BOX_TINY_BUILD_CLASH_API \ + CONFIG_SING_BOX_TINY_BUILD_DHCP \ + CONFIG_SING_BOX_TINY_BUILD_EMBEDDED_TOR \ + CONFIG_SING_BOX_TINY_BUILD_GRPC \ + CONFIG_SING_BOX_TINY_BUILD_GVISOR \ + CONFIG_SING_BOX_TINY_BUILD_QUIC \ + CONFIG_SING_BOX_TINY_BUILD_TAILSCALE \ + CONFIG_SING_BOX_TINY_BUILD_UTLS \ + CONFIG_SING_BOX_TINY_BUILD_V2RAY_API \ + CONFIG_SING_BOX_TINY_BUILD_WIREGUARD PKG_BUILD_DEPENDS:=golang/host PKG_BUILD_PARALLEL:=1 @@ -40,94 +40,118 @@ GO_PKG_LDFLAGS_X:=$(GO_PKG)/constant.Version=$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk -define Package/sing-box +define Package/sing-box/Default SECTION:=net CATEGORY:=Network SUBMENU:=Web Servers/Proxies TITLE:=The universal proxy platform URL:=https://sing-box.sagernet.org/ - DEPENDS:=$(GO_ARCH_DEPENDS) \ - +ca-bundle \ - +kmod-inet-diag \ - +kmod-netlink-diag \ - +SING_BOX_BUILD_GVISOR:kmod-tun + DEPENDS:=+ca-bundle +kmod-inet-diag USERID:=sing-box=5566:sing-box=5566 endef +define Package/sing-box + $(call Package/sing-box/Default) + TITLE+= (full version) + DEPENDS+= +kmod-netlink-diag +kmod-tun + CONFLICTS:=sing-box-tiny + VARIANT:=full + DEFAULT_VARIANT:=1 +endef + define Package/sing-box/description Sing-box is a universal proxy platform which supports hysteria, SOCKS, Shadowsocks, ShadowTLS, Tor, trojan, VLess, VMess, WireGuard and so on. endef define Package/sing-box/config - if PACKAGE_sing-box - config SING_BOX_BUILD_ACME - bool "Build with ACME TLS certificate issuer support" - default y + depends on $(subst @,,$(GO_ARCH_DEPENDS)) +endef - config SING_BOX_BUILD_CLASH_API +define Package/sing-box-tiny + $(call Package/sing-box/Default) + TITLE+= (tiny/custom version) + PROVIDES:=sing-box + VARIANT:=tiny +endef + +Package/sing-box-tiny/description:=$(Package/sing-box/description) + +define Package/sing-box-tiny/config + $(call Package/sing-box/config) + + if PACKAGE_sing-box-tiny + config SING_BOX_TINY_BUILD_ACME + bool "Build with ACME TLS certificate issuer support" + + config SING_BOX_TINY_BUILD_CLASH_API bool "Build with Clash API support" default y - config SING_BOX_BUILD_DHCP + config SING_BOX_TINY_BUILD_DHCP bool "Build with DHCP support" - config SING_BOX_BUILD_EMBEDDED_TOR + config SING_BOX_TINY_BUILD_EMBEDDED_TOR bool "Build with embedded Tor support" depends on BROKEN - config SING_BOX_BUILD_GRPC + config SING_BOX_TINY_BUILD_GRPC bool "Build with standard gPRC support" help Standard gRPC has good compatibility but poor performance. - config SING_BOX_BUILD_GVISOR + config SING_BOX_TINY_BUILD_GVISOR bool "Build with gVisor support" - default y + default y if aarch64||arm||i386||x86_64 - config SING_BOX_BUILD_QUIC + config SING_BOX_TINY_BUILD_QUIC bool "Build with QUIC support" default y help Required by HTTP3 DNS transports, Naive inbound, Hysteria inbound / outbound, and v2ray QUIC transport. - config SING_BOX_BUILD_TAILSCALE + config SING_BOX_TINY_BUILD_TAILSCALE bool "Build with Tailscale support" - default y - config SING_BOX_BUILD_UTLS + config SING_BOX_TINY_BUILD_UTLS bool "Build with uTLS support" default y - config SING_BOX_BUILD_V2RAY_API + config SING_BOX_TINY_BUILD_V2RAY_API bool "Build with V2Ray API support" - config SING_BOX_BUILD_WIREGUARD + config SING_BOX_TINY_BUILD_WIREGUARD bool "Build with WireGuard support" - default y + default y if aarch64||arm||i386||x86_64 endif endef -GO_PKG_TAGS:=$(subst $(space),$(comma),$(strip \ - $(if $(CONFIG_SING_BOX_BUILD_ACME),with_acme) \ - $(if $(CONFIG_SING_BOX_BUILD_CLASH_API),with_clash_api) \ - $(if $(CONFIG_SING_BOX_BUILD_DHCP),with_dhcp) \ - $(if $(CONFIG_SING_BOX_BUILD_EMBEDDED_TOR),with_embedded_tor) \ - $(if $(CONFIG_SING_BOX_BUILD_GRPC),with_grpc) \ - $(if $(CONFIG_SING_BOX_BUILD_GVISOR),with_gvisor) \ - $(if $(CONFIG_SING_BOX_BUILD_QUIC),with_quic) \ - $(if $(CONFIG_SING_BOX_BUILD_TAILSCALE),with_tailscale) \ - $(if $(CONFIG_SING_BOX_BUILD_UTLS),with_utls) \ - $(if $(CONFIG_SING_BOX_BUILD_V2RAY_API),with_v2ray_api) \ - $(if $(CONFIG_SING_BOX_BUILD_WIREGUARD),with_wireguard) \ -)) +ifeq ($(BUILD_VARIANT),full) + GO_PKG_TAGS:=with_acme,with_clash_api,with_dhcp,with_gvisor,with_quic,with_tailscale,with_utls,with_wireguard +else + GO_PKG_TAGS:=$(subst $(space),$(comma),$(strip \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_ACME),with_acme) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_CLASH_API),with_clash_api) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_DHCP),with_dhcp) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_EMBEDDED_TOR),with_embedded_tor) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_GRPC),with_grpc) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_GVISOR),with_gvisor) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_QUIC),with_quic) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_TAILSCALE),with_tailscale) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_UTLS),with_utls) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_V2RAY_API),with_v2ray_api) \ + $(if $(CONFIG_SING_BOX_TINY_BUILD_WIREGUARD),with_wireguard) \ + )) +endif define Package/sing-box/conffiles /etc/config/sing-box /etc/sing-box/ endef +Package/sing-box-tiny/conffiles=$(Package/sing-box/conffiles) + define Package/sing-box/install $(call GoPackage/Package/Install/Bin,$(1)) @@ -140,5 +164,7 @@ define Package/sing-box/install $(INSTALL_BIN) ./files/sing-box.init $(1)/etc/init.d/sing-box endef -$(eval $(call GoBinPackage,sing-box)) +Package/sing-box-tiny/install=$(Package/sing-box/install) + $(eval $(call BuildPackage,sing-box)) +$(eval $(call BuildPackage,sing-box-tiny))