From 6d7a7f4776711758cf5b59028378f01cd8eba493 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 13 Jun 2009 14:56:04 +0200
Subject: FreeBSD compatibility patches

- update ipset and libpri to latest upstream
---
 package/ipset/Makefile                      |  8 +++++---
 package/ipset/patches/patch-kernel_ip_set_c | 12 ------------
 2 files changed, 5 insertions(+), 15 deletions(-)
 delete mode 100644 package/ipset/patches/patch-kernel_ip_set_c

(limited to 'package/ipset')

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index 504f7be09..66b2c2014 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		ipset
-PKG_VERSION:=		2.3.3a
+PKG_VERSION:=		3.0
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		c7d2f165242edaef5581db0f7d5af520
+PKG_MD5SUM:=		92bb09883dd8a77ec5cfbff1c8932b15
 PKG_DESCR:=		Netfilter ip sets administration utility
 PKG_SECTION:=		net
 PKG_URL:=		http://ipset.netfilter.org
@@ -18,7 +18,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPSET,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-XAKE_FLAGS+=		KERNEL_DIR=${LINUX_DIR} PREFIX=/usr LD=$(TARGET_CROSS)ld
+XAKE_FLAGS+=		V=1 ARCH=${ARCH} KERNEL_DIR=${LINUX_DIR} \
+			PREFIX=/usr LD=$(TARGET_CROSS)ld \
+			CROSS_COMPILE="${TARGET_CROSS}"
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
 INSTALL_TARGET=		binaries_install
diff --git a/package/ipset/patches/patch-kernel_ip_set_c b/package/ipset/patches/patch-kernel_ip_set_c
deleted file mode 100644
index bf931398f..000000000
--- a/package/ipset/patches/patch-kernel_ip_set_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ipset-2.3.3a.orig/kernel/ip_set.c	2008-07-16 19:17:55.000000000 +0200
-+++ ipset-2.3.3a/kernel/ip_set.c	2008-10-20 16:38:11.000000000 +0200
-@@ -24,7 +24,7 @@
- #include <linux/errno.h>
- #include <asm/uaccess.h>
- #include <asm/bitops.h>
--#include <asm/semaphore.h>
-+#include <linux/semaphore.h>
- #include <linux/spinlock.h>
- #include <linux/vmalloc.h>
- 
-- 
cgit v1.2.3