Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

- Turn absolute ipset-translate symlink into a relative one
- Rebase onto v7.22 plus fixes

0001-Fix-typo-in-ipset-translate-man-page.patch

@@ -1,31 +0,0 @@
-From c74a420471fd693f89e0b0e19f93c88af22fb7de Mon Sep 17 00:00:00 2001
-From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
-Date: Wed, 29 Sep 2021 09:55:43 +0200
-Subject: [PATCH] Fix typo in ipset-translate man page
-
-originally reported in
-https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/ZIXKNQHSSCQ4ZLEGYYKLAXQ4PQ5EYFGZ/
-by Larry Len Rainey
-
-Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- src/ipset-translate.8 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ipset-translate.8 b/src/ipset-translate.8
-index bb4e737e1480..55ce2a99f2cf 100644
---- a/src/ipset-translate.8
-+++ b/src/ipset-translate.8
-@@ -33,7 +33,7 @@ to \fBnftables(8)\fP.
- The only available command is:
- 
- .IP \[bu] 2
--ipset-translate restores < file.ipt
-+ipset-translate restore < file.ipt
- 
- .SH USAGE
- The \fBipset-translate\fP tool reads an IP sets file in the syntax produced by
--- 
-2.37.2
-

0001-build-do-install-libipset-args.h.patch

@@ -1,28 +0,0 @@
-From 39fde1381f0ba9101f65c08f2abda5426a46f8b1 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-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 <jengelh@inai.de>
-Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
----
- 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
-

0002-Fix-IPv6-sets-nftables-translation.patch

@@ -1,91 +0,0 @@
-From be7f6099feb7b5d34715b06f9308877cdcdc404a Mon Sep 17 00:00:00 2001
-From: Pablo Neira Ayuso <pablo@netfilter.org>
-Date: Mon, 28 Feb 2022 19:52:57 +0100
-Subject: [PATCH] Fix IPv6 sets nftables translation
-
-The parser assumes the set is an IPv4 ipset because IPSET_OPT_FAMILY is
-not set.
-
- # ipset-translate restore < ./ipset-mwan3_set_connected_ipv6.dump
- add table inet global
- add set inet global mwan3_connected_v6 { type ipv6_addr; flags interval; }
- flush set inet global mwan3_connected_v6
- ipset v7.15: Error in line 4: Syntax error: '64' is out of range 0-32
-
-Remove ipset_xlate_type_get(), call ipset_xlate_set_get() instead to
-obtain the set type and family.
-
-Reported-by: Florian Eckert <fe@dev.tdt.de>
-Fixes: 325af556cd3a ("add ipset to nftables translation infrastructure")
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- lib/ipset.c             | 24 ++++++++++--------------
- tests/xlate/xlate.t     |  2 ++
- tests/xlate/xlate.t.nft |  2 ++
- 3 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/lib/ipset.c b/lib/ipset.c
-index 73e67db88e0d..50f86aee045b 100644
---- a/lib/ipset.c
-+++ b/lib/ipset.c
-@@ -949,18 +949,6 @@ ipset_xlate_set_get(struct ipset *ipset, const char *name)
- 	return NULL;
- }
- 
--static const struct ipset_type *ipset_xlate_type_get(struct ipset *ipset,
--						     const char *name)
--{
--	const struct ipset_xlate_set *set;
--
--	set = ipset_xlate_set_get(ipset, name);
--	if (!set)
--		return NULL;
--
--	return set->type;
--}
--
- static int
- ipset_parser(struct ipset *ipset, int oargc, char *oargv[])
- {
-@@ -1282,8 +1270,16 @@ ipset_parser(struct ipset *ipset, int oargc, char *oargv[])
- 		if (!ipset->xlate) {
- 			type = ipset_type_get(session, cmd);
- 		} else {
--			type = ipset_xlate_type_get(ipset, arg0);
--			ipset_session_data_set(session, IPSET_OPT_TYPE, type);
-+			const struct ipset_xlate_set *xlate_set;
-+
-+			xlate_set = ipset_xlate_set_get(ipset, arg0);
-+			if (xlate_set) {
-+				ipset_session_data_set(session, IPSET_OPT_TYPE,
-+						       xlate_set->type);
-+				ipset_session_data_set(session, IPSET_OPT_FAMILY,
-+						       &xlate_set->family);
-+				type = xlate_set->type;
-+			}
- 		}
- 		if (type == NULL)
- 			return ipset->standard_error(ipset, p);
-diff --git a/tests/xlate/xlate.t b/tests/xlate/xlate.t
-index b1e7d288e2a9..f09cb202bb6c 100644
---- a/tests/xlate/xlate.t
-+++ b/tests/xlate/xlate.t
-@@ -53,3 +53,5 @@ create bp1 bitmap:port range 1-1024
- add bp1 22
- create bim1 bitmap:ip,mac range 1.1.1.0/24
- add bim1 1.1.1.1,aa:bb:cc:dd:ee:ff
-+create hn6 hash:net family inet6
-+add hn6 fe80::/64
-diff --git a/tests/xlate/xlate.t.nft b/tests/xlate/xlate.t.nft
-index 96eba3b0175e..0152a3081125 100644
---- a/tests/xlate/xlate.t.nft
-+++ b/tests/xlate/xlate.t.nft
-@@ -54,3 +54,5 @@ add set inet global bp1 { type inet_service; }
- add element inet global bp1 { 22 }
- add set inet global bim1 { type ipv4_addr . ether_addr; }
- add element inet global bim1 { 1.1.1.1 . aa:bb:cc:dd:ee:ff }
-+add set inet global hn6 { type ipv6_addr; flags interval; }
-+add element inet global hn6 { fe80::/64 }
--- 
-2.37.2
-

0003-ipset-translate-allow-invoking-with-a-path-name.patch

@@ -1,46 +0,0 @@
-From e1b60b2a93356c313cccb2abfdae4b58d530e02b Mon Sep 17 00:00:00 2001
-From: Quentin Armitage <quentin@armitage.org.uk>
-Date: Thu, 11 Aug 2022 17:52:18 +0100
-Subject: [PATCH] ipset-translate: allow invoking with a path name
-
-Executing /usr/sbin/ipset-translate results in the ipset functionality being run, rather than the ipset-translate functionality.
-
- # ipset-translate destroy fred
- This command is not supported, use `ipset-translate restore < file'
-
- # /usr/sbin/ipset-translate destroy fred
- ipset v7.15: The set with the given name does not exist
-
-use basename() to resolve the issue.
-
-Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1626
-Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
----
- src/ipset.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/ipset.c b/src/ipset.c
-index 6d42b60d2fe9..162f477d49cd 100644
---- a/src/ipset.c
-+++ b/src/ipset.c
-@@ -6,6 +6,7 @@
-  * it under the terms of the GNU General Public License version 2 as
-  * published by the Free Software Foundation.
-  */
-+#define _GNU_SOURCE
- #include <assert.h>			/* assert */
- #include <stdio.h>			/* fprintf */
- #include <stdlib.h>			/* exit */
-@@ -31,7 +32,7 @@ main(int argc, char *argv[])
- 		exit(1);
- 	}
- 
--	if (!strcmp(argv[0], "ipset-translate")) {
-+	if (!strcmp(basename(argv[0]), "ipset-translate")) {
- 		ret = ipset_xlate_argv(ipset, argc, argv);
- 	} else {
- 		ret = ipset_parse_argv(ipset, argc, argv);
--- 
-2.37.2
-

ipset.spec

@@ -1,9 +1,9 @@
 Name:             ipset
-Version:          7.17
-Release:          3%{?dist}
+Version:          7.24
+Release:          2%{?dist}
 Summary:          Manage Linux IP sets
 
-License:          GPLv2
+License:          GPL-2.0-only
 URL:              http://ipset.netfilter.org/
 Source0:          %{url}/%{name}-%{version}.tar.bz2
 Source1:          %{name}.service
@@ -108,6 +108,9 @@ install -c -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/%{name}-config
 # Create directory for configuration
 mkdir -p %{buildroot}%{_sysconfdir}/%{name}
 
+# Turn absolute symlink into a relative one
+ln -sf %{name} %{buildroot}/%{_sbindir}/%{name}-translate
+
 
 %preun
 if [[ $1 -eq 0 && -n $(lsmod | grep "^xt_set ") ]]; then
@@ -171,6 +174,52 @@ fi
 
 
 %changelog
+* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue May 20 2025 Phil Sutter <psutter@redhat.com> - 7.24-1
+- new version
+
+* Wed May 07 2025 Phil Sutter <psutter@redhat.com> - 7.23-1
+- new version
+
+* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 7.22-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Thu Aug 01 2024 Phil Sutter <psutter@redhat.com> - 7.22-1
+- Turn absolute ipset-translate symlink into a relative one
+- Rebase onto v7.22 plus fixes
+
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Mon Feb 12 2024 Nicolas Chauvet <kwizart@gmail.com> - 7.21-1
+- Update to 7.21
+
+* Thu Feb 01 2024 Nicolas Chauvet <kwizart@gmail.com> - 7.20-1
+- Update to 7.20
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.19-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 7.19-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 23 2023 Nicolas Chauvet <kwizart@gmail.com> - 7.19-1
+- Update to 7.19
+
+* Fri Aug 11 2023 Phil Sutter <psutter@redhat.com> - 7.17-7
+- Convert license to SPDX format
+
+* Fri Aug 11 2023 Phil Sutter <psutter@redhat.com> - 7.17-6
+- Convert license to SPDX format
+
+* Fri Aug 11 2023 Phil Sutter <psutter@redhat.com> - 7.17-5
+- Convert license to SPDX format
+
+* Fri Aug 11 2023 Phil Sutter <psutter@redhat.com> - 7.17-4
+- Convert license to SPDX format
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 7.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (ipset-7.17.tar.bz2) = e308a0d7707ccf7d0cb06a32cf9a822f97862e007abdbab8a91a5a0d5bfbd9f2fb9a3f5e8f36b250ec0d565438c8648a31e8e5b45d8205a76558e90f46e6e597
+SHA512 (ipset-7.24.tar.bz2) = 18ccb49bd38083f0556b11e1d17f43791c52a2b094c9a500b6f770796b17e8e70c3860a628eac2252eb672b1fc9de734d3a0e0823d61dd9be7b4188adc6dd214