shadowsocks-libev: ss-rules: Add 'auto-merge' flag to avoid conflicts

Link: https://github.com/openwrt/packages/pull/19872
Signed-off-by: Li Xin <i@crzidea.com>
(squash commits)
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit 8966f49f9a715e07527580c50ac29ae560447670)

diff --git a/net/shadowsocks-libev/Makefile b/net/shadowsocks-libev/Makefile
index d5072e51e035945d587030b8c51165f02c29ae32..fe6953e287e67215138c2b294525417c8abf47cc 100644 (file)
--- 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 5947f6ccd6c76d232124151824b1cf9a4e83f20d..38140e7e1eb9587dd6a8e28adefede18403654a0 100644 (file)
--- 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++): %}