From f4ade6c30d113f1aca1aebb6dfeef84d89be16da Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Fri, 20 Nov 2009 17:08:36 +0100
Subject: [PATCH] nufw: Updated (2.2.4 -> 2.2.21)

---
 security/nufw/nufw.conf | 17 ++++-------------
 security/nufw/nufw.desc |  7 ++++---
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/security/nufw/nufw.conf b/security/nufw/nufw.conf
index 362e9e300..22bb61c88 100644
--- a/security/nufw/nufw.conf
+++ b/security/nufw/nufw.conf
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../nufw/nufw.conf
-# Copyright (C) 2007 The OpenSDE Project
+# Copyright (C) 2007 - 2009 The OpenSDE Project
 #
 # More information can be found in the files COPYING and README.
 #
@@ -55,13 +55,9 @@ fi
 # Support user activity logging in Mysql database
 if pkginstalled mysql ; then
 	pkgprefix -t mysql
-	# 2007-08-04 NOTE: disabled because it doesn't build at the moment
-	#var_append confopt ' ' "--with-mysql-log"
-	var_append CPPFLAGS ' ' "-I$root$( pkgprefix includedir mysql )"
-	var_append CFLAGS ' ' "-I$root$( pkgprefix includedir mysql )"
-	var_append LDFLAGS ' ' "-L$root$( pkgprefix libdir mysql )/mysql"
-	var_append LD_RUN_PATH ':' "$( pkgprefix libdir mysql )/mysql"
-	export CPPFLAGS CFLAGS LDFLAGS LD_RUN_PATH
+	var_append confopt ' ' "--with-mysql-log"
+	var_append GCC_WRAPPER_APPEND ' ' "-I$(pkgprefix -r includedir mysql)"
+	var_append GCC_WRAPPER_APPEND ' ' "-L$(pkgprefix -r libdir mysql)/mysql"
 fi
 
 # Support user activity logging in PostgreSQL database
@@ -79,10 +75,5 @@ var_append confopt ' ' "--with-syslog-log"
 
 # Support LDAP directory for users and acl lookup
 if pkginstalled openldap ; then
-	pkgprefix -t openldap
 	var_append confopt ' ' "--with-ldap"
-	var_append CPPFLAGS ' ' "-I$root$( pkgprefix includedir openldap )"
-	var_append CFLAGS ' ' "-I$root$( pkgprefix includedir openldap )"
-	var_append LDFLAGS ' ' "-L$root$( pkgprefix libdir openldap )"
-	export CPPFLAGS CFLAGS LDFLAGS
 fi
diff --git a/security/nufw/nufw.desc b/security/nufw/nufw.desc
index 3b070bc10..400c54823 100644
--- a/security/nufw/nufw.desc
+++ b/security/nufw/nufw.desc
@@ -2,7 +2,7 @@
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../nufw/nufw.desc
-[COPY] Copyright (C) 2007 The OpenSDE Project
+[COPY] Copyright (C) 2007 - 2009 The OpenSDE Project
 [COPY]
 [COPY] More information can be found in the files COPYING and README.
 [COPY]
@@ -26,10 +26,11 @@
 [M] Christian Wiese <morfoh@opensde.org>
 
 [C] extra/security
+[F] LDAP-QUIRK
 
 [L] GPL
 [S] Stable
-[V] 2.2.4
+[V] 2.2.21
 [P] X -----5---9 800.000
 
-[D] 234347963 nufw-2.2.4.tar.bz2 http://www.nufw.org/download/nufw/
+[D] 2646758457 nufw-2.2.21.tar.bz2 http://www.nufw.org/download/nufw/