rpms/iptables
7
0
Fork 0
Code Issues Pull Requests Releases Activity

iptables-1.8.0-2

Browse Source 
- Fix calling ebtables-nft and arptables-nft via their new names.
This commit is contained in:
Phil Sutter 2018-07-10 18:48:49 +02:00
parent dc75e7cdb9
commit a52c75665f
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
iptables-1.8.0-xtables-nft-multi.patch Normal file
View File

@ -0,0 +1,15 @@
diff --git a/iptables/xtables-nft-multi.c b/iptables/xtables-nft-multi.c
index 187da81e9f59b..03690a56edb72 100644
--- a/iptables/xtables-nft-multi.c
+++ b/iptables/xtables-nft-multi.c
@@ -31,8 +31,10 @@ static const struct subcommand multi_subcommands[] = {
{"iptables-restore-translate", xtables_ip4_xlate_restore_main},
{"ip6tables-restore-translate", xtables_ip6_xlate_restore_main},
{"arptables", xtables_arp_main},
+ {"arptables-nft", xtables_arp_main},
{"ebtables-translate", xtables_eb_xlate_main},
{"ebtables", xtables_eb_main},
+ {"ebtables-nft", xtables_eb_main},
{"xtables-monitor", xtables_monitor_main},
{NULL},
};

7
iptables.spec
View File

@ -7,7 +7,7 @@
Name: iptables Name: iptables
Summary: Tools for managing Linux kernel packet filtering capabilities Summary: Tools for managing Linux kernel packet filtering capabilities
Version: 1.8.0 Version: 1.8.0
Release: 1%{?dist} Release: 2%{?dist}
Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2
Source1: iptables.init Source1: iptables.init
Source2: iptables-config Source2: iptables-config
@ -15,6 +15,7 @@ Source3: iptables.service
Source4: sysconfig_iptables Source4: sysconfig_iptables
Source5: sysconfig_ip6tables Source5: sysconfig_ip6tables
Patch1: iptables-1.6.0-iptables-apply_mktemp.patch Patch1: iptables-1.6.0-iptables-apply_mktemp.patch
Patch2: iptables-1.8.0-xtables-nft-multi.patch
URL: http://www.netfilter.org/ URL: http://www.netfilter.org/
# pf.os: ISC license # pf.os: ISC license
# iptables-apply: Artistic Licence 2.0 # iptables-apply: Artistic Licence 2.0
@ -115,6 +116,7 @@ nftables compatibility for iptables, arptables and ebtables.
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .iptables-apply_mktemp %patch1 -p1 -b .iptables-apply_mktemp
%patch2 -p1 -b .iptables-xtables_nft_multi
%build %build
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing " \
@ -350,6 +352,9 @@ fi
%ghost %{_sbindir}/arptables %ghost %{_sbindir}/arptables
%changelog %changelog
* Tue Jul 10 2018 Phil Sutter <psutter@redhat.com> - 1.8.0-2
- Fix calling ebtables-nft and arptables-nft via their new names.
* Mon Jul 09 2018 Phil Sutter <psutter@redhat.com> - 1.8.0-1 * Mon Jul 09 2018 Phil Sutter <psutter@redhat.com> - 1.8.0-1
- New upstream version 1.8.0. - New upstream version 1.8.0.
- Replace ldconfig calls with newly introduced macros. - Replace ldconfig calls with newly introduced macros.