1 |
jpp |
1.1 |
diff -urN xtables-addons-1.47.1/extensions/compat_xtables.c xtables-addons-1.47.1-v6/extensions/compat_xtables.c |
2 |
|
|
--- xtables-addons-1.47.1/extensions/compat_xtables.c 2012-10-15 23:29:22.000000000 +0400 |
3 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/compat_xtables.c 2017-09-19 20:01:18.543951969 +0400 |
4 |
|
|
@@ -27,7 +27,7 @@ |
5 |
|
|
#include "compat_skbuff.h" |
6 |
|
|
#include "compat_xtnu.h" |
7 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
8 |
|
|
-# define WITH_IPV6 1 |
9 |
|
|
+# define WITHOUT_IPV6 1 |
10 |
|
|
#endif |
11 |
|
|
|
12 |
|
|
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 22) |
13 |
|
|
diff -urN xtables-addons-1.47.1/extensions/xt_length2.c xtables-addons-1.47.1-v6/extensions/xt_length2.c |
14 |
|
|
--- xtables-addons-1.47.1/extensions/xt_length2.c 2012-10-15 23:29:22.000000000 +0400 |
15 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/xt_length2.c 2017-09-19 20:01:18.545951991 +0400 |
16 |
|
|
@@ -23,7 +23,7 @@ |
17 |
|
|
#include "xt_length2.h" |
18 |
|
|
#include "compat_xtables.h" |
19 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
20 |
|
|
-# define WITH_IPV6 1 |
21 |
|
|
+# define WITHOUT_IPV6 1 |
22 |
|
|
#endif |
23 |
|
|
#ifndef NEXTHDR_IPV4 |
24 |
|
|
# define NEXTHDR_IPV4 4 |
25 |
|
|
diff -urN xtables-addons-1.47.1/extensions/xt_psd.c xtables-addons-1.47.1-v6/extensions/xt_psd.c |
26 |
|
|
--- xtables-addons-1.47.1/extensions/xt_psd.c 2012-10-15 23:29:22.000000000 +0400 |
27 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/xt_psd.c 2017-09-19 20:01:18.548952035 +0400 |
28 |
|
|
@@ -54,7 +54,7 @@ |
29 |
|
|
#define HASH_MAX 0x10 |
30 |
|
|
|
31 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
32 |
|
|
-# define WITH_IPV6 1 |
33 |
|
|
+# define WITHOUT_IPV6 1 |
34 |
|
|
#endif |
35 |
|
|
|
36 |
|
|
/* |
37 |
|
|
diff -urN xtables-addons-1.47.1/extensions/xt_RAWNAT.c xtables-addons-1.47.1-v6/extensions/xt_RAWNAT.c |
38 |
|
|
--- xtables-addons-1.47.1/extensions/xt_RAWNAT.c 2012-10-15 23:29:22.000000000 +0400 |
39 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/xt_RAWNAT.c 2017-09-19 20:01:18.550952067 +0400 |
40 |
|
|
@@ -23,7 +23,7 @@ |
41 |
|
|
#include "compat_xtables.h" |
42 |
|
|
#include "xt_RAWNAT.h" |
43 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
44 |
|
|
-# define WITH_IPV6 1 |
45 |
|
|
+# define WITHOUT_IPV6 1 |
46 |
|
|
#endif |
47 |
|
|
|
48 |
|
|
static inline __be32 |
49 |
|
|
diff -urN xtables-addons-1.47.1/extensions/xt_SYSRQ.c xtables-addons-1.47.1-v6/extensions/xt_SYSRQ.c |
50 |
|
|
--- xtables-addons-1.47.1/extensions/xt_SYSRQ.c 2012-10-15 23:29:22.000000000 +0400 |
51 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/xt_SYSRQ.c 2017-09-19 20:01:18.552952087 +0400 |
52 |
|
|
@@ -31,7 +31,7 @@ |
53 |
|
|
# define WITH_CRYPTO 1 |
54 |
|
|
#endif |
55 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
56 |
|
|
-# define WITH_IPV6 1 |
57 |
|
|
+# define WITHOUT_IPV6 1 |
58 |
|
|
#endif |
59 |
|
|
|
60 |
|
|
static bool sysrq_once; |
61 |
|
|
diff -urN xtables-addons-1.47.1/extensions/xt_TARPIT.c xtables-addons-1.47.1-v6/extensions/xt_TARPIT.c |
62 |
|
|
--- xtables-addons-1.47.1/extensions/xt_TARPIT.c 2012-10-15 23:29:22.000000000 +0400 |
63 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/xt_TARPIT.c 2017-09-19 20:01:18.554952095 +0400 |
64 |
|
|
@@ -56,7 +56,7 @@ |
65 |
|
|
#include "compat_xtables.h" |
66 |
|
|
#include "xt_TARPIT.h" |
67 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
68 |
|
|
-# define WITH_IPV6 1 |
69 |
|
|
+# define WITHOUT_IPV6 1 |
70 |
|
|
#endif |
71 |
|
|
|
72 |
|
|
static bool xttarpit_tarpit(struct tcphdr *tcph, const struct tcphdr *oth) |
73 |
|
|
diff -urN xtables-addons-1.47.1/extensions/xt_TEE.c xtables-addons-1.47.1-v6/extensions/xt_TEE.c |
74 |
|
|
--- xtables-addons-1.47.1/extensions/xt_TEE.c 2012-10-15 23:29:22.000000000 +0400 |
75 |
|
|
+++ xtables-addons-1.47.1-v6/extensions/xt_TEE.c 2017-09-19 20:01:18.556952096 +0400 |
76 |
|
|
@@ -34,7 +34,7 @@ |
77 |
|
|
# include <net/netfilter/nf_conntrack.h> |
78 |
|
|
#endif |
79 |
|
|
#if defined(CONFIG_IP6_NF_IPTABLES) || defined(CONFIG_IP6_NF_IPTABLES_MODULE) |
80 |
|
|
-# define WITH_IPV6 1 |
81 |
|
|
+# define WITHOUT_IPV6 1 |
82 |
|
|
#endif |
83 |
|
|
|
84 |
|
|
#include "compat_xtables.h" |
85 |
|
|
diff -urN xtables-addons-1.47.1/README-IPV6.txt xtables-addons-1.47.1-v6/README-IPV6.txt |
86 |
|
|
--- xtables-addons-1.47.1/README-IPV6.txt 1970-01-01 04:00:00.000000000 +0400 |
87 |
|
|
+++ xtables-addons-1.47.1-v6/README-IPV6.txt 2017-09-19 20:20:50.378896670 +0400 |
88 |
|
|
@@ -0,0 +1,15 @@ |
89 |
|
|
+Version 1.47 of xtables-addons does not compile with kernel 2.6.32 |
90 |
|
|
+ |
91 |
|
|
+the extensions do not compile for IPV6 !!! |
92 |
|
|
+ |
93 |
|
|
+patch0 |
94 |
|
|
+disable '/define WITH_IPV6/' option in the extensions .c files. |
95 |
|
|
+replaced here by WITHOUT_IPV6 |
96 |
|
|
+ |
97 |
|
|
+script to update this: |
98 |
|
|
+FILES=$(fgrep 'define WITH_IPV6' ./xtables-addons-1.47.1-v6/extensions/*.c | sed -e's/:.*$//') |
99 |
|
|
+for FILE in $FILES |
100 |
|
|
+do |
101 |
|
|
+ echo "$FILE updated" |
102 |
|
|
+ sed -i '/define WITH_IPV6/s/WITH/WITHOUT/' $FILE |
103 |
|
|
+done |