diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-05 21:11:28 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-09-05 21:11:28 +0200 |
| commit | 606b7468614357005c320f396cc2e90256e3f277 (patch) | |
| tree | 98934e121c07d340d0b45ae95d59329cc7fbe583 /package/ipset/patches | |
| parent | 9d7af809f7881ed2dba51bf9e59ace51c6848ed6 (diff) | |
update to latest upstream
Diffstat (limited to 'package/ipset/patches')
| -rw-r--r-- | package/ipset/patches/patch-Makefile | 11 | ||||
| -rw-r--r-- | package/ipset/patches/patch-kernel_ipt_SET_c | 30 | ||||
| -rw-r--r-- | package/ipset/patches/patch-kernel_ipt_set_c | 32 |
3 files changed, 62 insertions, 11 deletions
diff --git a/package/ipset/patches/patch-Makefile b/package/ipset/patches/patch-Makefile deleted file mode 100644 index 9eaf33095..000000000 --- a/package/ipset/patches/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- ipset-3.0.orig/Makefile 2009-05-16 21:09:38.000000000 +0200 -+++ ipset-3.0/Makefile 2009-11-19 23:32:37.000000000 +0100 -@@ -5,7 +5,7 @@ - ###################################################################### - - ifndef KERNEL_DIR --KERNEL_DIR=/usr/src/linux -+KERNEL_DIR?=/usr/src/linux - endif - ifndef KBUILD_OUTPUT - KBUILD_OUTPUT=$(KERNEL_DIR) diff --git a/package/ipset/patches/patch-kernel_ipt_SET_c b/package/ipset/patches/patch-kernel_ipt_SET_c new file mode 100644 index 000000000..22c1aff14 --- /dev/null +++ b/package/ipset/patches/patch-kernel_ipt_SET_c @@ -0,0 +1,30 @@ +--- ipset-4.1.orig/kernel/ipt_SET.c 2009-11-10 21:45:41.000000000 +0100 ++++ ipset-4.1/kernel/ipt_SET.c 2010-08-29 14:45:51.863658421 +0200 +@@ -64,9 +64,12 @@ target(struct sk_buff *skb, + unsigned int hooknum, + const struct xt_target *target, + const void *targinfo) +-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */ ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) + target(struct sk_buff *skb, + const struct xt_target_param *par) ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */ ++target(struct sk_buff *skb, ++ const struct xt_action_param *par) + #endif + { + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) +@@ -127,9 +130,12 @@ checkentry(const char *tablename, + const struct xt_target *target, + void *targinfo, + unsigned int hook_mask) +-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */ ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) + static bool + checkentry(const struct xt_tgchk_param *par) ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */ ++static int ++checkentry(const struct xt_tgchk_param *par) + #endif + { + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) diff --git a/package/ipset/patches/patch-kernel_ipt_set_c b/package/ipset/patches/patch-kernel_ipt_set_c new file mode 100644 index 000000000..50f81919a --- /dev/null +++ b/package/ipset/patches/patch-kernel_ipt_set_c @@ -0,0 +1,32 @@ +--- ipset-4.1.orig/kernel/ipt_set.c 2009-11-10 21:45:41.000000000 +0100 ++++ ipset-4.1/kernel/ipt_set.c 2010-08-29 14:45:51.832408251 +0200 +@@ -83,10 +83,14 @@ match(const struct sk_buff *skb, + int offset, + unsigned int protoff, + bool *hotdrop) +-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */ ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) + static bool + match(const struct sk_buff *skb, + const struct xt_match_param *par) ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */ ++static bool ++match(const struct sk_buff *skb, ++ struct xt_action_param *par) + #endif + { + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) +@@ -136,9 +140,12 @@ checkentry(const char *tablename, + const struct xt_match *match, + void *matchinfo, + unsigned int hook_mask) +-#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,28) */ ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(2,6,35) + static bool + checkentry(const struct xt_mtchk_param *par) ++#else /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35) */ ++static int ++checkentry(const struct xt_mtchk_param *par) + #endif + { + #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28) |