[package] iptables: update to v1.4.6, relocate patches - patch by Edgar Soldin

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19302 3c298f89-4303-0410-b956-a3cf2f4a3e73
2025-04-21 12:27:27 +03:00 · 2010-01-23 22:28:32 +00:00
parent f5cd730117
commit 07380cd8e3
5 changed files with 7 additions and 9 deletions
--- a/package/iptables/patches/1.4.4/002-layer7_2.17.patch
+++ b/package/iptables/patches/1.4.4/002-layer7_2.17.patch
--- a/package/iptables/patches/1.4.4/005-imq.patch
+++ b/package/iptables/patches/1.4.4/005-imq.patch
@@ -48,7 +48,7 @@
 +
 +	switch(c) {
 +	case '1':
-+		if (xtables_check_inverse(optarg, &invert, NULL, 0))
+		if (xtables_check_inverse(optarg, &invert, NULL, 0, argv))
 +			xtables_error(PARAMETER_PROBLEM,
 +				   "Unexpected `!' after --todev");
 +		mr->todev=atoi(optarg);
@@ -80,7 +80,7 @@
 +static struct xtables_target imq_target = {
 +	.name		= "IMQ",
 +	.version	= XTABLES_VERSION,
-+	.family		= AF_INET,
+	.family		= NFPROTO_IPV4,
 +	.size		= XT_ALIGN(sizeof(struct xt_imq_info)),
 +	.userspacesize	= XT_ALIGN(sizeof(struct xt_imq_info)),
 +	.help		= IMQ_help,
@@ -94,7 +94,7 @@
 +static struct xtables_target imq_target6 = {
 +	.name		= "IMQ",
 +	.version	= XTABLES_VERSION,
-+	.family		= AF_INET6,
+	.family		= NFPROTO_IPV6,
 +	.size		= XT_ALIGN(sizeof(struct xt_imq_info)),
 +	.userspacesize	= XT_ALIGN(sizeof(struct xt_imq_info)),
 +	.help		= IMQ_help,
--- a/package/iptables/patches/1.4.4/008-netfilter_include_linux_type_h.patch
+++ b/package/iptables/patches/1.4.4/008-netfilter_include_linux_type_h.patch
--- a/package/iptables/patches/1.4.4/009-table-alignment.patch
+++ b/package/iptables/patches/1.4.4/009-table-alignment.patch