iptables: bump to 1.6.1

[openwrt/staging/florian.git] / package / network / utils / iptables / patches / 700-disable-legacy-revisions.patch

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 342c3b013a3de758abd9f3e7186a450ed4e5e451..6800ca5ece7e997aa858fddcaad68a01ca170ed3 100644 (file)
--- a/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
+++ b/package/network/utils/iptables/patches/700-disable-legacy-revisions.patch
@@ -1,8 +1,6 @@
-Index: iptables-1.4.21/extensions/libxt_conntrack.c
-===================================================================
---- iptables-1.4.21.orig/extensions/libxt_conntrack.c
-+++ iptables-1.4.21/extensions/libxt_conntrack.c
-@@ -1157,6 +1157,7 @@ static void state_save(const void *ip, c
+--- a/extensions/libxt_conntrack.c
++++ b/extensions/libxt_conntrack.c
+@@ -1397,6 +1397,7 @@ static int conntrack3_mt6_xlate(struct x
  }
  
  static struct xtables_match conntrack_mt_reg[] = {
@@ -10,7 +8,7 @@ Index: iptables-1.4.21/extensions/libxt_conntrack.c
        {
                .version       = XTABLES_VERSION,
                .name          = "conntrack",
-@@ -1232,6 +1233,7 @@ static struct xtables_match conntrack_mt
+@@ -1472,6 +1473,7 @@ static struct xtables_match conntrack_mt
                .alias         = conntrack_print_name_alias,
                .x6_options    = conntrack2_mt_opts,
        },
@@ -18,31 +16,24 @@ Index: iptables-1.4.21/extensions/libxt_conntrack.c
        {
                .version       = XTABLES_VERSION,
                .name          = "conntrack",
-@@ -1262,6 +1264,7 @@ static struct xtables_match conntrack_mt
-               .alias         = conntrack_print_name_alias,
+@@ -1504,6 +1506,7 @@ static struct xtables_match conntrack_mt
                .x6_options    = conntrack3_mt_opts,
+               .xlate         = conntrack3_mt6_xlate,
        },
 +#ifndef NO_LEGACY
        {
                .family        = NFPROTO_UNSPEC,
                .name          = "state",
-@@ -1292,6 +1295,7 @@ static struct xtables_match conntrack_mt
+@@ -1534,6 +1537,8 @@ static struct xtables_match conntrack_mt
                .x6_parse      = state_ct23_parse,
                .x6_options    = state_opts,
        },
 +#endif
-       {
-               .family        = NFPROTO_UNSPEC,
-               .name          = "state",
-@@ -1307,6 +1311,7 @@ static struct xtables_match conntrack_mt
-               .x6_parse      = state_ct23_parse,
-               .x6_options    = state_opts,
-       },
 +#ifndef NO_LEGACY
        {
                .family        = NFPROTO_UNSPEC,
                .name          = "state",
-@@ -1320,6 +1325,7 @@ static struct xtables_match conntrack_mt
+@@ -1563,6 +1568,7 @@ static struct xtables_match conntrack_mt
                .x6_parse      = state_parse,
                .x6_options    = state_opts,
        },
@@ -50,11 +41,9 @@ Index: iptables-1.4.21/extensions/libxt_conntrack.c
  };
  
  void _init(void)
-Index: iptables-1.4.21/extensions/libxt_CT.c
-===================================================================
---- iptables-1.4.21.orig/extensions/libxt_CT.c
-+++ iptables-1.4.21/extensions/libxt_CT.c
-@@ -290,6 +290,7 @@ static void notrack_ct2_tg_init(struct x
+--- a/extensions/libxt_CT.c
++++ b/extensions/libxt_CT.c
+@@ -349,6 +349,7 @@ static void notrack_ct2_tg_init(struct x
  }
  
  static struct xtables_target ct_target_reg[] = {
@@ -62,7 +51,7 @@ Index: iptables-1.4.21/extensions/libxt_CT.c
        {
                .family         = NFPROTO_UNSPEC,
                .name           = "CT",
-@@ -315,6 +316,7 @@ static struct xtables_target ct_target_r
+@@ -374,6 +375,7 @@ static struct xtables_target ct_target_r
                .x6_parse       = ct_parse_v1,
                .x6_options     = ct_opts_v1,
        },
@@ -70,7 +59,7 @@ Index: iptables-1.4.21/extensions/libxt_CT.c
        {
                .family         = NFPROTO_UNSPEC,
                .name           = "CT",
-@@ -329,6 +331,7 @@ static struct xtables_target ct_target_r
+@@ -388,6 +390,7 @@ static struct xtables_target ct_target_r
                .x6_parse       = ct_parse_v1,
                .x6_options     = ct_opts_v1,
        },
@@ -78,7 +67,7 @@ Index: iptables-1.4.21/extensions/libxt_CT.c
        {
                .family        = NFPROTO_UNSPEC,
                .name          = "NOTRACK",
-@@ -366,6 +369,7 @@ static struct xtables_target ct_target_r
+@@ -425,6 +428,7 @@ static struct xtables_target ct_target_r
                .revision      = 0,
                .version       = XTABLES_VERSION,
        },
@@ -86,11 +75,9 @@ Index: iptables-1.4.21/extensions/libxt_CT.c
  };
  
  void _init(void)
-Index: iptables-1.4.21/extensions/libxt_multiport.c
-===================================================================
---- iptables-1.4.21.orig/extensions/libxt_multiport.c
-+++ iptables-1.4.21/extensions/libxt_multiport.c
-@@ -469,6 +469,7 @@ static void multiport_save6_v1(const voi
+--- a/extensions/libxt_multiport.c
++++ b/extensions/libxt_multiport.c
+@@ -571,6 +571,7 @@ static int multiport_xlate6_v1(struct xt
  }
  
  static struct xtables_match multiport_mt_reg[] = {
@@ -98,9 +85,9 @@ Index: iptables-1.4.21/extensions/libxt_multiport.c
        {
                .family        = NFPROTO_IPV4,
                .name          = "multiport",
-@@ -497,6 +498,7 @@ static struct xtables_match multiport_mt
-               .save          = multiport_save6,
+@@ -601,6 +602,7 @@ static struct xtables_match multiport_mt
                .x6_options    = multiport_opts,
+               .xlate         = multiport_xlate6,
        },
 +#endif
        {