From 5674dbc943c9cf65f06c8e6ba95b1e8c80ff99fb Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Mon, 5 Oct 2009 18:30:58 +0000
Subject: [PATCH] [package] update nufw to 2.2.21

SVN-Revision: 17913
---
 net/nufw/Makefile                          |  4 ++--
 net/nufw/patches/001-no_doc_tests.patch    | 22 ++++++++++++----------
 net/nufw/patches/002-config_binaries.patch |  8 +++++---
 3 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/net/nufw/Makefile b/net/nufw/Makefile
index 385ee50272..e5991af321 100644
--- a/net/nufw/Makefile
+++ b/net/nufw/Makefile
@@ -10,11 +10,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nufw
-PKG_VERSION:=2.2.17
+PKG_VERSION:=2.2.21
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.nufw.org/download/nufw/
-PKG_MD5SUM:=f25ef486b0fc71cd03a3913a26515029
+PKG_MD5SUM:=7eb500e7ddb3db622dc6c5d43b495c9a
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/net/nufw/patches/001-no_doc_tests.patch b/net/nufw/patches/001-no_doc_tests.patch
index fe5a4685ed..97d44599dd 100644
--- a/net/nufw/patches/001-no_doc_tests.patch
+++ b/net/nufw/patches/001-no_doc_tests.patch
@@ -1,21 +1,23 @@
-diff -ruN nufw-2.2.17/Makefile.am nufw-2.2.17.new/Makefile.am
---- nufw-2.2.17/Makefile.am	2008-09-29 19:06:22.000000000 +0200
-+++ nufw-2.2.17.new/Makefile.am	2008-04-04 11:15:37.000000000 +0200
+Index: nufw-2.2.21/Makefile.am
+===================================================================
+--- nufw-2.2.21.orig/Makefile.am	2008-11-18 10:12:32.000000000 +0100
++++ nufw-2.2.21/Makefile.am	2009-10-05 20:26:45.000000000 +0200
 @@ -1,4 +1,4 @@
--SUBDIRS = src scripts doc tests conf python
-+SUBDIRS = src scripts conf python
+-SUBDIRS = src scripts doc tests conf python selinux
++SUBDIRS = src scripts conf python selinux
  
  PATCH_FILES = patches/dump-connection-mark.diff 
  EXTRA_DIST = autogen.sh $(PATCH_FILES)
-diff -ruN nufw-2.2.17/Makefile.in nufw-2.2.17.new/Makefile.in
---- nufw-2.2.17/Makefile.in	2008-09-29 19:06:34.000000000 +0200
-+++ nufw-2.2.17.new/Makefile.in	2008-09-24 11:25:21.000000000 +0200
+Index: nufw-2.2.21/Makefile.in
+===================================================================
+--- nufw-2.2.21.orig/Makefile.in	2009-02-03 22:46:54.000000000 +0100
++++ nufw-2.2.21/Makefile.in	2009-10-05 20:27:05.000000000 +0200
 @@ -193,7 +193,7 @@
  target_alias = @target_alias@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = src scripts doc tests conf python
-+SUBDIRS = src scripts conf python
+-SUBDIRS = src scripts doc tests conf python selinux
++SUBDIRS = src scripts conf python selinux
  PATCH_FILES = patches/dump-connection-mark.diff 
  EXTRA_DIST = autogen.sh $(PATCH_FILES)
  all: all-recursive
diff --git a/net/nufw/patches/002-config_binaries.patch b/net/nufw/patches/002-config_binaries.patch
index eb6ec3cb1f..2f80020f29 100644
--- a/net/nufw/patches/002-config_binaries.patch
+++ b/net/nufw/patches/002-config_binaries.patch
@@ -1,6 +1,8 @@
---- nufw-2.2.11/configure	2008-01-08 22:35:36.000000000 +0100
-+++ nufw-2.2.11.new/configure	2008-02-05 12:31:52.000000000 +0100
-@@ -20555,7 +20555,7 @@
+Index: nufw-2.2.21/configure
+===================================================================
+--- nufw-2.2.21.orig/configure	2009-02-03 22:46:52.000000000 +0100
++++ nufw-2.2.21/configure	2009-10-05 20:27:16.000000000 +0200
+@@ -12546,7 +12546,7 @@
  
    if test x$libgnutls_config_prefix != x ; then
       if test x${LIBGNUTLS_CONFIG+set} != xset ; then
-- 
2.30.2