From f000177fa889c948bf42dc6611c634ee53b166a4 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Thu, 10 Oct 2024 15:56:46 +0200
Subject: [PATCH] ipset-7.22-4

- Add legacy actions for service save support
- ipset-services to depend on iptables-nft-services
- Require kernel-modules-extra

Resolves: RHEL-59734, RHEL-60899
---
 ipset.save-legacy |  2 ++
 ipset.spec        | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 ipset.save-legacy

diff --git a/ipset.save-legacy b/ipset.save-legacy
new file mode 100644
index 0000000..39db1cf
--- /dev/null
+++ b/ipset.save-legacy
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec /usr/libexec/ipset/ipset.start-stop save
diff --git a/ipset.spec b/ipset.spec
index 148f385..ef2f700 100644
--- a/ipset.spec
+++ b/ipset.spec
@@ -1,6 +1,9 @@
+# service legacy actions
+%define legacy_actions %{_libexecdir}/initscripts/legacy-actions
+
 Name:             ipset
 Version:          7.22
-Release:          3%{?dist}
+Release:          4%{?dist}
 Summary:          Manage Linux IP sets
 
 License:          GPL-2.0-only
@@ -9,6 +12,7 @@ Source0:          %{url}/%{name}-%{version}.tar.bz2
 Source1:          %{name}.service
 Source2:          %{name}.start-stop
 Source3:          %{name}-config
+Source4:          %{name}.save-legacy
 
 Patch001:         0001-Replace-BUG_ON-with-WARN_ON_ONCE-according-to-usage-.patch
 Patch002:         0002-lib-data-Fix-for-global-buffer-overflow-warning-by-A.patch
@@ -25,6 +29,8 @@ BuildRequires:    libtool-ltdl-devel
 # An explicit requirement is needed here, to avoid cases where a user would
 # explicitly update only one of the two (e.g 'yum update ipset')
 Requires:         %{name}-libs%{?_isa} = %{version}-%{release}
+# RHEL10 moved ipset-specific kernel modules into extra package
+Requires:         kernel-modules-extra
 
 %description
 IP sets are a framework inside the Linux kernel since version 2.4.x, which can
@@ -64,7 +70,7 @@ libraries.
 Summary:          %{name} service for %{name}s
 Requires:         %{name} = %{version}-%{release}
 BuildRequires:    systemd
-Requires:         iptables-services
+Requires:         iptables-nft-services
 Requires(post):   systemd
 Requires(preun):  systemd
 Requires(postun): systemd
@@ -110,6 +116,10 @@ install -c -m 755 %{SOURCE2} %{buildroot}%{_libexecdir}/%{name}
 install -d -m 755 %{buildroot}%{_sysconfdir}/sysconfig
 install -c -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-config
 
+# install legacy actions for service command
+install -d %{buildroot}/%{legacy_actions}/ipset
+install -c -m 755 %{SOURCE4} %{buildroot}/%{legacy_actions}/ipset/save
+
 # Create directory for configuration
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 
@@ -176,9 +186,16 @@ fi
 %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/ipset-config
 %ghost %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sysconfig/ipset
 %attr(0755,root,root) %{_libexecdir}/%{name}/%{name}.start-stop
+%dir %{legacy_actions}/ipset
+%{legacy_actions}/ipset/save
 
 
 %changelog
+* Thu Oct 10 2024 Phil Sutter <psutter@redhat.com> - 7.22-4
+- Add legacy actions for service save support
+- ipset-services to depend on iptables-nft-services
+- Require kernel-modules-extra
+
 * Tue Sep 10 2024 Phil Sutter <psutter@redhat.com> - 7.22-3
 - Bump release to trigger CI