From d6f40ff9560332d922fa7314541fe8da29f54690 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Sat, 31 Jan 2009 16:31:39 +0000
Subject: [PATCH] [packages] libnetfilter-queue: update to v0.0.16, add
 dependency on kmod-nfnetlink-queue

SVN-Revision: 14316
---
 libs/libnetfilter-queue/Makefile              | 19 ++++++++-------
 .../patches/001-no_utils.patch                | 24 -------------------
 2 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 libs/libnetfilter-queue/patches/001-no_utils.patch

diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile
index 56c11cc614..cc80a9fe6c 100644
--- a/libs/libnetfilter-queue/Makefile
+++ b/libs/libnetfilter-queue/Makefile
@@ -7,13 +7,15 @@
 # $Id$
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=libnetfilter_queue
-PKG_VERSION:=0.0.13
+PKG_VERSION:=0.0.16
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=ftp://ftp.netfilter.org/pub/libnetfilter_queue/
-PKG_MD5SUM:=660cbfd3dc8c10bf9b1803cd2b688256
+PKG_MD5SUM:=b36664e6cd39edbfe46b416a86118add
+
 PKG_FIXUP:=libtool
 
 include $(INCLUDE_DIR)/package.mk
@@ -21,15 +23,14 @@ include $(INCLUDE_DIR)/package.mk
 define Package/libnetfilter-queue
   SECTION:=libs
   CATEGORY:=Libraries
-  DEPENDS:=@LINUX_2_6 +libnfnetlink
-  TITLE:=libnetfilter_queue
-  URL:=http://www1.cs.columbia.edu/~angelos/libnetfilter_queue.html
+  DEPENDS:=@LINUX_2_6 +libnfnetlink +kmod-nfnetlink-queue
+  TITLE:=API to packets queued by the kernel packet filter
+  URL:=http://www.netfilter.org/projects/libnetfilter_queue/
 endef
 
 define Package/libnetfilter-queue/description
-	libnetfilter_queue is a userspace library providing an API to packets
-	that have been queued by the kernel packet filter. It is is part of a system
-	that deprecates the old ip_queue / libipq mechanism.
+ libnetfilter_queue is a userspace library providing an API to packets
+ that have been queued by the kernel packet filter.
 endef
 
 TARGET_CFLAGS += $(FPIC)
@@ -62,7 +63,7 @@ define Build/InstallDev
 
 	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
 	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \
+		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libnetfilter_queue.pc \
 		$(1)/usr/lib/pkgconfig/
 endef
 
diff --git a/libs/libnetfilter-queue/patches/001-no_utils.patch b/libs/libnetfilter-queue/patches/001-no_utils.patch
deleted file mode 100644
index 590d58aff3..0000000000
--- a/libs/libnetfilter-queue/patches/001-no_utils.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -urN libnetfilter_queue-0.0.13/Makefile.am libnetfilter_queue-0.0.13.new/Makefile.am
---- libnetfilter_queue-0.0.13/Makefile.am	2006-12-21 12:33:43.000000000 +0100
-+++ libnetfilter_queue-0.0.13.new/Makefile.am	2008-02-05 11:50:33.000000000 +0100
-@@ -2,7 +2,7 @@
- 
- EXTRA_DIST = $(man_MANS) 
- 
--SUBDIRS = include src utils
-+SUBDIRS = include src
- 
- man_MANS = #nfnetlink_queue.3 nfnetlink_queue.7
- 
-diff -urN libnetfilter_queue-0.0.13/Makefile.in libnetfilter_queue-0.0.13.new/Makefile.in
---- libnetfilter_queue-0.0.13/Makefile.in	2006-12-21 12:40:47.000000000 +0100
-+++ libnetfilter_queue-0.0.13.new/Makefile.in	2008-02-05 11:50:27.000000000 +0100
-@@ -149,7 +149,7 @@
- 
- EXTRA_DIST = $(man_MANS) 
- 
--SUBDIRS = include src utils
-+SUBDIRS = include src
- 
- man_MANS = #nfnetlink_queue.3 nfnetlink_queue.7
- 
-- 
2.30.2