iptables-1.8.7-18.el9
- Make iptables-nft-services require iptables-services to avoid confusion - Add deprecation notice to iptables-extensions man page as well Resolves: rhbz#1985422, rhbz#1951074
This commit is contained in:
Phil Sutter
parent
41665c6c90
commit
b67311577f
|
|
@ -1,20 +1,21 @@
|
|||
From cbe4ed2b8d13b1d86e71b4d4fa434d1762f80463 Mon Sep 17 00:00:00 2001
|
||||
From 635e4c4e7f3581a7cc8c04244ae3de239ad84935 Mon Sep 17 00:00:00 2001
|
||||
From: Phil Sutter <psutter@redhat.com>
|
||||
Date: Thu, 17 Jun 2021 18:44:28 +0200
|
||||
Subject: [PATCH] doc: Add deprecation notices to all relevant man pages
|
||||
|
||||
This is RHEL9 trying to friendly kick people towards nftables.
|
||||
---
|
||||
iptables/arptables-nft-restore.8 | 13 ++++++++++++-
|
||||
iptables/arptables-nft-save.8 | 14 +++++++++++++-
|
||||
iptables/arptables-nft.8 | 19 ++++++++++++++++++-
|
||||
iptables/ebtables-nft.8 | 15 ++++++++++++++-
|
||||
iptables/iptables-apply.8.in | 14 +++++++++++++-
|
||||
iptables/iptables-restore.8.in | 17 ++++++++++++++++-
|
||||
iptables/iptables-save.8.in | 15 ++++++++++++++-
|
||||
iptables/iptables.8.in | 17 +++++++++++++++++
|
||||
iptables/xtables-monitor.8.in | 11 +++++++++++
|
||||
9 files changed, 128 insertions(+), 7 deletions(-)
|
||||
iptables/arptables-nft-restore.8 | 13 ++++++++++++-
|
||||
iptables/arptables-nft-save.8 | 14 +++++++++++++-
|
||||
iptables/arptables-nft.8 | 19 ++++++++++++++++++-
|
||||
iptables/ebtables-nft.8 | 15 ++++++++++++++-
|
||||
iptables/iptables-apply.8.in | 14 +++++++++++++-
|
||||
iptables/iptables-extensions.8.tmpl.in | 14 ++++++++++++++
|
||||
iptables/iptables-restore.8.in | 17 ++++++++++++++++-
|
||||
iptables/iptables-save.8.in | 15 ++++++++++++++-
|
||||
iptables/iptables.8.in | 17 +++++++++++++++++
|
||||
iptables/xtables-monitor.8.in | 11 +++++++++++
|
||||
10 files changed, 142 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/iptables/arptables-nft-restore.8 b/iptables/arptables-nft-restore.8
|
||||
index 09d9082cf9fd3..b1bf02998f9cc 100644
|
||||
|
|
@ -178,6 +179,31 @@ index f0ed4e5f8d450..7f99a21ed2b61 100644
|
|||
.SH LEGALESE
|
||||
.PP
|
||||
Original iptables-apply - Copyright 2006 Martin F. Krafft <madduck@madduck.net>.
|
||||
diff --git a/iptables/iptables-extensions.8.tmpl.in b/iptables/iptables-extensions.8.tmpl.in
|
||||
index 99d89a1fe44ad..73d40bbfe9c52 100644
|
||||
--- a/iptables/iptables-extensions.8.tmpl.in
|
||||
+++ b/iptables/iptables-extensions.8.tmpl.in
|
||||
@@ -7,6 +7,20 @@ iptables-extensions \(em list of extensions in the standard iptables distributio
|
||||
.PP
|
||||
\fBiptables\fP [\fB\-m\fP \fIname\fP [\fImodule-options\fP...]]
|
||||
[\fB\-j\fP \fItarget-name\fP [\fItarget-options\fP...]
|
||||
+.SH DESCRIPTION
|
||||
+These tools are
|
||||
+.B deprecated
|
||||
+in Red Hat Enterprise Linux. They are 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. There is also
|
||||
+.BR iptables\-translate (8)/ ip6tables\-translate (8)
|
||||
+to help with the migration.
|
||||
.SH MATCH EXTENSIONS
|
||||
iptables can use extended packet matching modules
|
||||
with the \fB\-m\fP or \fB\-\-match\fP
|
||||
diff --git a/iptables/iptables-restore.8.in b/iptables/iptables-restore.8.in
|
||||
index b4b62f92740d1..1bbf7a0d98d0a 100644
|
||||
--- a/iptables/iptables-restore.8.in
|
||||
|
|
@ -304,5 +330,5 @@ index b647a79eb64ed..bbccf009e8269 100644
|
|||
.B xtables-monitor
|
||||
is used to monitor changes to the ruleset or to show rule evaluation events
|
||||
--
|
||||
2.31.1
|
||||
2.32.0
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@ Name: iptables
|
|||
Summary: Tools for managing Linux kernel packet filtering capabilities
|
||||
URL: https://www.netfilter.org/projects/iptables
|
||||
Version: 1.8.7
|
||||
Release: 17%{?dist}
|
||||
Release: 18%{?dist}
|
||||
Source: %{url}/files/%{name}-%{version}.tar.bz2
|
||||
Source1: iptables.init
|
||||
Source2: iptables-config
|
||||
|
|
@ -150,6 +150,7 @@ out of the base package since they are not active by default anymore.
|
|||
%package nft-services
|
||||
Summary: arptables and ebtables services for iptables-nft
|
||||
Requires: %{name}-nft%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-services%{?_isa} = %{version}-%{release}
|
||||
Conflicts: arptables-services
|
||||
Conflicts: ebtables-services
|
||||
Provides: arptables-services
|
||||
|
|
@ -463,6 +464,10 @@ fi
|
|||
%files nft-compat
|
||||
|
||||
%changelog
|
||||
* Wed Jul 28 2021 Phil Sutter <psutter@redhat.com> - 1.8.7-18
|
||||
- Make iptables-nft-services require iptables-services to avoid confusion
|
||||
- Add deprecation notice to iptables-extensions man page as well
|
||||
|
||||
* Mon Jul 12 2021 Phil Sutter <psutter@redhat.com> - 1.8.7-17
|
||||
- Provide a compat package to fix upgrade path from RHEL8
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue