From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Tue, 16 Feb 2010 20:51:49 +0000 (+0100)
Subject: Fix iptables header installation.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=d6754f4b7eb4c81ed63afb2419e635509caef607

Fix iptables header installation.
---

diff --git a/config/rootfiles/common/iptables b/config/rootfiles/common/iptables
index 44d1b8de1..ce2cb5103 100644
--- a/config/rootfiles/common/iptables
+++ b/config/rootfiles/common/iptables
@@ -120,12 +120,17 @@ sbin/iptables-multi
 #usr/include/asm-generic
 #usr/include/asm-generic/errno-base.h
 #usr/include/asm-generic/errno.h
+#usr/include/iptables
+#usr/include/iptables.h
+#usr/include/iptables/internal.h
 #usr/include/libipq.h
 #usr/include/libiptc
 #usr/include/libiptc/ipt_kernel_headers.h
 #usr/include/libiptc/libip6tc.h
 #usr/include/libiptc/libiptc.h
 #usr/include/libiptc/libxtc.h
+#usr/include/libipulog
+#usr/include/libipulog/libipulog.h
 #usr/include/libnetfilter_queue
 #usr/include/libnetfilter_queue/libipq.h
 #usr/include/libnetfilter_queue/libnetfilter_queue.h
@@ -208,6 +213,9 @@ sbin/iptables-multi
 #usr/include/linux/netfilter/xt_tcpudp.h
 #usr/include/linux/netfilter/xt_time.h
 #usr/include/linux/netfilter/xt_u32.h
++usr/include/net/netfilter
++usr/include/net/netfilter/nf_conntrack_tuple.h
++usr/include/net/netfilter/nf_nat.h
 #usr/include/xtables.h
 #usr/lib/libnetfilter_queue.a
 #usr/lib/libnetfilter_queue.la
diff --git a/lfs/iptables b/lfs/iptables
index c3dea280f..6d369909b 100644
--- a/lfs/iptables
+++ b/lfs/iptables
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
+	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
 
 	@cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	-cd /usr/include && patch -Np1 < $(DIR_SRC)/src/patches/iptables-1.4.6-errorno_includes.patch
@@ -102,6 +102,17 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
+	# Iptables doesn't install all headers
+	mkdir -p /usr/include/net/netfilter
+	cp -f $(DIR_APP)/include/net/netfilter/*.h /usr/include/net/netfilter/
+	mkdir -p /usr/include/iptables
+	cp -f $(DIR_APP)/include/iptables/*.h /usr/include/iptables/
+	cp -f $(DIR_APP)/include/iptables.h /usr/include/
+	mkdir -p /usr/include/libipulog
+	cp -f $(DIR_APP)/include/libipulog/*.h /usr/include/libipulog/
+	mkdir -p /usr/include/libiptc
+	cp -f $(DIR_APP)/include/libiptc/*.h /usr/include/libiptc/
+
 	cd $(DIR_SRC) && tar xfj $(DIR_DL)/libnfnetlink-1.0.0.tar.bz2
 	cd $(DIR_SRC)/libnfnetlink-1.0.0 && ./configure --prefix=/usr
 	cd $(DIR_SRC)/libnfnetlink-1.0.0 && make $(MAKETUNING) $(EXTRA_MAKE)
@@ -112,5 +123,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/libnetfilter_queue-0.0.17 && make install
 
-	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-0.0.41 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
+	@rm -rf $(DIR_APP) $(DIR_SRC)/libnfnetlink-1.0.0 $(DIR_SRC)/netfilter-layer7* $(DIR_SRC)/libnetfilter_queue-0.0.17
 	@$(POSTBUILD)