From c24fda81bb69f4721344ef9b86d581450c66f693 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Fri, 2 Jul 2021 18:10:17 +0200
Subject: [PATCH] ipset-7.11-4.el9

- Improve deprecation notice a bit

Related: rhbz#1945190
---
 0001-Add-deprecation-notice-to-ipset.8.patch | 48 ++++++++++++++------
 ipset.spec                                   |  5 +-
 2 files changed, 38 insertions(+), 15 deletions(-)

diff --git a/0001-Add-deprecation-notice-to-ipset.8.patch b/0001-Add-deprecation-notice-to-ipset.8.patch
index a82fd9c..92ba754 100644
--- a/0001-Add-deprecation-notice-to-ipset.8.patch
+++ b/0001-Add-deprecation-notice-to-ipset.8.patch
@@ -1,28 +1,48 @@
-From f40f76687f6000c9d12f296ce2f2c2a89125b7e3 Mon Sep 17 00:00:00 2001
+From e9398b721855f8fbfb30a21d475d0aeb7f85bbe5 Mon Sep 17 00:00:00 2001
 From: Phil Sutter <psutter@redhat.com>
 Date: Fri, 25 Jun 2021 13:47:57 +0200
 Subject: [PATCH] Add deprecation notice to ipset.8
 
 This is RHEL9 trying to friendly kick people towards nftables.
 ---
- src/ipset.8 | 4 ++++
- 1 file changed, 4 insertions(+)
+ src/ipset.8 | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
 
 diff --git a/src/ipset.8 b/src/ipset.8
-index 97cece9fb04b5..ff20be93564a7 100644
+index 97cece9fb04b5..d68e9bbc22891 100644
 --- a/src/ipset.8
 +++ b/src/ipset.8
-@@ -1094,6 +1094,10 @@ they are automatically replaced by \fBhash:ip\fR type of sets.
- .SH "DIAGNOSTICS"
- Various error messages are printed to standard error.  The exit code
- is 0 for correct functioning.
-+.SH "NOTES"
-+This tool is deprecated in Red Hat Enterprise Linux. It is maintenance only and
-+will not receive new features. New setups should use \fBnft\fP(8). Existing
-+setups should migrate to \fBnft\fP(8) when possible.
- .SH "BUGS"
- Bugs? No, just funny features. :\-)
+@@ -51,6 +51,18 @@ COMMANDS := { \fBcreate\fR | \fBadd\fR | \fBdel\fR | \fBtest\fR | \fBdestroy\fR
+ .PP
+ \fBipset\fR \fB\-\fR
+ .SH "DESCRIPTION"
++This tool is
++.B deprecated
++in Red Hat Enterprise Linux. It is maintenance only and will not receive new
++features. New setups should use
++.BR nft (8).
++Existing setups should migrate to
++.BR nft (8)
++when possible. See
++.UR https://red.ht/nft_your_tables
++.UE
++for details.
++.PP
+ \fBipset\fR
+ is used to set up, maintain and inspect so called IP sets in the Linux
+ kernel. Depending on the type of the set, an IP set may store IP(v4/v6)
+@@ -1099,8 +1111,9 @@ Bugs? No, just funny features. :\-)
  OK, just kidding...
+ .SH "SEE ALSO"
+ \fBiptables\fR(8),
+-\fBip6tables\fR(8)
+-\fBiptables-extensions\fR(8)
++\fBip6tables\fR(8),
++\fBiptables-extensions\fR(8),
++\fBnft\fR(8)
+ .SH "AUTHORS"
+ Jozsef Kadlecsik wrote ipset, which is based on ippool by
+ Joakim Axelsson, Patrick Schaaf and Martin Josefsson.
 -- 
 2.31.1
 
diff --git a/ipset.spec b/ipset.spec
index b06f51e..66a3418 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,6 +1,6 @@
 Name:             ipset
 Version:          7.11
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Manage Linux IP sets
 
 License:          GPLv2
@@ -154,6 +154,9 @@ fi
 
 
 %changelog
+* Fri Jul 02 2021 Phil Sutter <psutter@redhat.com> - 7.11-4
+- Improve deprecation notice a bit
+
 * Fri Jun 25 2021 Phil Sutter <psutter@redhat.com> - 7.11-3
 - Add deprecation notice to ipset.8