!122 [sync] PR-118: fix broken symbolic link
From: @openeuler-sync-bot Reviewed-by: @sunsuwan Signed-off-by: @sunsuwan
This commit is contained in:
commit
c43c438514
@ -2,7 +2,7 @@
|
|||||||
%global legacy_actions %{_libexecdir}/initscripts/legacy-actions
|
%global legacy_actions %{_libexecdir}/initscripts/legacy-actions
|
||||||
Name: iptables
|
Name: iptables
|
||||||
Version: 1.8.7
|
Version: 1.8.7
|
||||||
Release: 17
|
Release: 18
|
||||||
Summary: IP packet filter administration utilities
|
Summary: IP packet filter administration utilities
|
||||||
License: GPL-2.0-only and Artistic-2.0
|
License: GPL-2.0-only and Artistic-2.0
|
||||||
URL: https://www.netfilter.org/
|
URL: https://www.netfilter.org/
|
||||||
@ -92,6 +92,7 @@ Header files for iproute.
|
|||||||
%package nft
|
%package nft
|
||||||
Summary: nft package for iproute
|
Summary: nft package for iproute
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
Requires: %{name}-help
|
||||||
Obsoletes: iptables-compat < 1.6.2-4
|
Obsoletes: iptables-compat < 1.6.2-4
|
||||||
|
|
||||||
%description nft
|
%description nft
|
||||||
@ -172,8 +173,6 @@ install -m 0755 iptables/iptables-apply.8 %{buildroot}%{_mandir}/man8
|
|||||||
# Remove /etc/ethertypes (now part of setup)
|
# Remove /etc/ethertypes (now part of setup)
|
||||||
rm -f %{buildroot}%{_sysconfdir}/ethertypes
|
rm -f %{buildroot}%{_sysconfdir}/ethertypes
|
||||||
|
|
||||||
touch %{buildroot}%{_libexecdir}/arptables-helper
|
|
||||||
|
|
||||||
touch %{buildroot}%{_mandir}/man8/arptables.8
|
touch %{buildroot}%{_mandir}/man8/arptables.8
|
||||||
touch %{buildroot}%{_mandir}/man8/arptables-save.8
|
touch %{buildroot}%{_mandir}/man8/arptables-save.8
|
||||||
touch %{buildroot}%{_mandir}/man8/arptables-restore.8
|
touch %{buildroot}%{_mandir}/man8/arptables-restore.8
|
||||||
@ -243,17 +242,13 @@ for sfx in "" "-restore" "-save"; do
|
|||||||
rm -f $manpfx$sfx.8.gz
|
rm -f $manpfx$sfx.8.gz
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [ "$(readlink -e $lepfx-helper)" == $lepfx-helper ]; then
|
|
||||||
rm -f $lepfx-helper
|
|
||||||
fi
|
|
||||||
%{_sbindir}/update-alternatives --install \
|
%{_sbindir}/update-alternatives --install \
|
||||||
$pfx arptables $pfx-nft 10 \
|
$pfx arptables $pfx-nft 10 \
|
||||||
--slave $pfx-save arptables-save $pfx-nft-save \
|
--slave $pfx-save arptables-save $pfx-nft-save \
|
||||||
--slave $pfx-restore arptables-restore $pfx-nft-restore \
|
--slave $pfx-restore arptables-restore $pfx-nft-restore \
|
||||||
--slave $manpfx.8.gz arptables-man $manpfx-nft.8.gz \
|
--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-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
|
if [ x`rpm -qa firewalld` != x ]; then
|
||||||
firews=`systemctl status firewalld | grep Active | awk '{print $3}'`
|
firews=`systemctl status firewalld | grep Active | awk '{print $3}'`
|
||||||
@ -336,7 +331,6 @@ fi
|
|||||||
%ghost %{_sbindir}/arptables
|
%ghost %{_sbindir}/arptables
|
||||||
%ghost %{_sbindir}/arptables-save
|
%ghost %{_sbindir}/arptables-save
|
||||||
%ghost %{_sbindir}/arptables-restore
|
%ghost %{_sbindir}/arptables-restore
|
||||||
%ghost %{_libexecdir}/arptables-helper
|
|
||||||
|
|
||||||
%files help
|
%files help
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
@ -356,6 +350,12 @@ fi
|
|||||||
%{_mandir}/man8/xtables-legacy*
|
%{_mandir}/man8/xtables-legacy*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Sep 30 2024 zhouyihang <zhouyihang3@h-partners.com> - 1.8.7-18
|
||||||
|
- Type:bugfix
|
||||||
|
- CVE:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix broken symbolic link
|
||||||
|
|
||||||
* Tue Jun 25 2024 yanglu <yanglu72@h-partners.com> - 1.8.7-17
|
* Tue Jun 25 2024 yanglu <yanglu72@h-partners.com> - 1.8.7-17
|
||||||
- Type:bugfix
|
- Type:bugfix
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user