EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Upgrade ipset to 2.2.9a, fix compilation errors with it (#1848)

Browse Source 
SVN-Revision: 7595
This commit is contained in:
Florian Fainelli 2007-06-12 17:24:58 +00:00
parent e7113073f3
commit 8b14fc4f41
2 changed files with 3 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/ipset/Makefile
View File

@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ipset
PKG_VERSION:=2.2.3
PKG_VERSION:=2.2.9a
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20050914.tar.bz2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-20061009.tar.bz2
PKG_SOURCE_URL:=http://ipset.netfilter.org
PKG_MD5SUM:=1709424cc2cdb925d4fb6fd5fcaefc26
PKG_MD5SUM:=74ce3226b30cdd386630250bdc3488ef
include $(INCLUDE_DIR)/package.mk

72
package/ipset/patches/001-kernel_26.patch
View File

@ -1,72 +0,0 @@
diff -ruN ipset-2.2.3/ipset.c ipset-2.2.3.new/ipset.c
--- ipset-2.2.3/ipset.c 2005-04-05 02:56:02.000000000 -0500
+++ ipset-2.2.3.new/ipset.c 2007-05-31 14:05:13.763087750 -0500
@@ -21,7 +21,7 @@
#include <stdarg.h>
#include <netdb.h>
#include <dlfcn.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include "ipset.h"
diff -ruN ipset-2.2.3/ipset_iphash.c ipset-2.2.3.new/ipset_iphash.c
--- ipset-2.2.3/ipset_iphash.c 2005-01-19 07:38:57.000000000 -0600
+++ ipset-2.2.3.new/ipset_iphash.c 2007-05-31 14:05:32.212240750 -0500
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include <asm/types.h>
#include <linux/netfilter_ipv4/ip_set_iphash.h>
diff -ruN ipset-2.2.3/ipset_ipmap.c ipset-2.2.3.new/ipset_ipmap.c
--- ipset-2.2.3/ipset_ipmap.c 2005-01-19 07:38:57.000000000 -0600
+++ ipset-2.2.3.new/ipset_ipmap.c 2007-05-31 14:05:47.969225500 -0500
@@ -22,7 +22,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include <linux/netfilter_ipv4/ip_set_ipmap.h>
#include "ipset.h"
diff -ruN ipset-2.2.3/ipset_macipmap.c ipset-2.2.3.new/ipset_macipmap.c
--- ipset-2.2.3/ipset_macipmap.c 2005-01-19 07:38:57.000000000 -0600
+++ ipset-2.2.3.new/ipset_macipmap.c 2007-05-31 14:06:17.627079000 -0500
@@ -24,7 +24,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include <linux/if_ether.h>
#include <linux/netfilter_ipv4/ip_set_macipmap.h>
diff -ruN ipset-2.2.3/ipset_nethash.c ipset-2.2.3.new/ipset_nethash.c
--- ipset-2.2.3/ipset_nethash.c 2005-05-09 00:44:25.000000000 -0500
+++ ipset-2.2.3.new/ipset_nethash.c 2007-05-31 14:06:43.392689250 -0500
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include <asm/types.h>
#include <linux/netfilter_ipv4/ip_set_nethash.h>
diff -ruN ipset-2.2.3/ipset_portmap.c ipset-2.2.3.new/ipset_portmap.c
--- ipset-2.2.3/ipset_portmap.c 2005-01-19 07:38:57.000000000 -0600
+++ ipset-2.2.3.new/ipset_portmap.c 2007-05-31 14:06:58.521634750 -0500
@@ -21,7 +21,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <asm/bitops.h>
+#include <linux/bitops.h>
#include <linux/netfilter_ipv4/ip_set_portmap.h>
#include "ipset.h"