Changeset 27652


Ignore:
Timestamp:
2011-07-17T17:53:34+02:00 (7 years ago)
Author:
jow
Message:

[package] iptables: refresh patches

Location:
trunk/package/iptables/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iptables/patches/011-recent-add-reap.patch

    r26008 r27652  
    1111 3 files changed, 32 insertions(+), 0 deletions(-) 
    1212 
    13 diff --git a/extensions/libxt_recent.c b/extensions/libxt_recent.c 
    14 index 4ac32f7..7e3d280 100644 
    1513--- a/extensions/libxt_recent.c 
    1614+++ b/extensions/libxt_recent.c 
    17 @@ -20,6 +20,7 @@ static const struct option recent_opts[] = { 
     15@@ -20,6 +20,7 @@ static const struct option recent_opts[] 
    1816        {.name = "name",     .has_arg = true,  .val = 208}, 
    1917        {.name = "rsource",  .has_arg = false, .val = 209}, 
     
    2321 }; 
    2422  
    25 @@ -36,6 +37,7 @@ static void recent_help(void) 
     23@@ -37,6 +38,7 @@ static void recent_help(void) 
    2624 "    --hitcount hits             For check and update commands above.\n" 
    2725 "                                Specifies that the match will only occur if source address seen hits times.\n" 
     
    3129 "                                Specifies that the match will only occur if the source address and the TTL\n" 
    3230 "                                match between this packet and the one which was set.\n" 
    33 @@ -62,6 +64,8 @@ static void recent_init(struct xt_entry_match *match) 
     31@@ -63,6 +65,8 @@ static void recent_init(struct xt_entry_ 
    3432        (XT_RECENT_SET | XT_RECENT_CHECK | \ 
    3533        XT_RECENT_UPDATE | XT_RECENT_REMOVE) 
     
    4038                         const void *entry, struct xt_entry_match **match) 
    4139 { 
    42 @@ -103,6 +107,7 @@ static int recent_parse(int c, char **argv, int invert, unsigned int *flags, 
     40@@ -104,6 +108,7 @@ static int recent_parse(int c, char **ar 
    4341  
    4442                case 204: 
     
    4846  
    4947                case 205: 
    50 @@ -138,6 +143,11 @@ static int recent_parse(int c, char **argv, int invert, unsigned int *flags, 
     48@@ -139,6 +144,11 @@ static int recent_parse(int c, char **ar 
    5149                        info->side = XT_RECENT_DEST; 
    5250                        break; 
     
    6058                        return 0; 
    6159        } 
    62 @@ -156,6 +166,12 @@ static void recent_check(unsigned int flags) 
     60@@ -157,6 +167,12 @@ static void recent_check(unsigned int fl 
    6361                xtables_error(PARAMETER_PROBLEM, 
    6462                           "recent: --rttl may only be used with --rcheck or " 
     
    7371  
    7472 static void recent_print(const void *ip, const struct xt_entry_match *match, 
    75 @@ -185,6 +201,8 @@ 
     73@@ -185,6 +201,8 @@ static void recent_print(const void *ip, 
    7674                printf("side: source "); 
    7775        if (info->side == XT_RECENT_DEST) 
     
    8280  
    8381 static void recent_save(const void *ip, const struct xt_entry_match *match) 
    84 @@ -210,6 +228,8 @@ static void recent_save(const void *ip, const struct xt_entry_match *match) 
     82@@ -211,6 +229,8 @@ static void recent_save(const void *ip,  
    8583                printf("--rsource "); 
    8684        if (info->side == XT_RECENT_DEST) 
     
    9189  
    9290 static struct xtables_match recent_mt_reg = { 
    93 diff --git a/extensions/libxt_recent.man b/extensions/libxt_recent.man 
    94 index 532c328..26e4fb9 100644 
    9591--- a/extensions/libxt_recent.man 
    9692+++ b/extensions/libxt_recent.man 
    97 @@ -41,6 +41,11 @@ This option must be used in conjunction with one of \fB\-\-rcheck\fP or 
     93@@ -41,6 +41,11 @@ This option must be used in conjunction  
    9894 \fB\-\-update\fP. When used, this will narrow the match to only happen when the 
    9995 address is in the list and was seen within the last given number of seconds. 
     
    107103 This option must be used in conjunction with one of \fB\-\-rcheck\fP or 
    108104 \fB\-\-update\fP. When used, this will narrow the match to only happen when the 
    109 diff --git a/include/linux/netfilter/xt_recent.h b/include/linux/netfilter/xt_recent.h 
    110 index d2c2766..e21acdf 100644 
    111105--- a/include/linux/netfilter/xt_recent.h 
    112106+++ b/include/linux/netfilter/xt_recent.h 
    113 @@ -16,6 +17,9 @@ enum { 
    114         XT_RECENT_NAME_LEN = 200, 
    115  }; 
     107@@ -23,6 +23,9 @@ enum { 
     108 #define XT_RECENT_VALID_FLAGS (XT_RECENT_CHECK|XT_RECENT_SET|XT_RECENT_UPDATE|\ 
     109                               XT_RECENT_REMOVE|XT_RECENT_TTL|XT_RECENT_REAP) 
    116110  
    117111+/* Only allowed with --rcheck and --update */ 
  • trunk/package/iptables/patches/020-iptables-disable-modprobe.patch

    r24345 r27652  
    99        char *argv[4]; 
    1010        int status; 
    11 @@ -348,6 +349,7 @@ int xtables_insmod(const char *modname, 
     11@@ -348,6 +349,7 @@ int xtables_insmod(const char *modname,  
    1212        free(buf); 
    1313        if (WIFEXITED(status) && WEXITSTATUS(status) == 0) 
Note: See TracChangeset for help on using the changeset viewer.