aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
diff options
context:
space:
mode:
authorCurtis Deptuck <curtdept@me.com>2020-12-02 17:28:39 -0700
committerHans Dedecker <dedeckeh@gmail.com>2021-01-09 10:24:04 +0100
commit2e590a63645a5c89ad752abfe36458dc0f49c739 (patch)
tree17c2b97e8d2050abd4d586647a9221258907f268 /package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
parent4ebec0b3e2bc259be8c788a9a792ed2250b30433 (diff)
downloadupstream-2e590a63645a5c89ad752abfe36458dc0f49c739.tar.gz
upstream-2e590a63645a5c89ad752abfe36458dc0f49c739.tar.bz2
upstream-2e590a63645a5c89ad752abfe36458dc0f49c739.zip
iptables: update to 1.8.6
Update iptables to 1.8.6 ChangeLog: https://netfilter.org/projects/iptables/files/changes-iptables-1.8.6.txt Refresh patch: 101-remove-check-already.patch Signed-off-by: Curtis Deptuck <curtdept@me.com> Signed-off-by: Hans Dedecker <dedeckeh@gmail.com> [refresh patches]
Diffstat (limited to 'package/network/utils/iptables/patches/700-disable-legacy-revisions.patch')
-rw-r--r--package/network/utils/iptables/patches/700-disable-legacy-revisions.patch20
1 files changed, 10 insertions, 10 deletions
diff --git a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
index 86715fc8e7..cc451ef959 100644
--- a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
+++ b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
@@ -1,6 +1,6 @@
--- a/extensions/libxt_conntrack.c
+++ b/extensions/libxt_conntrack.c
-@@ -1387,6 +1387,7 @@ static int conntrack3_mt6_xlate(struct x
+@@ -1395,6 +1395,7 @@ static int conntrack3_mt6_xlate(struct x
}
static struct xtables_match conntrack_mt_reg[] = {
@@ -8,7 +8,7 @@
{
.version = XTABLES_VERSION,
.name = "conntrack",
-@@ -1462,6 +1463,7 @@ static struct xtables_match conntrack_mt
+@@ -1470,6 +1471,7 @@ static struct xtables_match conntrack_mt
.alias = conntrack_print_name_alias,
.x6_options = conntrack2_mt_opts,
},
@@ -16,7 +16,7 @@
{
.version = XTABLES_VERSION,
.name = "conntrack",
-@@ -1494,6 +1496,7 @@ static struct xtables_match conntrack_mt
+@@ -1502,6 +1504,7 @@ static struct xtables_match conntrack_mt
.x6_options = conntrack3_mt_opts,
.xlate = conntrack3_mt6_xlate,
},
@@ -24,7 +24,7 @@
{
.family = NFPROTO_UNSPEC,
.name = "state",
-@@ -1524,6 +1527,8 @@ static struct xtables_match conntrack_mt
+@@ -1532,6 +1535,8 @@ static struct xtables_match conntrack_mt
.x6_parse = state_ct23_parse,
.x6_options = state_opts,
},
@@ -33,7 +33,7 @@
{
.family = NFPROTO_UNSPEC,
.name = "state",
-@@ -1553,6 +1558,7 @@ static struct xtables_match conntrack_mt
+@@ -1561,6 +1566,7 @@ static struct xtables_match conntrack_mt
.x6_parse = state_parse,
.x6_options = state_opts,
},
@@ -43,7 +43,7 @@
void _init(void)
--- a/extensions/libxt_CT.c
+++ b/extensions/libxt_CT.c
-@@ -349,6 +349,7 @@ static void notrack_ct2_tg_init(struct x
+@@ -363,6 +363,7 @@ static int xlate_ct1_tg(struct xt_xlate
}
static struct xtables_target ct_target_reg[] = {
@@ -51,7 +51,7 @@
{
.family = NFPROTO_UNSPEC,
.name = "CT",
-@@ -374,6 +375,7 @@ static struct xtables_target ct_target_r
+@@ -388,6 +389,7 @@ static struct xtables_target ct_target_r
.x6_parse = ct_parse_v1,
.x6_options = ct_opts_v1,
},
@@ -59,15 +59,15 @@
{
.family = NFPROTO_UNSPEC,
.name = "CT",
-@@ -388,6 +390,7 @@ static struct xtables_target ct_target_r
- .x6_parse = ct_parse_v1,
+@@ -403,6 +405,7 @@ static struct xtables_target ct_target_r
.x6_options = ct_opts_v1,
+ .xlate = xlate_ct1_tg,
},
+#ifndef NO_LEGACY
{
.family = NFPROTO_UNSPEC,
.name = "NOTRACK",
-@@ -425,6 +428,7 @@ static struct xtables_target ct_target_r
+@@ -441,6 +444,7 @@ static struct xtables_target ct_target_r
.revision = 0,
.version = XTABLES_VERSION,
},