diff --git a/dockerd/patches/001-libdevmapper_name_fix.patch b/dockerd/patches/001-libdevmapper_name_fix.patch deleted file mode 100644 index b9b0a6b8c..000000000 --- a/dockerd/patches/001-libdevmapper_name_fix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/hack/make.sh -+++ b/hack/make.sh -@@ -95,7 +95,7 @@ fi - # with a newer libdevmapper than the one it was built with. - if - command -v gcc &> /dev/null \ -- && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(pkg-config --libs devmapper) &> /dev/null) \ -+ && ! (echo -e '#include \nint main() { dm_task_deferred_remove(NULL); }' | gcc -xc - -o /dev/null $(pkg-config --libs libdevmapper) &> /dev/null) \ - ; - then - add_buildtag libdm dlsym_deferred_remove diff --git a/luci-app-ssr-plus/Makefile b/luci-app-ssr-plus/Makefile index 38a3d7e58..82e06b3e7 100644 --- a/luci-app-ssr-plus/Makefile +++ b/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=188 -PKG_RELEASE:=3 +PKG_RELEASE:=5 PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_NONE_V2RAY \ @@ -32,10 +32,12 @@ PKG_CONFIG_DEPENDS:= \ LUCI_TITLE:=SS/SSR/V2Ray/Trojan/NaiveProxy/Tuic/ShadowTLS/Hysteria/Socks5/Tun LuCI interface LUCI_PKGARCH:=all LUCI_DEPENDS:= \ - @(PACKAGE_libustream-mbedtls||PACKAGE_libustream-openssl||PACKAGE_libustream-wolfssl) \ +coreutils +coreutils-base64 +dns2socks +dns2tcp +dnsmasq-full +@PACKAGE_dnsmasq_full_ipset +ipset +kmod-ipt-nat \ +ip-full +iptables +iptables-mod-tproxy +lua +lua-neturl +libuci-lua +microsocks \ +tcping +resolveip +shadowsocksr-libev-ssr-check +uclient-fetch \ + +PACKAGE_$(PKG_NAME)_INCLUDE_libustream-mbedtls:libustream-mbedtls \ + +PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl:libustream-openssl \ + +PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl:libustream-wolfssl \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:curl \ +PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray-core \ +PACKAGE_$(PKG_NAME)_INCLUDE_Xray:curl \ @@ -61,9 +63,24 @@ LUCI_DEPENDS:= \ +PACKAGE_$(PKG_NAME)_INCLUDE_ShadowsocksR_Libev_Server:shadowsocksr-libev-ssr-server \ +PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan + define Package/$(PKG_NAME)/config select PACKAGE_luci-lib-ipkg if PACKAGE_$(PKG_NAME) +choice + prompt "Uclient SSL Lib Selection" + default PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl + + config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-mbedtls + bool "libustream-mbedtls" + + config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl + bool "libustream-openssl" + + config PACKAGE_$(PKG_NAME)_INCLUDE_PACKAGE_libustream-wolfssl + bool "libustream-wolfssl" +endchoice + choice prompt "Shadowsocks Client Selection" default PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks_Rust_Client if aarch64 || x86_64 @@ -180,8 +197,10 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan bool "Include Trojan" select PACKAGE_$(PKG_NAME)_INCLUDE_IPT2Socks default n + endef + define Package/$(PKG_NAME)/conffiles /etc/config/shadowsocksr /etc/ssrplus/