Re: Iptables-1.2.9/10 compile failure with linux 2.6.7 headers
From: Kalin KOZHUHAROV <hidden>
Date: 2004-06-18 18:44:44
Also in:
lkml, netfilter-devel
YOSHIFUJI Hideaki wrote:
quoted hunk ↗ jump to hunk
In article [off-list ref] (at Sat, 19 Jun 2004 01:56:06 +0900), Kalin KOZHUHAROV [off-list ref] says:quoted
Yes, I confirm with linux-2.6.7 and iptables-1.2.9 I got: gcc -march=athlon-xp -m3dnow -msse -mfpmath=sse -mmmx -O3 -pipe -Iinclude -Wall -Wunused -I/usr/src/linux/include -DIPTABLES_VERSION=\"1.2.9\" -fPIC -o extensions/libipt_stealth_sh.o -c extensions/libipt_stealth.c distcc[6323] ERROR: compile on localhost failed In file included from include/libiptc/libiptc.h:6, from include/iptables.h:5, from extensions/libipt_stealth.c:10: /usr/src/linux/include/linux/netfilter_ipv4/ip_tables.h:255: warning: no semicolon at end of struct or union /usr/src/linux/include/linux/netfilter_ipv4/ip_tables.h:255: error: syntax error before '*' token /usr/src/linux/include/linux/netfilter_ipv4/ip_tables.h:259: error: syntax error before '}' token /usr/src/linux/include/linux/netfilter_ipv4/ip_tables.h:339: warning: type defaults to `int' in declaration of `DECLARE_MUTEX' /usr/src/linux/include/linux/netfilter_ipv4/ip_tables.h:339: warning: parameter names (without types) in function declaration /usr/src/linux/include/linux/netfilter_ipv4/ip_tables.h:339: warning: `DECLARE_MUTEX' declared `static' but never defined make: *** [extensions/libipt_stealth_sh.o] Error 1 Last time I recompiled it with 2.6.6 it was ok. The compiled version still seems to work with 2.6.7 for now.Please try this. Thanks ===== include/linux/netfilter.h 1.9 vs edited =====--- 1.9/include/linux/netfilter.h 2004-06-07 12:15:03 +09:00 +++ edited/include/linux/netfilter.h 2004-06-19 02:10:55 +09:00@@ -10,6 +10,7 @@ #include <linux/wait.h> #include <linux/list.h> #endif +#include <linux/compiler.h> /* Responses from hook functions. */ #define NF_DROP 0===== include/linux/netfilter_arp/arp_tables.h 1.3 vs edited =====--- 1.3/include/linux/netfilter_arp/arp_tables.h 2004-06-04 09:52:00 +09:00 +++ edited/include/linux/netfilter_arp/arp_tables.h 2004-06-19 02:08:09 +09:00@@ -16,7 +16,7 @@ #include <linux/if_arp.h> #include <linux/skbuff.h> #endif - +#include <linux/compiler.h> #include <linux/netfilter_arp.h> #define ARPT_FUNCTION_MAXNAMELEN 30===== include/linux/netfilter_ipv4/ip_tables.h 1.7 vs edited =====--- 1.7/include/linux/netfilter_ipv4/ip_tables.h 2004-06-07 12:15:03 +09:00 +++ edited/include/linux/netfilter_ipv4/ip_tables.h 2004-06-19 02:08:39 +09:00@@ -22,6 +22,7 @@ #include <linux/ip.h> #include <linux/skbuff.h> #endif +#include <linux/compiler.h> #include <linux/netfilter_ipv4.h> #define IPT_FUNCTION_MAXNAMELEN 30@@ -336,8 +337,8 @@ /* * Main firewall chains definitions and global var's definitions. */ -static DECLARE_MUTEX(ipt_mutex); #ifdef __KERNEL__ +static DECLARE_MUTEX(ipt_mutex); #include <linux/init.h> extern void ipt_init(void) __init;===== include/linux/netfilter_ipv6/ip6_tables.h 1.6 vs edited =====--- 1.6/include/linux/netfilter_ipv6/ip6_tables.h 2004-06-07 12:15:04 +09:00 +++ edited/include/linux/netfilter_ipv6/ip6_tables.h 2004-06-19 02:09:29 +09:00@@ -22,6 +22,7 @@ #include <linux/ipv6.h> #include <linux/skbuff.h> #endif +#include <linux/compiler.h> #include <linux/netfilter_ipv6.h> #define IP6T_FUNCTION_MAXNAMELEN 30@@ -106,7 +107,9 @@ u_int64_t pcnt, bcnt; /* Packet and byte counters */ }; +#ifdef __KERNEL__ static DECLARE_MUTEX(ip6t_mutex); +#endif /* Values for "flag" field in struct ip6t_ip6 (general ip6 structure). */ #define IP6T_F_PROTO 0x01 /* Set if rule cares about upper
As far as I understand from this patch, this should be applied to the system headers... I thought `diff -Nru A B` was the format of choice in LKML... Anyway, thank you for the patch, but I am not thinking to patch linux-headers, as I like to refer to them as something more or less stable (As opposed to the current kernel). And just out of curiosity, I did: include $ patch --dry-run -p2 </tmp/test.diff patching file linux/netfilter.h patching file linux/netfilter_arp/arp_tables.h patching file linux/netfilter_ipv4/ip_tables.h Hunk #2 FAILED at 337. 1 out of 2 hunks FAILED -- saving rejects to file linux/netfilter_ipv4/ip_tables.h.rej patching file linux/netfilter_ipv6/ip6_tables.h Hunk #2 FAILED at 107. 1 out of 2 hunks FAILED -- saving rejects to file linux/netfilter_ipv6/ip6_tables.h.rej My system has linux-headers-2.4.21 installed. As I said in my other mail here, I will stick with `make KERNEL_DIR=/usr` for now. Kalin. -- ||///_ o ***************************** ||//'_/> WWW: http://ThinRope.net/