diff --git a/0001-Add-deprecation-notice-to-ipset.8.patch b/0001-Add-deprecation-notice-to-ipset.8.patch new file mode 100644 index 0000000..a82fd9c --- /dev/null +++ b/0001-Add-deprecation-notice-to-ipset.8.patch @@ -0,0 +1,28 @@ +From f40f76687f6000c9d12f296ce2f2c2a89125b7e3 Mon Sep 17 00:00:00 2001 +From: Phil Sutter +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(+) + +diff --git a/src/ipset.8 b/src/ipset.8 +index 97cece9fb04b5..ff20be93564a7 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. :\-) + OK, just kidding... +-- +2.31.1 + diff --git a/0001-build-do-install-libipset-args.h.patch b/0001-build-do-install-libipset-args.h.patch deleted file mode 100644 index c2f8edf..0000000 --- a/0001-build-do-install-libipset-args.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 39fde1381f0ba9101f65c08f2abda5426a46f8b1 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 22 Jan 2018 22:50:33 +0100 -Subject: [PATCH] build: do install libipset/args.h - -libipset/types.h includes args.h, therefore args.h must be installed -too. - -Signed-off-by: Jan Engelhardt -Signed-off-by: Jozsef Kadlecsik ---- - include/libipset/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/libipset/Makefile.am b/include/libipset/Makefile.am -index 3b47518..79a1357 100644 ---- a/include/libipset/Makefile.am -+++ b/include/libipset/Makefile.am -@@ -1,5 +1,6 @@ - pkgincludedir = ${includedir}/libipset - pkginclude_HEADERS = \ -+ args.h \ - data.h \ - errcode.h \ - linux_ip_set_bitmap.h \ --- -2.11.0 - diff --git a/ipset.spec b/ipset.spec index cb934a6..b06f51e 100644 --- a/ipset.spec +++ b/ipset.spec @@ -1,6 +1,6 @@ Name: ipset Version: 7.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Manage Linux IP sets License: GPLv2 @@ -9,6 +9,8 @@ Source0: %{url}/%{name}-%{version}.tar.bz2 Source1: %{name}.service Source2: %{name}.start-stop +Patch1: 0001-Add-deprecation-notice-to-ipset.8.patch + BuildRequires: libmnl-devel BuildRequires: automake BuildRequires: autoconf @@ -152,6 +154,9 @@ fi %changelog +* Fri Jun 25 2021 Phil Sutter - 7.11-3 +- Add deprecation notice to ipset.8 + * Fri Apr 16 2021 Mohan Boddu - 7.11-2 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937