From 8966f49f9a715e07527580c50ac29ae560447670 Mon Sep 17 00:00:00 2001 From: Li Xin Date: Thu, 10 Nov 2022 12:10:05 +0800 Subject: [PATCH] shadowsocks-libev: ss-rules: Add 'auto-merge' flag to avoid conflicts Link: https://github.com/openwrt/packages/pull/19872 Signed-off-by: Li Xin (squash commits) Signed-off-by: Yousong Zhou --- net/shadowsocks-libev/Makefile | 2 +- net/shadowsocks-libev/files/ss-rules/set.uc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile index d5072e51e0..fe6953e287 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:=7 +PKG_RELEASE:=8 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/ss-rules/set.uc b/net/shadowsocks-libev/files/ss-rules/set.uc index 5947f6ccd6..38140e7e1e 100644 --- a/net/shadowsocks-libev/files/ss-rules/set.uc +++ b/net/shadowsocks-libev/files/ss-rules/set.uc @@ -102,6 +102,7 @@ function set_elements(suf, af) { set {{ set_name(suf, af) }} { type ipv{{af}}_addr; flags interval; + auto-merge; {% let elems = set_elements(suf, af); if (length(elems)): %} elements = { {% for (let i = 0; i < length(elems); i++): %} -- 2.30.2