Version bump

(Portage version: 2.1.6.4/cvs/Linux 2.6.27-hardened-r3 i686)

5 files changed, 14 insertions, 125 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 2f1722624979..047b17710a10 100644
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-firewall/nufw
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.31 2008/08/17 16:01:45 cardoe Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.32 2009/01/17 14:34:46 cedk Exp $
+
+*nufw-2.2.20 (17 Jan 2009)
+
+  17 Jan 2009; Cédric Krier <cedk@gentoo.org>
+  -files/nufw-2.2.13-destdir.patch, metadata.xml, -nufw-2.2.13.ebuild,
+  -nufw-2.2.14.ebuild, +nufw-2.2.20.ebuild:
+  Version bump
 
   17 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-firewall/nufw/files/nufw-2.2.13-destdir.patch b/net-firewall/nufw/files/nufw-2.2.13-destdir.patch
deleted file mode 100644
index 92d1c0c41ea5..000000000000
--- a/net-firewall/nufw/files/nufw-2.2.13-destdir.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru nufw-2.2.13~/src/nuauth/Makefile.am nufw-2.2.13/src/nuauth/Makefile.am
---- nufw-2.2.13~/src/nuauth/Makefile.am	2008-03-28 01:01:51.000000000 +0100
-+++ nufw-2.2.13/src/nuauth/Makefile.am	2008-03-28 01:02:38.000000000 +0100
-@@ -27,7 +27,7 @@
- nuauth_LDADD = $(GLIB_LIBS) -lm  -lgnutls -lsasl2 -lnufw -L$(top_builddir)/src/include/
- 
- install-exec-local:
--	install -d $(localstatedir)/run/nuauth/
-+	install -d "$(DESTDIR)$(localstatedir)/run/nuauth/"
- 
- nuauth$(EXEEXT): $(nuauth_OBJECTS) $(nuauth_DEPENDENCIES)
- 	@rm -f nuauth$(EXEEXT)
diff --git a/net-firewall/nufw/metadata.xml b/net-firewall/nufw/metadata.xml
index 3a4bee6e9fd1..aa0ff0c8f117 100644
--- a/net-firewall/nufw/metadata.xml
+++ b/net-firewall/nufw/metadata.xml
@@ -10,6 +10,7 @@
 	<flag name='nfconntrack'>Use netfilter_conntrack</flag>
 	<flag name='nfqueue'>Use NFQUEUE instead of QUEUE</flag>
 	<flag name='pam_nuauth'>Add support for pam nufw from PAM</flag>
+	<flag name='pam_nufw'>Add support for pam nufw from PAM</flag>
 	<flag name='plaintext'>Add support for authentication with plaintext
 		files</flag>
 </use>
diff --git a/net-firewall/nufw/nufw-2.2.14.ebuild b/net-firewall/nufw/nufw-2.2.14.ebuild
deleted file mode 100644
index ec49cdb881bc..000000000000
--- a/net-firewall/nufw/nufw-2.2.14.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.14.ebuild,v 1.2 2008/05/21 18:54:03 dev-zero Exp $
-
-inherit autotools ssl-cert eutils pam
-
-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 test"
-
-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? ( virtual/postgresql-server )
-	nfqueue? ( net-libs/libnfnetlink
-		net-libs/libnetfilter_queue )
-	nfconntrack? ( net-libs/libnetfilter_conntrack )
-	prelude? ( dev-libs/libprelude )
-	dev-python/ipy"
-RDEPEND=${DEPEND}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i \
-		-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}"/${PN}-2.2.13-destdir.patch
-
-	# This tests require 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
-}
-
-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 mysql mysql-auth) \
-		$(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_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"
-
-	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
-	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}
-
-	if use pam; then
-		pamd_mimic system-auth nufw auth account password session
-	fi
-}
-
-pkg_postinst() {
-	install_cert /etc/nufw/{nufw,nuauth}
-}
diff --git a/net-firewall/nufw/nufw-2.2.13.ebuild b/net-firewall/nufw/nufw-2.2.20.ebuild
index cc5c638bf0df..55beafc88ed3 100644
--- a/net-firewall/nufw/nufw-2.2.13.ebuild
+++ b/net-firewall/nufw/nufw-2.2.20.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.13.ebuild,v 1.2 2008/05/21 18:54:03 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.20.ebuild,v 1.1 2009/01/17 14:34:46 cedk Exp $
 
 inherit autotools ssl-cert eutils pam
 
@@ -38,7 +38,6 @@ src_unpack() {
 		-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}-destdir.patch
 
 	# This tests require 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
@@ -51,7 +50,7 @@ src_compile() {
 	econf \
 		--with-shared \
 		$(use_enable static) \
-		$(use_enable pam_nuauth pam-nuauth) \
+		$(use_enable pam_nuauth pam-nufw) \
 		$(use_with prelude prelude-log) \
 		$(use_with mysql mysql-log) \
 		$(use_with mysql mysql-auth) \
@@ -65,6 +64,7 @@ src_compile() {
 		$(use_with nfconntrack) \
 		$(use_with unicode utf8) \
 		$(use_enable debug) \
+		--with-user-mark \
 		--sysconfdir="/etc/nufw" \
 		--localstatedir="/var" \
 		|| die "econf failed"