From 80fd8664da019571943528fc5d51e0f0f2c323af Mon Sep 17 00:00:00 2001
From: Mirko Vogt <dev@nanl.de>
Date: Fri, 13 Aug 2010 10:55:24 +0000
Subject: [PATCH] adjust iptables and ipset to backfire branch

---
 package/ipset/Makefile                                 |  4 ++--
 package/iptables/Makefile                              |  6 +++---
 .../patches/008-netfilter_include_linux_type_h.patch   | 10 ++++++++++
 3 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 package/iptables/patches/008-netfilter_include_linux_type_h.patch

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 012505fe8..7a2e8a1e8 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ipset
-PKG_VERSION:=4.2
+PKG_VERSION:=4.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ipset.netfilter.org
-PKG_MD5SUM:=9060d549a18c1c0794fa47a71343d627
+PKG_MD5SUM:=d104007fdf5ea64fef774c22b1c0a97b
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index e97cfbbca..bee898b50 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
-PKG_VERSION:=1.4.7
-PKG_RELEASE:=1
+PKG_VERSION:=1.4.6
+PKG_RELEASE:=2
 
-PKG_MD5SUM:=645941dd1f9e0ec1f74c61918d70d52f
+PKG_MD5SUM:=c67cf30e281a924def6426be0973df56
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
 	ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
diff --git a/package/iptables/patches/008-netfilter_include_linux_type_h.patch b/package/iptables/patches/008-netfilter_include_linux_type_h.patch
new file mode 100644
index 000000000..761f1c497
--- /dev/null
+++ b/package/iptables/patches/008-netfilter_include_linux_type_h.patch
@@ -0,0 +1,10 @@
+--- a/include/linux/netfilter.h
++++ b/include/linux/netfilter.h
+@@ -1,6 +1,7 @@
+ #ifndef __LINUX_NETFILTER_H
+ #define __LINUX_NETFILTER_H
+ 
++#include <linux/types.h>
+ 
+ /* Responses from hook functions. */
+ #define NF_DROP 0