net-firewall/nufw: Version bump

(Portage version: 2.1.2.7)

5 files changed, 44 insertions, 13 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 154511bddc09..9b300f098946 100644
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/nufw
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.11 2007/05/30 20:16:55 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.12 2007/05/30 20:43:25 cedk Exp $
+
+*nufw-2.2.0 (30 May 2007)
+
+  30 May 2007; Cédric Krier <cedk@gentoo.org>
+  +files/nufw-2.2.0-nuauth_command.patch, -nufw-2.0.17.ebuild,
+  +nufw-2.2.0.ebuild:
+  Version bump
 
 *nufw-2.0.20 (30 May 2007)
 
diff --git a/net-firewall/nufw/files/digest-nufw-2.0.17 b/net-firewall/nufw/files/digest-nufw-2.0.17
deleted file mode 100644
index 85639c7ac144..000000000000
--- a/net-firewall/nufw/files/digest-nufw-2.0.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d4e7548fbe8a55e899d265abaa30c3b8 nufw-2.0.17.tar.bz2 665673
-RMD160 d85dc9469dad3416e95deae9f41fa1785c4166d0 nufw-2.0.17.tar.bz2 665673
-SHA256 cfc9e53edf803d0c7eeea1d0b092beffbe81403c5ced1fffad7bffb1b3520537 nufw-2.0.17.tar.bz2 665673
diff --git a/net-firewall/nufw/files/digest-nufw-2.2.0 b/net-firewall/nufw/files/digest-nufw-2.2.0
new file mode 100644
index 000000000000..ad94a7909085
--- /dev/null
+++ b/net-firewall/nufw/files/digest-nufw-2.2.0
@@ -0,0 +1,3 @@
+MD5 a72348847f0b64a59c93e84d8818a9ef nufw-2.2.0.tar.bz2 760404
+RMD160 43c85cc7df0aecb5dbd7136395d48e5d0fb3b0e7 nufw-2.2.0.tar.bz2 760404
+SHA256 d920df48d65c46d0fe4a76448fb8c0ea27ea10424d85cea30ac2449c00819f09 nufw-2.2.0.tar.bz2 760404
diff --git a/net-firewall/nufw/files/nufw-2.2.0-nuauth_command.patch b/net-firewall/nufw/files/nufw-2.2.0-nuauth_command.patch
new file mode 100644
index 000000000000..fe98247189c1
--- /dev/null
+++ b/net-firewall/nufw/files/nufw-2.2.0-nuauth_command.patch
@@ -0,0 +1,23 @@
+diff -ru nufw-2.2.0~/scripts/nuauth_command/Makefile.am nufw-2.2.0/scripts/nuauth_command/Makefile.am
+--- nufw-2.2.0~/scripts/nuauth_command/Makefile.am	2007-04-16 23:23:39.000000000 +0200
++++ nufw-2.2.0/scripts/nuauth_command/Makefile.am	2007-05-30 22:27:03.000000000 +0200
+@@ -3,6 +3,6 @@
+ SUBDIRS = scripts
+ 
+ install-exec-local:
+-	./setup.py install
++	./setup.py install --root=$(DESTDIR)
+ 
+ endif
+diff -ru nufw-2.2.0~/scripts/nuauth_command/Makefile.in nufw-2.2.0/scripts/nuauth_command/Makefile.in
+--- nufw-2.2.0~/scripts/nuauth_command/Makefile.in	2007-05-29 00:29:35.000000000 +0200
++++ nufw-2.2.0/scripts/nuauth_command/Makefile.in	2007-05-30 22:29:50.000000000 +0200
+@@ -523,7 +523,7 @@
+ 
+ 
+ @BUILD_NUAUTH_COMMAND_TRUE@install-exec-local:
+-@BUILD_NUAUTH_COMMAND_TRUE@	./setup.py install
++@BUILD_NUAUTH_COMMAND_TRUE@	./setup.py install --root=$(DESTDIR)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
diff --git a/net-firewall/nufw/nufw-2.0.17.ebuild b/net-firewall/nufw/nufw-2.2.0.ebuild
index 2f6e6215b603..1082d4d6f5e7 100644
--- a/net-firewall/nufw/nufw-2.0.17.ebuild
+++ b/net-firewall/nufw/nufw-2.2.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.0.17.ebuild,v 1.1 2007/03/28 19:51:40 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.0.ebuild,v 1.1 2007/05/30 20:43:25 cedk Exp $
 
-inherit ssl-cert
+inherit ssl-cert eutils
 
 DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
 HOMEPAGE="http://www.nufw.org/"
@@ -11,16 +11,14 @@ SRC_URI="http://www.nufw.org/download/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="debug gdbm ident ldap mysql pam pam_nuauth pic postgres prelude \
-unicode nfqueue nfconntrack static"
+IUSE="debug ldap mysql pam pam_nuauth pic plaintext postgres prelude \
+unicode nfqueue nfconntrack static syslog"
 
 DEPEND=">=dev-libs/glib-2
 	dev-libs/libgcrypt
 	>=dev-libs/cyrus-sasl-2
 	net-firewall/iptables
 	>=net-libs/gnutls-1.1
-	gdbm? ( sys-libs/gdbm )
-	ident? ( net-libs/libident )
 	ldap? ( >=net-nds/openldap-2 )
 	mysql? ( virtual/mysql )
 	pam? ( sys-libs/pam )
@@ -38,20 +36,23 @@ src_unpack() {
 		-e "s/nuauth-key.pem/nuauth.key/" \
 		-e "s/nuauth-cert.pem/nuauth.pem/" \
 		conf/nuauth.conf || die "sed failed"
+	epatch "${FILESDIR}/${P}-nuauth_command.patch"
 }
 
 src_compile() {
 	econf \
+		--with-shared \
 		$(use_enable static) \
 		$(use_enable pam_nuauth pam-nuauth) \
 		$(use_with pic) \
 		$(use_with prelude prelude-log) \
 		$(use_with mysql mysql-log) \
 		$(use_with postgres pgsql-log) \
+		$(use_with syslog syslog-log) \
+		$(use_with plaintext plaintext-auth) \
+		--with-mark-group \
 		$(use_with pam system-auth) \
 		$(use_with ldap) \
-		$(use_with gdbm) \
-		$(use_with ident) \
 		$(use_with nfqueue) \
 		$(use_with nfconntrack) \
 		$(use_with unicode utf8) \
@@ -79,7 +80,7 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README TODO
 	docinto scripts
-	dodoc scripts/*
+	dodoc scripts/{clean_conntrack.pl,nuaclgen,nutop,README,ulog_rotate_daily.sh,ulog_rotate_weekly.sh}
 	docinto conf
 	dodoc conf/*.{nufw,schema,conf,dump,xml}
 }