[packages/iptables] - updated to 1.8.3 (note: new libip*t sonames) - removed obsolete extensions-format-security-fixes-i
qboosh
qboosh at pld-linux.org
Tue May 28 17:03:28 CEST 2019
commit 60b0efb20ad4ee712f9671325a277f187db71d6d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Tue May 28 17:04:14 2019 +0200
- updated to 1.8.3 (note: new libip*t sonames)
- removed obsolete extensions-format-security-fixes-in-libip-6-t_icmp patch
...s-format-security-fixes-in-libip-6-t_icmp.patch | 57 ----------------------
iptables.spec | 23 ++++++---
2 files changed, 16 insertions(+), 64 deletions(-)
---
diff --git a/iptables.spec b/iptables.spec
index aefc66c..cdf6371 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -35,12 +35,12 @@ Summary(ru.UTF-8): Утилиты для управления пакетными
Summary(uk.UTF-8): Утиліти для керування пакетними фільтрами ядра Linux
Summary(zh_CN.UTF-8): Linux内核包过滤管理工具
Name: iptables%{?with_vserver:-vserver}
-Version: 1.8.2
-Release: 2
+Version: 1.8.3
+Release: 1
License: GPL v2
Group: Networking/Admin
Source0: https://netfilter.org/projects/iptables/files/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 944558e88ddcc3b9b0d9550070fa3599
+# Source0-md5: 29de711d15c040c402cf3038c69ff513
Source1: cvs://cvs.samba.org/netfilter/%{orgname}-howtos.tar.bz2
# Source1-md5: 2ed2b452daefe70ededd75dc0061fd07
Source2: %{orgname}.init
@@ -61,7 +61,6 @@ Patch2: no-libiptc.patch
Patch3: %{orgname}-aligned_u64.patch
Patch5: ebtables-X.patch
-Patch6: 0001-extensions-format-security-fixes-in-libip-6-t_icmp.patch
# --- ADDITIONAL/CHANGED EXTENSIONS:
# just ipt_IPV4OPTSSTRIP now
Patch10: %{orgname}-20070806.patch
@@ -247,7 +246,6 @@ Uwaga: nie jest to w pełni zgodny zamiennik!
%patch3 -p1
%patch5 -p1
-%patch6 -p1
%{?with_ipt_IPV4OPTSSTRIP:%patch10 -p1}
%{?with_xt_layer7:%patch11 -p1}
@@ -525,15 +523,26 @@ fi
%{_mandir}/man8/nfnl_osf.8*
%{_mandir}/man8/xtables-legacy.8*
%{_mandir}/man8/xtables-monitor.8*
+%if %{with nftables}
+%{_mandir}/man8/arptables-nft.8*
+%{_mandir}/man8/arptables-nft-restore.8*
+%{_mandir}/man8/arptables-nft-save.8*
+%{_mandir}/man8/ebtables-nft.8*
+%{_mandir}/man8/ip6tables-translate.8*
+%{_mandir}/man8/iptables-translate.8*
%{_mandir}/man8/xtables-nft.8*
%{_mandir}/man8/xtables-translate.8*
+%endif
+%if %{with pcap}
+%{_mandir}/man8/nfbpf_compile.8*
+%endif
%files libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libip4tc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libip4tc.so.0
+%attr(755,root,root) %ghost %{_libdir}/libip4tc.so.2
%attr(755,root,root) %{_libdir}/libip6tc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libip6tc.so.0
+%attr(755,root,root) %ghost %{_libdir}/libip6tc.so.2
%attr(755,root,root) %{_libdir}/libipq.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libipq.so.0
%attr(755,root,root) %{_libdir}/libxtables.so.*.*.*
diff --git a/0001-extensions-format-security-fixes-in-libip-6-t_icmp.patch b/0001-extensions-format-security-fixes-in-libip-6-t_icmp.patch
deleted file mode 100644
index eccf74b..0000000
--- a/0001-extensions-format-security-fixes-in-libip-6-t_icmp.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 1cf06c9f88af5a5acb27b0483a43b69d6b209aa2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Adam=20Go=C5=82=C4=99biowski?= <adamg at pld-linux.org>
-Date: Wed, 14 Nov 2018 07:26:04 +0100
-Subject: [PATCH] extensions: format-security fixes in libip[6]t_icmp
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-commit 61d6c3834de32c0ff5808c93da94b2b30b4791c8 introduced support
-for gcc feature to check format string against passed argument.
-This commit adds missing bits to extenstions's libipt_icmp.c and
-libip6t_icmp6.c that were causing build to fail.
-
-Signed-off-by: Adam Gołębiowski <adamg at pld-linux.org>
----
- extensions/libip6t_icmp6.c | 4 ++--
- extensions/libipt_icmp.c | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
-index 45a71875..cc7bfaeb 100644
---- a/extensions/libip6t_icmp6.c
-+++ b/extensions/libip6t_icmp6.c
-@@ -230,7 +230,7 @@ static unsigned int type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
- type_name = icmp6_type_xlate(icmptype);
-
- if (type_name) {
-- xt_xlate_add(xl, type_name);
-+ xt_xlate_add(xl, "%s", type_name);
- } else {
- for (i = 0; i < ARRAY_SIZE(icmpv6_codes); ++i)
- if (icmpv6_codes[i].type == icmptype &&
-@@ -239,7 +239,7 @@ static unsigned int type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
- break;
-
- if (i != ARRAY_SIZE(icmpv6_codes))
-- xt_xlate_add(xl, icmpv6_codes[i].name);
-+ xt_xlate_add(xl, "%s", icmpv6_codes[i].name);
- else
- return 0;
- }
-diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c
-index 54189976..e76257c5 100644
---- a/extensions/libipt_icmp.c
-+++ b/extensions/libipt_icmp.c
-@@ -236,7 +236,7 @@ static unsigned int type_xlate_print(struct xt_xlate *xl, unsigned int icmptype,
- if (icmp_codes[i].type == icmptype &&
- icmp_codes[i].code_min == code_min &&
- icmp_codes[i].code_max == code_max) {
-- xt_xlate_add(xl, icmp_codes[i].name);
-+ xt_xlate_add(xl, "%s", icmp_codes[i].name);
- return 1;
- }
- }
---
-2.19.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/iptables.git/commitdiff/60b0efb20ad4ee712f9671325a277f187db71d6d
More information about the pld-cvs-commit
mailing list