mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +00:00
7a4acfce6d
Update iptables to 1.8.3
ChangeLog:
https://netfilter.org/projects/iptables/files/changes-iptables-1.8.3.txt
Removed upstream patches:
- 001-extensions_format-security_fixes_in_libip.patch
- 002-include_fix_build_with_kernel_headers_before_4_2.patch
- 003-ebtables-vlan-fix_userspace_kernel_headers_collision.patch
Altered patches:
- 200-configurable_builtin.patch
- 600-shared-libext.patch
No notable size changes
Signed-off-by: Deng Qingfang <dengqf6@mail2.sysu.edu.cn>
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [lipibtc ABI_VERSION fix]
(cherry picked from commit 299f6cb2da)
14 lines
373 B
Diff
14 lines
373 B
Diff
--- a/iptables/xtables-legacy-multi.c
|
|
+++ b/iptables/xtables-legacy-multi.c
|
|
@@ -32,8 +32,10 @@ static const struct subcommand multi_sub
|
|
|
|
|
|
#endif
|
|
+#ifdef ENABLE_XML
|
|
{"iptables-xml", iptables_xml_main},
|
|
{"xml", iptables_xml_main},
|
|
+#endif
|
|
#ifdef ENABLE_IPV6
|
|
{"ip6tables", ip6tables_main},
|
|
{"main6", ip6tables_main},
|