From 551c52b25d34733c702f7b2c3ac337a132dfcb19223bcbbdd8b2fc3ea9e46e4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 3 Oct 2024 17:20:48 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main ipset revision
 606748f41a9a9a44c1a4a35203f6ea97

---
 ipset-7.17.tar.bz2 |  3 ---
 ipset-7.22.tar.bz2 |  3 +++
 ipset.changes      | 26 ++++++++++++++++++++++++++
 ipset.spec         |  5 +++--
 4 files changed, 32 insertions(+), 5 deletions(-)
 delete mode 100644 ipset-7.17.tar.bz2
 create mode 100644 ipset-7.22.tar.bz2

diff --git a/ipset-7.17.tar.bz2 b/ipset-7.17.tar.bz2
deleted file mode 100644
index fbc47fc..0000000
--- a/ipset-7.17.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:be49c9ff489dd6610cad6541e743c3384eac96e9f24707da7b3929d8f2ac64d8
-size 684983
diff --git a/ipset-7.22.tar.bz2 b/ipset-7.22.tar.bz2
new file mode 100644
index 0000000..a569a9d
--- /dev/null
+++ b/ipset-7.22.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6ac5a47c3ef9f4c67fcbdf55e791cbfe38eb0a4aa1baacd12646a140abacdd9
+size 694069
diff --git a/ipset.changes b/ipset.changes
index 6506bc9..a6d1ceb 100644
--- a/ipset.changes
+++ b/ipset.changes
@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Wed Jun  5 11:07:43 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.22
+  * ipset: fix json output format for IPSET_OPT_IP
+  * netfilter: ipset: Fix race between namespace cleanup and gc
+    in the list:set type
+
+-------------------------------------------------------------------
+Mon Feb 12 12:41:44 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.21
+  * Save mode was broken; this was repaired.
+
+-------------------------------------------------------------------
+Wed Jan 31 18:08:54 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.20
+  * Bash completion utility updated
+
+-------------------------------------------------------------------
+Thu Sep 21 07:10:20 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 7.19
+  * Add json output to list command
+
 -------------------------------------------------------------------
 Fri Dec 30 14:50:44 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/ipset.spec b/ipset.spec
index 0a61712..70c2608 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ipset
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -25,7 +25,7 @@
 %define ipset_build_kmp 0
 %endif
 Name:           ipset
-Version:        7.17
+Version:        7.22
 Release:        0
 Summary:        Netfilter ipset administration utility
 License:        GPL-2.0-only
@@ -57,6 +57,7 @@ addresses with MAC addresses in a way, which ensures lightning speed
 when matching an entry against a set.
 
 ipset can:
+
 * store multiple IP addresses or port numbers and match against the
   collection by iptables in one swoop;
 * dynamically update iptables rules against IP addresses or ports