Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Li Xin 2022-11-10 12:10:05 +08:00 committed by Yousong Zhou
parent 4e3e37d072
commit 8966f49f9a
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/shadowsocks-libev/Makefile
View file

@ -14,7 +14,7 @@ include $(TOPDIR)/rules.mk
# #
PKG_NAME:=shadowsocks-libev PKG_NAME:=shadowsocks-libev
PKG_VERSION:=3.3.5 PKG_VERSION:=3.3.5
PKG_RELEASE:=7 PKG_RELEASE:=8
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION)

1
net/shadowsocks-libev/files/ss-rules/set.uc
View file

@ -102,6 +102,7 @@ function set_elements(suf, af) {
set {{ set_name(suf, af) }} { set {{ set_name(suf, af) }} {
type ipv{{af}}_addr; type ipv{{af}}_addr;
flags interval; flags interval;
auto-merge;
{% let elems = set_elements(suf, af); if (length(elems)): %} {% let elems = set_elements(suf, af); if (length(elems)): %}
elements = { elements = {
{% for (let i = 0; i < length(elems); i++): %} {% for (let i = 0; i < length(elems); i++): %}