From 185c4ea8c0b6a59085951a12d59e719102a31d96 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Tue, 22 Nov 2022 08:58:09 +0100 Subject: [PATCH] ipset: update to 7.16 Release Notes: https://lore.kernel.org/netfilter-devel/d65fe5d8-d5ea-ef7-102d-aa1d15bb4d69@netfilter.org/T/#u Patch "0001-lib-ipset-fix-printf-warning.patch" replaced upstream by: http://git.netfilter.org/ipset/commit/?id=e39e3466d2d38cdfe83447f391b550e607bc3ce8 Remove upstreamed: - 0002-Fix-IPv6-sets-nftables-translation.patch Signed-off-by: Nick Hainke --- package/network/utils/ipset/Makefile | 4 ++-- .../patches/0001-lib-ipset-fix-printf-warning.patch | 11 ----------- 2 files changed, 2 insertions(+), 13 deletions(-) delete mode 100644 package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile index b522f5124..be407f016 100644 --- a/package/network/utils/ipset/Makefile +++ b/package/network/utils/ipset/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=ipset -PKG_VERSION:=7.15 +PKG_VERSION:=7.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://ipset.netfilter.org -PKG_HASH:=0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751 +PKG_HASH:=87b1d9cdf4a1de3d1d0671e7da33e111eb65087e65ad75268b22bf13f0f296d0 PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch b/package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch deleted file mode 100644 index 90dfacab8..000000000 --- a/package/network/utils/ipset/patches/0001-lib-ipset-fix-printf-warning.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/ipset.c -+++ b/lib/ipset.c -@@ -1847,7 +1847,7 @@ static int ipset_xlate(struct ipset *ips - return -1; - case IPSET_CMD_LIST: - if (!set) { -- printf("list sets %s\n", -+ printf("list sets %s %s\n", - ipset_xlate_family(family), table); - } else { - printf("list set %s %s %s\n",