iptables-1.8.5-2.el8

- libnftnl package was rebased, depending on 1.1.6 is fine

Resolves: rhbz#2211063
This commit is contained in:
Phil Sutter 2023-06-28 22:41:19 +02:00
parent 1c8d6d0d32
commit 4b318158c6
2 changed files with 5 additions and 32 deletions

View File

@ -1,29 +0,0 @@
From c5095be75ca5c3d2b1cbeaa9f466bc455eaeb4ee Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Wed, 10 May 2023 17:02:39 +0200
Subject: [PATCH] Revert "build: bump dependency on libnftnl"
This reverts commit 50564b7adda0853c52b68bfd48115c577436bf1c.
RHEL has backported the relevant commits into libnftnl-1.1.5-3.el8, no
need to enforce libnftnl-1.1.6.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 31a8bb261c437..bf28ee1dd7460 100644
--- a/configure.ac
+++ b/configure.ac
@@ -131,7 +131,7 @@ if test "x$enable_nftables" = "xyes"; then
exit 1
fi
- PKG_CHECK_MODULES([libnftnl], [libnftnl >= 1.1.6], [nftables=1], [nftables=0])
+ PKG_CHECK_MODULES([libnftnl], [libnftnl >= 1.1.5], [nftables=1], [nftables=0])
if test "$nftables" = 0;
then
--
2.40.0

View File

@ -10,7 +10,7 @@ Name: iptables
Summary: Tools for managing Linux kernel packet filtering capabilities
URL: http://www.netfilter.org/projects/iptables
Version: 1.8.5
Release: 1%{?dist}
Release: 2%{?dist}
Source: %{url}/files/%{name}-%{version}.tar.bz2
Source1: iptables.init
Source2: iptables-config
@ -151,7 +151,6 @@ Patch125: 0125-arptables-Fix-parsing-of-inverted-arp-operation-matc.patch
Patch126: 0126-arptables-Don-t-omit-standard-matches-if-inverted.patch
Patch127: 0127-Revert-arptables-Check-the-mandatory-ar_pln-match.patch
Patch128: 0128-extensions-SECMARK-Use-a-better-context-in-test-case.patch
Patch129: 0129-Revert-build-bump-dependency-on-libnftnl.patch
# pf.os: ISC license
# iptables-apply: Artistic Licence 2.0
@ -169,7 +168,7 @@ BuildRequires: bison
BuildRequires: flex
BuildRequires: gcc
BuildRequires: pkgconfig(libmnl) >= 1.0
BuildRequires: pkgconfig(libnftnl) >= 1.1.5-1
BuildRequires: pkgconfig(libnftnl) >= 1.1.6
# libpcap-devel for nfbpf_compile
BuildRequires: libpcap-devel
BuildRequires: autoconf
@ -523,6 +522,9 @@ done
%doc %{_mandir}/man8/ebtables*.8*
%changelog
* Wed Jun 28 2023 Phil Sutter <psutter@redhat.com> - 1.8.5-2
- libnftnl package was rebased, depending on 1.1.6 is fine
* Wed May 10 2023 Phil Sutter <psutter@redhat.com> - 1.8.5-1
- Rebase to version 1.8.5 plus upstream-indicated fixes
- Fix for duplicate files in RPM due to imprecise globbing