net-firewall/nufw: Version bump

Package-Manager: portage-2.1.2.7

6 files changed, 60 insertions, 25 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/Manifest b/net-firewall/nufw/Manifest
index 1c08dacfc34a..d29b48152733 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -6,6 +6,10 @@ AUX nuauth-init.d 522 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc SHA1 0d9c6
 MD5 65f60dfaa7909e33329c7c605767bda8 files/nuauth-init.d 522
 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc files/nuauth-init.d 522
 SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3 files/nuauth-init.d 522
+AUX nufw-2.2.0-nuauth_command.patch 1010 RMD160 785b0fcdb0553a78f26956d2013e19baad0dee6a SHA1 9edeea9f052e8dcdc6ddebab766ab0aee7738908 SHA256 a75ea3625298331b3df6843bbc482b9fd5ea77d1ceaa51d417a6ec97322f0af5
+MD5 680143c225bd08c7bd58b708a274c118 files/nufw-2.2.0-nuauth_command.patch 1010
+RMD160 785b0fcdb0553a78f26956d2013e19baad0dee6a files/nufw-2.2.0-nuauth_command.patch 1010
+SHA256 a75ea3625298331b3df6843bbc482b9fd5ea77d1ceaa51d417a6ec97322f0af5 files/nufw-2.2.0-nuauth_command.patch 1010
 AUX nufw-conf.d 81 RMD160 7bb1a7172915561570f0839e553e9021144421a8 SHA1 1b75760cb661366c8dc1e4307796e3c7e2c25c8d SHA256 c616bb91451f7bf34cfe3139a972be01a562ece6c372d2ee39c3cd5009d2354d
 MD5 6b50505adbb2699687984a213d57ca38 files/nufw-conf.d 81
 RMD160 7bb1a7172915561570f0839e553e9021144421a8 files/nufw-conf.d 81
@@ -14,14 +18,10 @@ AUX nufw-init.d 276 RMD160 3aae0f4b5d77f4af5c1966570112fed29dda17a1 SHA1 8154d2a
 MD5 7b79848ae7a975b23eed5e1ad223f220 files/nufw-init.d 276
 RMD160 3aae0f4b5d77f4af5c1966570112fed29dda17a1 files/nufw-init.d 276
 SHA256 972c3c94a7e290985cc7e8a0ccc40dfa0e10d7eee44e218c70f6fc7f8ed73f9d files/nufw-init.d 276
-DIST nufw-2.0.17.tar.bz2 665673 RMD160 d85dc9469dad3416e95deae9f41fa1785c4166d0 SHA1 22a8882f23c54f198fcd7fe3a08b9d8027a44e96 SHA256 cfc9e53edf803d0c7eeea1d0b092beffbe81403c5ced1fffad7bffb1b3520537
 DIST nufw-2.0.19.tar.bz2 686993 RMD160 67f67ad1d677b04b8f8405efed0ba7e0147bd57d SHA1 f2f5942c359661095d7e1af1ffb17932a2368a88 SHA256 1343e169559478d5b0e8cf6b155004267d35b0c78eef49d440a70107692fc744
 DIST nufw-2.0.20.tar.bz2 689034 RMD160 e0bab63e43d3be6da6ec1e1be1bdf02561df3c8f SHA1 7864060644ad47725dd0e12f4509ecb0c709f8ee SHA256 cab2f195fda47cde4388d9a5402e8141ad3d4088b0fe578682c94bdaf90f53e2
 DIST nufw-2.1.1.tar.bz2 728051 RMD160 45312e0a508aaeebf4f9ddd8112dda22c1865030 SHA1 64b483cd24760e62d308420fb6577165fac979eb SHA256 5b28b09a27f8d71b3b5cd185f3e881afeb91128d7a9854381b86889a3153134c
-EBUILD nufw-2.0.17.ebuild 2181 RMD160 dc1990acf1449a77efb77dd1cb998f85601f4846 SHA1 00f942acb701064bec7da39d6b03610e7486b0c3 SHA256 26a0b9e27d1d757b14e7c64e47983137b84d4d05de64c0bdfee619fdb41a2fbe
-MD5 b5d7f3546cfaca7a6a9de47d54bc82fc nufw-2.0.17.ebuild 2181
-RMD160 dc1990acf1449a77efb77dd1cb998f85601f4846 nufw-2.0.17.ebuild 2181
-SHA256 26a0b9e27d1d757b14e7c64e47983137b84d4d05de64c0bdfee619fdb41a2fbe nufw-2.0.17.ebuild 2181
+DIST nufw-2.2.0.tar.bz2 760404 RMD160 43c85cc7df0aecb5dbd7136395d48e5d0fb3b0e7 SHA1 8336a5d7b3f70c9a8a2f8afc823b137f4e0ba24d SHA256 d920df48d65c46d0fe4a76448fb8c0ea27ea10424d85cea30ac2449c00819f09
 EBUILD nufw-2.0.19.ebuild 2181 RMD160 5ae347cbbf96da785ef1a031afa1bec84ada50de SHA1 211dd84693613c2f617e69527e18151c2bb15f28 SHA256 b021452e5f0817a6efda753646b15c75bbe0a5386dec015fdbec2ae52294966d
 MD5 e316657682a80119692842b789c5b17a nufw-2.0.19.ebuild 2181
 RMD160 5ae347cbbf96da785ef1a031afa1bec84ada50de nufw-2.0.19.ebuild 2181
@@ -34,17 +34,18 @@ EBUILD nufw-2.1.1.ebuild 2203 RMD160 174aebda82c67df23450744c506b4e22767aa870 SH
 MD5 30cc3e4aa5453532d8b37f846510ec0d nufw-2.1.1.ebuild 2203
 RMD160 174aebda82c67df23450744c506b4e22767aa870 nufw-2.1.1.ebuild 2203
 SHA256 b5689d6c9021ff779bccb636bb95de70f991936b255a586137d6043efe187438 nufw-2.1.1.ebuild 2203
-MISC ChangeLog 1528 RMD160 ac18ab099427b01d23389a7493b44a75fb9d7a8c SHA1 50a709c207c3102935f11ec0e80e6cdd7f23dea3 SHA256 a3ff7df5c907d3eebec4d13fdd5afdc0379b241cb4fb6e6210064f7b6566b47d
-MD5 7549fbd2342fdf91edfe6c1637000a5c ChangeLog 1528
-RMD160 ac18ab099427b01d23389a7493b44a75fb9d7a8c ChangeLog 1528
-SHA256 a3ff7df5c907d3eebec4d13fdd5afdc0379b241cb4fb6e6210064f7b6566b47d ChangeLog 1528
+EBUILD nufw-2.2.0.ebuild 2342 RMD160 f4862b11ae5b7f75ba2f450ef746908101af1212 SHA1 f3c9bb2921bc4fade9653e00e592c9713be48550 SHA256 d8fd77087a7cc8a2dad51b9449a90346fcd6b2bd1675d7505635eb4a47a534b0
+MD5 7b4938f617c6b9226d9095b56b7a9cb8 nufw-2.2.0.ebuild 2342
+RMD160 f4862b11ae5b7f75ba2f450ef746908101af1212 nufw-2.2.0.ebuild 2342
+SHA256 d8fd77087a7cc8a2dad51b9449a90346fcd6b2bd1675d7505635eb4a47a534b0 nufw-2.2.0.ebuild 2342
+MISC ChangeLog 1703 RMD160 7e1a7a61363110b6636a67e9612c1a47b0d0aada SHA1 44d5635af7341e95d50ffceaef10a0994d0b6cd9 SHA256 882fb5b6ed5ad9b1dfe244a1b6f8eb692ad5184c0b9610f8b4a4721070390600
+MD5 7fb638adefa20c3d9da2043a8c375f9b ChangeLog 1703
+RMD160 7e1a7a61363110b6636a67e9612c1a47b0d0aada ChangeLog 1703
+SHA256 882fb5b6ed5ad9b1dfe244a1b6f8eb692ad5184c0b9610f8b4a4721070390600 ChangeLog 1703
 MISC metadata.xml 317 RMD160 7462c099b149003e014c1f17e08dd5783de779c4 SHA1 15f04c20107acb198979af7c4270b40d6e0156a7 SHA256 4812839c16f73def560f5191e6141117e5729871ebbab6d02fc4a53bec2d9869
 MD5 4b3e13fee26f7b6dccc9dab192144b92 metadata.xml 317
 RMD160 7462c099b149003e014c1f17e08dd5783de779c4 metadata.xml 317
 SHA256 4812839c16f73def560f5191e6141117e5729871ebbab6d02fc4a53bec2d9869 metadata.xml 317
-MD5 0b2d3d0b797392d12197fc84f8f7f297 files/digest-nufw-2.0.17 238
-RMD160 e868a481cf714dec5abad11ed7b60adf066b7305 files/digest-nufw-2.0.17 238
-SHA256 bae8b10bb753ce56dacc7177cd6cb303dceb07d72b3838d90cccb32a5c7fc464 files/digest-nufw-2.0.17 238
 MD5 adf48a9d15ffee6e8d44648adedc795b files/digest-nufw-2.0.19 238
 RMD160 c7ac77d646f3febeefabccb0ccffd61b464db87f files/digest-nufw-2.0.19 238
 SHA256 79a6329bea103e8f48517b624f84337d75c903808cb4f15d057f37e505f3b860 files/digest-nufw-2.0.19 238
@@ -54,3 +55,6 @@ SHA256 548f7fa2bf82448f88154dd903f8fb5dcd6c8790f96eb77c94307261987b2750 files/di
 MD5 a5a40b008549c5bedcde8927b5009e00 files/digest-nufw-2.1.1 235
 RMD160 23ea2bdf6869f6c9b1fd13f0c916088dd66a11c6 files/digest-nufw-2.1.1 235
 SHA256 bff40cc57cb0cd443575797469845c6317e1573a1be19d0a6e29c95116fd49f9 files/digest-nufw-2.1.1 235
+MD5 92a86333df99b1a5c9cafcf417841393 files/digest-nufw-2.2.0 235
+RMD160 fdff5060ceab4739123c8b71efa5a8d36fd1e418 files/digest-nufw-2.2.0 235
+SHA256 82e3ec353925f902c7a2b6c3a69e2fa4e1a6b9de49ed74c24860e30d8ae371ad files/digest-nufw-2.2.0 235
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}
 }