Compare commits
No commits in common. "bc31c6d2a8a543122efd2fb42ccda2862c68b7e9" and "f3988dd0a1884f7b569d64dd44b57b6d840bd4fe" have entirely different histories.
bc31c6d2a8
...
f3988dd0a1
@ -1,35 +0,0 @@
|
||||
From 54c670ada541aa61ab9ab7907ab245718137efb8 Mon Sep 17 00:00:00 2001
|
||||
From: huangyu <huangyu106@huawei.com>
|
||||
Date: Sat, 26 Nov 2022 18:08:31 +0800
|
||||
Subject: [PATCH] enable makecheck in extensions
|
||||
|
||||
Signed-off-by: huangyu <huangyu106@huawei.com>
|
||||
---
|
||||
extensions/GNUmakefile.in | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
|
||||
index 0842a55..7d034af 100644
|
||||
--- a/extensions/GNUmakefile.in
|
||||
+++ b/extensions/GNUmakefile.in
|
||||
@@ -79,7 +79,7 @@ targets_install :=
|
||||
|
||||
.SECONDARY:
|
||||
|
||||
-.PHONY: all install clean distclean FORCE
|
||||
+.PHONY: all install check clean distclean FORCE
|
||||
|
||||
all: ${targets}
|
||||
|
||||
@@ -92,6 +92,8 @@ install: ${targets_install} ${symlinks_install}
|
||||
cp -P ${symlinks_install} "${DESTDIR}${xtlibdir}/"; \
|
||||
fi;
|
||||
|
||||
+check:
|
||||
+
|
||||
clean:
|
||||
rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c initextb.c initexta.c;
|
||||
rm -f .*.d .*.dd;
|
||||
--
|
||||
2.23.0
|
||||
|
||||
@ -2,9 +2,9 @@
|
||||
%global legacy_actions %{_libexecdir}/initscripts/legacy-actions
|
||||
Name: iptables
|
||||
Version: 1.8.5
|
||||
Release: 10
|
||||
Release: 5
|
||||
Summary: IP packet filter administration utilities
|
||||
License: GPL-2.0-only and Artistic-2.0
|
||||
License: GPLv2 and Artistic Licence 2.0 and ISC
|
||||
URL: https://www.netfilter.org/
|
||||
Source0: https://www.netfilter.org/projects/iptables/files/iptables-%{version}.tar.bz2
|
||||
Source1: iptables.init
|
||||
@ -20,7 +20,7 @@ Patch6004: backport-libxtables-Make-sure-extensions-register-in-revision-
|
||||
Patch6005: backport-libxtables-Register-multiple-extensions-in-ascending-order.patch
|
||||
Patch6006: backport-libxtables-Simplify-pending-extension-registration.patch
|
||||
Patch6007: backport-libxtables-Register-only-the-highest-revision-extension.patch
|
||||
Patch6008: enabled-makecheck-in-extensions.patch
|
||||
|
||||
|
||||
BuildRequires: bison flex gcc kernel-headers libpcap-devel libselinux-devel systemd git
|
||||
BuildRequires: libmnl-devel libnetfilter_conntrack-devel libnfnetlink-devel libnftnl-devel
|
||||
@ -65,7 +65,6 @@ Header files for iproute.
|
||||
%package nft
|
||||
Summary: nft package for iproute
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: %{name}-help
|
||||
Obsoletes: iptables-compat < 1.6.2-4
|
||||
|
||||
%description nft
|
||||
@ -86,9 +85,6 @@ rm -f include/linux/types.h
|
||||
|
||||
%make_build
|
||||
|
||||
%check
|
||||
make check
|
||||
|
||||
%install
|
||||
%make_install
|
||||
|
||||
@ -146,6 +142,8 @@ install -m 0755 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8
|
||||
# Remove /etc/ethertypes (now part of setup)
|
||||
rm -f %{buildroot}%{_sysconfdir}/ethertypes
|
||||
|
||||
touch %{buildroot}%{_libexecdir}/arptables-helper
|
||||
|
||||
touch %{buildroot}%{_mandir}/man8/arptables.8
|
||||
touch %{buildroot}%{_mandir}/man8/arptables-save.8
|
||||
touch %{buildroot}%{_mandir}/man8/arptables-restore.8
|
||||
@ -215,13 +213,17 @@ for sfx in "" "-restore" "-save"; do
|
||||
rm -f $manpfx$sfx.8.gz
|
||||
fi
|
||||
done
|
||||
if [ "$(readlink -e $lepfx-helper)" == $lepfx-helper ]; then
|
||||
rm -f $lepfx-helper
|
||||
fi
|
||||
%{_sbindir}/update-alternatives --install \
|
||||
$pfx arptables $pfx-nft 10 \
|
||||
--slave $pfx-save arptables-save $pfx-nft-save \
|
||||
--slave $pfx-restore arptables-restore $pfx-nft-restore \
|
||||
--slave $manpfx.8.gz arptables-man $manpfx-nft.8.gz \
|
||||
--slave $manpfx-save.8.gz arptables-save-man $manpfx-nft-save.8.gz \
|
||||
--slave $manpfx-restore.8.gz arptables-restore-man $manpfx-nft-restore.8.gz
|
||||
--slave $manpfx-restore.8.gz arptables-restore-man $manpfx-nft-restore.8.gz \
|
||||
--slave $lepfx-helper arptables-helper $lepfx-nft-helper
|
||||
|
||||
if [ x`rpm -qa firewalld` != x ]; then
|
||||
firews=`systemctl status firewalld | grep Active | awk '{print $3}'`
|
||||
@ -304,6 +306,7 @@ fi
|
||||
%ghost %{_sbindir}/arptables
|
||||
%ghost %{_sbindir}/arptables-save
|
||||
%ghost %{_sbindir}/arptables-restore
|
||||
%ghost %{_libexecdir}/arptables-helper
|
||||
|
||||
%files help
|
||||
%defattr(-,root,root)
|
||||
@ -323,36 +326,6 @@ fi
|
||||
%{_mandir}/man8/xtables-legacy*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 16 2024 yanglu <yanglu72@h-partners.com> - 1.8.5-10
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:Revert fix correct the -n args show dismatch
|
||||
|
||||
* Wed Dec 04 2024 renwang <renwang@uniontech.com> - 1.8.5-9
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:fix correct the -n args show dismatch
|
||||
|
||||
* Mon Sep 30 2024 zhouyihang <zhouyihang3@h-partners.com> - 1.8.5-8
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:fix broken symbolic link
|
||||
|
||||
* Fri Jun 14 2024 xinghe <xinghe2@h-partners.com> - 1.8.5-7
|
||||
- Type:bugfix
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:fix license
|
||||
|
||||
* Wed Mar 22 2023 zhanghao <zhanghao383@huawei.com> - 1.8.5-6
|
||||
- Type:feature
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC:enabled DT test
|
||||
|
||||
* Thu Mar 09 2023 zhanghao <zhanghao383@huawei.com> - 1.8.5-5
|
||||
- Type: bugfix
|
||||
- ID: NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user