From 9f4253df4d2bab58142116d45fc2623b006aed6d Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Thu, 28 Apr 2022 03:09:51 +0000 Subject: [PATCH] shadowsocks-libev: fix compat issue with newer version of ucode Reported-by: Huangbin Zhan Signed-off-by: Yousong Zhou (cherry picked from commit 93162b35c833569243592e650957cc66e45269fe) --- net/shadowsocks-libev/Makefile | 2 +- net/shadowsocks-libev/files/shadowsocks-libev.init | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index 1a76d67fe..7ef1706d3 100644 --- a/net/shadowsocks-libev/Makefile +++ b/net/shadowsocks-libev/Makefile @@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=shadowsocks-libev PKG_VERSION:=3.3.5 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) diff --git a/net/shadowsocks-libev/files/shadowsocks-libev.init b/net/shadowsocks-libev/files/shadowsocks-libev.init index be72a9f66..d0bfde71f 100644 --- a/net/shadowsocks-libev/files/shadowsocks-libev.init +++ b/net/shadowsocks-libev/files/shadowsocks-libev.init @@ -156,7 +156,7 @@ ss_rules() { json_add_string o_nft_udp_extra "$nft_udp_extra" json_dump -i >"$tmp.json" - if ucode -S -i "$ssrules_uc" -E "$tmp.json" >"$tmp.nft" \ + if utpl -S -F "$tmp.json" "$ssrules_uc" >"$tmp.nft" \ && ! cmp -s "$tmp.nft" "$ssrules_nft"; then echo "table inet chk {include \"$tmp.nft\";}" >"$tmp.nft.chk" if nft -f "$tmp.nft.chk" -c; then