Version bump. Fixed security bug #197576. Cleaned old vulnerable version.

Package-Manager: portage-2.1.3.19

13 files changed, 43 insertions, 403 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 84907e86b7be..27d79d8c525e 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.18 2007/10/13 18:03:16 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.19 2007/11/12 13:06:33 pva Exp $
+
+*nufw-2.2.7 (12 Nov 2007)
+
+  12 Nov 2007; <pva@gentoo.org> -nufw-2.0.19.ebuild, -nufw-2.0.20.ebuild,
+  -nufw-2.2.4.ebuild, -nufw-2.2.5.ebuild, -nufw-2.2.6.ebuild,
+  +nufw-2.2.7.ebuild:
+  Version bump. Fixed security bug #197576. Cleaned old vulnerable version.
 
 *nufw-2.2.6 (13 Oct 2007)
 
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index c675d0a226d9..34993b021dff 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -18,51 +18,19 @@ 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.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.2.4.tar.bz2 765476 RMD160 a723d834ed7629fc1e1c146f76db38fbebac74f8 SHA1 369f3aafe838376be0f18fa46c395c2cec1aec13 SHA256 188a674aa872aceeeea68cbc4ad598040766b84d7ecaccb21f7d89079b77b099
-DIST nufw-2.2.5.tar.bz2 772407 RMD160 ccad64b2984ee9c2a763129aef4c9d529c9a4e4d SHA1 44a0b83feeb6fe5a24d39b56afabb73e94d1d833 SHA256 a2d1cb5d8b103313621184491f1a8a650282bed033cbc04fece472aaccde6969
-DIST nufw-2.2.6.tar.bz2 794431 RMD160 5b872b125fd35260c8a77689e8a5d02426cd68a4 SHA1 ac2684d9c581b8daf768650a8b194f6286c330ac SHA256 7e85a7344c69ba033d0b459993798271032e894fcdf3a5716ad68e3b523875ef
-EBUILD nufw-2.0.19.ebuild 2157 RMD160 46641bbcaaf83ef64119149f468d9d870becb809 SHA1 ae476601d9b824deb4d7641230542724e35fd774 SHA256 92ef49502f51dce0a7f930632b62569b44e9c3aed9127c348122ee24df31c781
-MD5 e051e05c67b36b90fc9626668154a6c8 nufw-2.0.19.ebuild 2157
-RMD160 46641bbcaaf83ef64119149f468d9d870becb809 nufw-2.0.19.ebuild 2157
-SHA256 92ef49502f51dce0a7f930632b62569b44e9c3aed9127c348122ee24df31c781 nufw-2.0.19.ebuild 2157
-EBUILD nufw-2.0.20.ebuild 2157 RMD160 e0d741acf9baecd0dee44c33b6b2b7bb6ff92691 SHA1 2d10b2546ff08cd12da4b69150bee4e9ec1162dd SHA256 82fbf02c139b9e828d9dbc040b28be5d177699842890df3c277885916647e1c7
-MD5 30538a67df292e19c76c66766533bcb9 nufw-2.0.20.ebuild 2157
-RMD160 e0d741acf9baecd0dee44c33b6b2b7bb6ff92691 nufw-2.0.20.ebuild 2157
-SHA256 82fbf02c139b9e828d9dbc040b28be5d177699842890df3c277885916647e1c7 nufw-2.0.20.ebuild 2157
-EBUILD nufw-2.2.4.ebuild 2270 RMD160 4076be817d1179e188d09bd59c40076d2d2846d1 SHA1 eadeb7d2cd0dfdcadaf01d068f27cdb65d0dd862 SHA256 86edc9505b4d99edbfc680b975d30e591bf5b4271919420646626385e3def6fe
-MD5 f4c652caa49a217d7d793171aecc523c nufw-2.2.4.ebuild 2270
-RMD160 4076be817d1179e188d09bd59c40076d2d2846d1 nufw-2.2.4.ebuild 2270
-SHA256 86edc9505b4d99edbfc680b975d30e591bf5b4271919420646626385e3def6fe nufw-2.2.4.ebuild 2270
-EBUILD nufw-2.2.5.ebuild 2270 RMD160 1fb8b27fd24c82619a2f6df9991afee0e109d7d3 SHA1 6b50847b246fc51ea3412907ee81d1e0502fd19d SHA256 41fd528bf9612d836bbf3ea1277c5bbbafa27bc5fd173aa4dea1bff6c5d8b067
-MD5 733c5a1f25690f630949026be118e108 nufw-2.2.5.ebuild 2270
-RMD160 1fb8b27fd24c82619a2f6df9991afee0e109d7d3 nufw-2.2.5.ebuild 2270
-SHA256 41fd528bf9612d836bbf3ea1277c5bbbafa27bc5fd173aa4dea1bff6c5d8b067 nufw-2.2.5.ebuild 2270
-EBUILD nufw-2.2.6.ebuild 2368 RMD160 265179c39a3034c15aa1ef3ea42a147414949f1c SHA1 f0e8cb20a68d4489ee0df063e668fcb61827a9f1 SHA256 3283fcda4e9daef3d943d89164363cd51487f437333c619f91d18b0f45198094
-MD5 25ac62a764faebd94de4ad78c9ef2a39 nufw-2.2.6.ebuild 2368
-RMD160 265179c39a3034c15aa1ef3ea42a147414949f1c nufw-2.2.6.ebuild 2368
-SHA256 3283fcda4e9daef3d943d89164363cd51487f437333c619f91d18b0f45198094 nufw-2.2.6.ebuild 2368
-MISC ChangeLog 2440 RMD160 6626da8ecd126cb3b32791f59208cdeb57fe83e5 SHA1 75de2b523f1f2d824fa062b131734815a14f13cc SHA256 2bca4117e0a072309614c6579e2e4cf437a541958b96eb02594eb344f6382475
-MD5 8065686b8c3d5eee66a803dda973691d ChangeLog 2440
-RMD160 6626da8ecd126cb3b32791f59208cdeb57fe83e5 ChangeLog 2440
-SHA256 2bca4117e0a072309614c6579e2e4cf437a541958b96eb02594eb344f6382475 ChangeLog 2440
+DIST nufw-2.2.7.tar.bz2 793735 RMD160 f80930ddc8979c860106c5505d7712ba1e157250 SHA1 46a0e868afeba6da558181e0fa789925181b2b8e SHA256 2bd4599b37c726843986d35dbcc72d469cd26e1ae061bca5a99e7fc7ed96577d
+EBUILD nufw-2.2.7.ebuild 2996 RMD160 9192c66379dc40b376d720905bb334b28e77c09e SHA1 1f0e55be8f324f39ed4d7725f334620fcf2bb32d SHA256 3e51e32d1f62a1e1f83b7f7b754b8e7de1fd8d8a228b976aea32836f3278db46
+MD5 422c91483c93df621f51344855bbed69 nufw-2.2.7.ebuild 2996
+RMD160 9192c66379dc40b376d720905bb334b28e77c09e nufw-2.2.7.ebuild 2996
+SHA256 3e51e32d1f62a1e1f83b7f7b754b8e7de1fd8d8a228b976aea32836f3278db46 nufw-2.2.7.ebuild 2996
+MISC ChangeLog 2701 RMD160 9b5b23f00f97884082c441507d59568703888e9b SHA1 d52a0c67e2d10bbe8a1fc5892f659e49d58fd54e SHA256 9b8ba601bdba2ac6141149e47e83e14022095479196a15775d20d7e177815676
+MD5 c4804853aa20a871157954be6f11edf5 ChangeLog 2701
+RMD160 9b5b23f00f97884082c441507d59568703888e9b ChangeLog 2701
+SHA256 9b8ba601bdba2ac6141149e47e83e14022095479196a15775d20d7e177815676 ChangeLog 2701
 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 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
-MD5 a5504e4f51db9cfcabbe7bc13d71d4ce files/digest-nufw-2.0.20 238
-RMD160 88d789cf09dbf09ae1ebb87806178825b5b1efa9 files/digest-nufw-2.0.20 238
-SHA256 548f7fa2bf82448f88154dd903f8fb5dcd6c8790f96eb77c94307261987b2750 files/digest-nufw-2.0.20 238
-MD5 6b9c845b37f899b00fd7afe656a6b083 files/digest-nufw-2.2.4 235
-RMD160 d168ce64e72eef8ab588f319689610f86af1a7a7 files/digest-nufw-2.2.4 235
-SHA256 bc349b3f95fbbf9c9c43785f4d415d610ac51a1d5f28570963d9d96ab59c449b files/digest-nufw-2.2.4 235
-MD5 cb74e17e44e6dc5ace2020bdbf3e4a13 files/digest-nufw-2.2.5 235
-RMD160 4e4d7171a84977d4c124266e81287d8af44a49a0 files/digest-nufw-2.2.5 235
-SHA256 674206fbb65afa402a61eb09416a4e74b583b0475373f9d18258887b58cc6041 files/digest-nufw-2.2.5 235
-MD5 12f0f0737d85576d71478d000a20a340 files/digest-nufw-2.2.6 235
-RMD160 3f9110095d35e7faa5e9dc94107631edddb6bae6 files/digest-nufw-2.2.6 235
-SHA256 719ffe76dfac3359bcd1070f48da2db5b06ffe80139d62ccb63b6e4bbb09467f files/digest-nufw-2.2.6 235
+MD5 5b53f3fbeb08e649d16816ac04bc360d files/digest-nufw-2.2.7 235
+RMD160 1b0f7b522b91557287919c6ed97d3bd30d9457db files/digest-nufw-2.2.7 235
+SHA256 a6c565808adfb0773a0ce6407444af69008bd5dfa0b99e07e14126558ef2ebb0 files/digest-nufw-2.2.7 235
diff --git a/net-firewall/nufw/files/digest-nufw-2.0.19 b/net-firewall/nufw/files/digest-nufw-2.0.19
deleted file mode 100644
index c1ce47f35461..000000000000
--- a/net-firewall/nufw/files/digest-nufw-2.0.19
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2b13f6e66eaaa887150e7c3afeadc31e nufw-2.0.19.tar.bz2 686993
-RMD160 67f67ad1d677b04b8f8405efed0ba7e0147bd57d nufw-2.0.19.tar.bz2 686993
-SHA256 1343e169559478d5b0e8cf6b155004267d35b0c78eef49d440a70107692fc744 nufw-2.0.19.tar.bz2 686993
diff --git a/net-firewall/nufw/files/digest-nufw-2.0.20 b/net-firewall/nufw/files/digest-nufw-2.0.20
deleted file mode 100644
index dc167d2201f4..000000000000
--- a/net-firewall/nufw/files/digest-nufw-2.0.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 43362b8d6d6cc73c131cca9d0aa863e1 nufw-2.0.20.tar.bz2 689034
-RMD160 e0bab63e43d3be6da6ec1e1be1bdf02561df3c8f nufw-2.0.20.tar.bz2 689034
-SHA256 cab2f195fda47cde4388d9a5402e8141ad3d4088b0fe578682c94bdaf90f53e2 nufw-2.0.20.tar.bz2 689034
diff --git a/net-firewall/nufw/files/digest-nufw-2.2.4 b/net-firewall/nufw/files/digest-nufw-2.2.4
deleted file mode 100644
index 80cd09351eca..000000000000
--- a/net-firewall/nufw/files/digest-nufw-2.2.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 df78330beae79f57a0240981cd577ca4 nufw-2.2.4.tar.bz2 765476
-RMD160 a723d834ed7629fc1e1c146f76db38fbebac74f8 nufw-2.2.4.tar.bz2 765476
-SHA256 188a674aa872aceeeea68cbc4ad598040766b84d7ecaccb21f7d89079b77b099 nufw-2.2.4.tar.bz2 765476
diff --git a/net-firewall/nufw/files/digest-nufw-2.2.5 b/net-firewall/nufw/files/digest-nufw-2.2.5
deleted file mode 100644
index 84d697f0a5e6..000000000000
--- a/net-firewall/nufw/files/digest-nufw-2.2.5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 275c2efa71915599446ecceb4e393ace nufw-2.2.5.tar.bz2 772407
-RMD160 ccad64b2984ee9c2a763129aef4c9d529c9a4e4d nufw-2.2.5.tar.bz2 772407
-SHA256 a2d1cb5d8b103313621184491f1a8a650282bed033cbc04fece472aaccde6969 nufw-2.2.5.tar.bz2 772407
diff --git a/net-firewall/nufw/files/digest-nufw-2.2.6 b/net-firewall/nufw/files/digest-nufw-2.2.6
deleted file mode 100644
index 07f0ee9942f2..000000000000
--- a/net-firewall/nufw/files/digest-nufw-2.2.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 c2a6395042e1ddd8aa2acd051ad4b648 nufw-2.2.6.tar.bz2 794431
-RMD160 5b872b125fd35260c8a77689e8a5d02426cd68a4 nufw-2.2.6.tar.bz2 794431
-SHA256 7e85a7344c69ba033d0b459993798271032e894fcdf3a5716ad68e3b523875ef nufw-2.2.6.tar.bz2 794431
diff --git a/net-firewall/nufw/files/digest-nufw-2.2.7 b/net-firewall/nufw/files/digest-nufw-2.2.7
new file mode 100644
index 000000000000..a4a4173b614b
--- /dev/null
+++ b/net-firewall/nufw/files/digest-nufw-2.2.7
@@ -0,0 +1,3 @@
+MD5 3f51aac3fe5a03ac2793f43e9376b9c3 nufw-2.2.7.tar.bz2 793735
+RMD160 f80930ddc8979c860106c5505d7712ba1e157250 nufw-2.2.7.tar.bz2 793735
+SHA256 2bd4599b37c726843986d35dbcc72d469cd26e1ae061bca5a99e7fc7ed96577d nufw-2.2.7.tar.bz2 793735
diff --git a/net-firewall/nufw/nufw-2.0.19.ebuild b/net-firewall/nufw/nufw-2.0.19.ebuild
deleted file mode 100644
index a6f0b07b1065..000000000000
--- a/net-firewall/nufw/nufw-2.0.19.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.19.ebuild,v 1.2 2007/09/18 21:34:17 cedk Exp $
-
-inherit ssl-cert
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-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 postgres prelude \
-unicode nfqueue nfconntrack static"
-
-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 )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s/nuauth-key.pem/nuauth.key/" \
-		-e "s/nuauth-cert.pem/nuauth.pem/" \
-		conf/nuauth.conf || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		$(use_enable static) \
-		$(use_enable pam_nuauth pam-nuauth) \
-		$(use_with prelude prelude-log) \
-		$(use_with mysql mysql-log) \
-		$(use_with postgres pgsql-log) \
-		$(use_with pam system-auth) \
-		$(use_with ldap) \
-		$(use_with gdbm) \
-		$(use_with ident) \
-		$(use_with nfqueue) \
-		$(use_with nfconntrack) \
-		$(use_with unicode utf8) \
-		$(use_enable debug) \
-		--sysconfdir="/etc/nufw" \
-		--localstatedir="/var" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-	docert nufw
-	docert nuauth
-	keepdir /var/run/nuauth
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto scripts
-	dodoc scripts/*
-	docinto conf
-	dodoc conf/*.{nufw,schema,conf,dump,xml}
-}
diff --git a/net-firewall/nufw/nufw-2.0.20.ebuild b/net-firewall/nufw/nufw-2.0.20.ebuild
deleted file mode 100644
index fefe71300dc8..000000000000
--- a/net-firewall/nufw/nufw-2.0.20.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.20.ebuild,v 1.2 2007/09/18 21:34:17 cedk Exp $
-
-inherit ssl-cert
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-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 postgres prelude \
-unicode nfqueue nfconntrack static"
-
-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 )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s/nuauth-key.pem/nuauth.key/" \
-		-e "s/nuauth-cert.pem/nuauth.pem/" \
-		conf/nuauth.conf || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		$(use_enable static) \
-		$(use_enable pam_nuauth pam-nuauth) \
-		$(use_with prelude prelude-log) \
-		$(use_with mysql mysql-log) \
-		$(use_with postgres pgsql-log) \
-		$(use_with pam system-auth) \
-		$(use_with ldap) \
-		$(use_with gdbm) \
-		$(use_with ident) \
-		$(use_with nfqueue) \
-		$(use_with nfconntrack) \
-		$(use_with unicode utf8) \
-		$(use_enable debug) \
-		--sysconfdir="/etc/nufw" \
-		--localstatedir="/var" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-	docert nufw
-	docert nuauth
-	keepdir /var/run/nuauth
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto scripts
-	dodoc scripts/*
-	docinto conf
-	dodoc conf/*.{nufw,schema,conf,dump,xml}
-}
diff --git a/net-firewall/nufw/nufw-2.2.4.ebuild b/net-firewall/nufw/nufw-2.2.4.ebuild
deleted file mode 100644
index 3e48ec133b9a..000000000000
--- a/net-firewall/nufw/nufw-2.2.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.2.4.ebuild,v 1.2 2007/09/18 21:34:17 cedk Exp $
-
-inherit ssl-cert eutils
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-SRC_URI="http://www.nufw.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug ldap mysql pam pam_nuauth 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
-	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
-	pam? ( sys-libs/pam )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s/nuauth-key.pem/nuauth.key/" \
-		-e "s/nuauth-cert.pem/nuauth.pem/" \
-		conf/nuauth.conf || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		--with-shared \
-		$(use_enable static) \
-		$(use_enable pam_nuauth pam-nuauth) \
-		$(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 nfqueue) \
-		$(use_with nfconntrack) \
-		$(use_with unicode utf8) \
-		$(use_enable debug) \
-		--sysconfdir="/etc/nufw" \
-		--localstatedir="/var" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-	docert nufw
-	docert nuauth
-	keepdir /var/run/nuauth
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto 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}
-}
diff --git a/net-firewall/nufw/nufw-2.2.5.ebuild b/net-firewall/nufw/nufw-2.2.5.ebuild
deleted file mode 100644
index ebd04fce52c4..000000000000
--- a/net-firewall/nufw/nufw-2.2.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# 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.2.5.ebuild,v 1.1 2007/09/18 21:54:57 cedk Exp $
-
-inherit ssl-cert eutils
-
-DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
-HOMEPAGE="http://www.nufw.org/"
-SRC_URI="http://www.nufw.org/download/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug ldap mysql pam pam_nuauth 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
-	ldap? ( >=net-nds/openldap-2 )
-	mysql? ( virtual/mysql )
-	pam? ( sys-libs/pam )
-	pam_nuauth? ( sys-libs/pam )
-	postgres? ( dev-db/postgresql )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-e "s/nuauth-key.pem/nuauth.key/" \
-		-e "s/nuauth-cert.pem/nuauth.pem/" \
-		conf/nuauth.conf || die "sed failed"
-}
-
-src_compile() {
-	econf \
-		--with-shared \
-		$(use_enable static) \
-		$(use_enable pam_nuauth pam-nuauth) \
-		$(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 nfqueue) \
-		$(use_with nfconntrack) \
-		$(use_with unicode utf8) \
-		$(use_enable debug) \
-		--sysconfdir="/etc/nufw" \
-		--localstatedir="/var" \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/nufw-init.d nufw
-	newconfd "${FILESDIR}"/nufw-conf.d nufw
-
-	newinitd "${FILESDIR}"/nuauth-init.d nuauth
-	newconfd "${FILESDIR}"/nuauth-conf.d nuauth
-
-	insinto /etc/nufw
-	doins conf/nuauth.conf
-	docert nufw
-	docert nuauth
-	keepdir /var/run/nuauth
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-	docinto 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}
-}
diff --git a/net-firewall/nufw/nufw-2.2.6.ebuild b/net-firewall/nufw/nufw-2.2.7.ebuild
index 13d581dd89f9..87b70bba1b2a 100644
--- a/net-firewall/nufw/nufw-2.2.6.ebuild
+++ b/net-firewall/nufw/nufw-2.2.7.ebuild
@@ -1,6 +1,6 @@
 # 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.2.6.ebuild,v 1.1 2007/10/13 18:03:16 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.7.ebuild,v 1.1 2007/11/12 13:06:33 pva Exp $
 
 inherit autotools ssl-cert eutils
 
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="debug ldap mysql pam pam_nuauth plaintext postgres prelude \
-unicode nfqueue nfconntrack static syslog"
+unicode nfqueue nfconntrack static syslog test"
 
 DEPEND=">=dev-libs/glib-2
 	dev-libs/libgcrypt
@@ -33,10 +33,17 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i \
-		-e "s/nuauth-key.pem/nuauth.key/" \
-		-e "s/nuauth-cert.pem/nuauth.pem/" \
+		-e 's:^#\(nuauth_tls_key="/etc/nufw/\)nuauth-key.pem:\1nuauth.key:' \
+		-e 's:^#\(nuauth_tls_cert="/etc/nufw/\)nuauth-cert.pem:\1nuauth.pem:' \
 		conf/nuauth.conf || die "sed failed"
-	epatch "$FILESDIR"/${P}-auth_mysql.patch
+	epatch "$FILESDIR"/${PN}-2.2.6-auth_mysql.patch
+	sed -i 's:^gcc.*dummy_client.*:libtool --mode=link gcc -o dummy_client dummy_client.c -I../ ../libnuclient.la || exit;:' \
+		src/clients/lib/tests/build_dummy_client.sh || die "sed failed"
+
+	# This tests requre inl_tests to be installed. We don't have it now in our
+	# tree so we disable them for now... for more information see tests/README
+	use test && sed -i "s:\(^TESTS=test_all.py\):#\1:" tests/Makefile.am
+
 	eautoreconf
 }
 
@@ -64,6 +71,13 @@ src_compile() {
 	emake || die "emake failed"
 }
 
+src_test() {
+	ewarn "Some tests are skiped! If you wish to run them read tests/README and"
+	ewarn "do that manually."
+	ebeep 5
+	make check
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 
@@ -75,8 +89,7 @@ src_install() {
 
 	insinto /etc/nufw
 	doins conf/nuauth.conf
-	docert nufw
-	docert nuauth
+	docert nufw nuauth
 	keepdir /var/run/nuauth
 
 	dodoc AUTHORS ChangeLog NEWS README TODO