iproute2: update to 5.0.0

[openwrt/staging/mkresin.git] / package / network / utils / iproute2 / patches / 135-sync-iptables-header.patch

diff --git a/package/network/utils/iproute2/patches/135-sync-iptables-header.patch b/package/network/utils/iproute2/patches/135-sync-iptables-header.patch
index a04d8ac742cdb34c1088afb82c8e3ee823d80d01..bba90e69abd7f95e2a1a381225f82444d12b440f 100644 (file)
--- a/package/network/utils/iproute2/patches/135-sync-iptables-header.patch
+++ b/package/network/utils/iproute2/patches/135-sync-iptables-header.patch
@@ -7,7 +7,7 @@ Author: Cyril Brulebois <cyril@debamax.com>
 Last-Update: 2017-11-22
 --- a/include/xtables.h
 +++ b/include/xtables.h
-@@ -205,9 +205,24 @@ enum xtables_ext_flags {
+@@ -206,9 +206,24 @@ enum xtables_ext_flags {
        XTABLES_EXT_ALIAS = 1 << 0,
  };
  
@@ -34,7 +34,7 @@ Last-Update: 2017-11-22
        /*
         * ABI/API version this module requires. Must be first member,
         * as the rest of this struct may be subject to ABI changes.
-@@ -269,6 +284,10 @@ struct xtables_match
+@@ -270,6 +285,10 @@ struct xtables_match
        void (*x6_fcheck)(struct xt_fcheck_call *);
        const struct xt_option_entry *x6_options;
  
@@ -45,7 +45,7 @@ Last-Update: 2017-11-22
        /* Size of per-extension instance extra "global" scratch space */
        size_t udata_size;
  
-@@ -280,8 +299,7 @@ struct xtables_match
+@@ -281,8 +300,7 @@ struct xtables_match
        unsigned int loaded; /* simulate loading so options are merged properly */
  };
  
@@ -55,7 +55,7 @@ Last-Update: 2017-11-22
        /*
         * ABI/API version this module requires. Must be first member,
         * as the rest of this struct may be subject to ABI changes.
-@@ -346,6 +364,10 @@ struct xtables_target
+@@ -347,6 +365,10 @@ struct xtables_target
        void (*x6_fcheck)(struct xt_fcheck_call *);
        const struct xt_option_entry *x6_options;
  
@@ -66,7 +66,7 @@ Last-Update: 2017-11-22
        size_t udata_size;
  
        /* Ignore these men behind the curtain: */
-@@ -406,6 +428,17 @@ struct xtables_globals
+@@ -407,6 +429,17 @@ struct xtables_globals
  
  #define XT_GETOPT_TABLEEND {.name = NULL, .has_arg = false}
  
@@ -84,7 +84,7 @@ Last-Update: 2017-11-22
  #ifdef __cplusplus
  extern "C" {
  #endif
-@@ -548,6 +581,14 @@ extern void xtables_lmap_free(struct xta
+@@ -549,6 +582,14 @@ extern void xtables_lmap_free(struct xta
  extern int xtables_lmap_name2id(const struct xtables_lmap *, const char *);
  extern const char *xtables_lmap_id2name(const struct xtables_lmap *, int);