Version bump

(Portage version: 2.1.4.4)

5 files changed, 23 insertions, 130 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 56406c81fa2d..436ae765538f 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.27 2008/02/27 20:58:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.28 2008/03/28 00:10:19 cedk Exp $
+
+*nufw-2.2.13 (28 Mar 2008)
+
+  28 Mar 2008; Cédric Krier <cedk@gentoo.org>
+  -files/nufw-2.2.10-destdir.patch, +files/nufw-2.2.13-destdir.patch,
+  -nufw-2.2.10.ebuild, -nufw-2.2.10-r1.ebuild, +nufw-2.2.13.ebuild:
+  Version bump
 
 *nufw-2.2.10-r1 (27 Feb 2008)
 
diff --git a/net-firewall/nufw/files/nufw-2.2.10-destdir.patch b/net-firewall/nufw/files/nufw-2.2.10-destdir.patch
deleted file mode 100644
index 751e776d27d2..000000000000
--- a/net-firewall/nufw/files/nufw-2.2.10-destdir.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -uNr nufw-2.2.10/scripts/nuauth_command/Makefile.am nufw-2.2.10-nw/scripts/nuauth_command/Makefile.am
---- nufw-2.2.10/scripts/nuauth_command/Makefile.am	2007-12-01 06:55:58.000000000 -0700
-+++ nufw-2.2.10-nw/scripts/nuauth_command/Makefile.am	2007-12-20 09:49:35.000000000 -0700
-@@ -5,6 +5,6 @@
- EXTRA_DIST = setup.py
- 
- install-exec-local:
--	$(PYTHON) $(srcdir)/setup.py install --prefix $(prefix)
-+	$(PYTHON) $(srcdir)/setup.py install --prefix $(DESTDIR)$(prefix)
- 
- endif
-diff -uNr nufw-2.2.10/scripts/nuauth_command/Makefile.in nufw-2.2.10-nw/scripts/nuauth_command/Makefile.in
---- nufw-2.2.10/scripts/nuauth_command/Makefile.in	2007-12-04 13:50:41.000000000 -0700
-+++ nufw-2.2.10-nw/scripts/nuauth_command/Makefile.in	2007-12-20 09:49:13.000000000 -0700
-@@ -533,7 +533,7 @@
- 
- 
- @BUILD_NUAUTH_COMMAND_TRUE@install-exec-local:
--@BUILD_NUAUTH_COMMAND_TRUE@	$(PYTHON) $(srcdir)/setup.py install --prefix $(prefix)
-+@BUILD_NUAUTH_COMMAND_TRUE@	$(PYTHON) $(srcdir)/setup.py install --prefix $(DESTDIR)$(prefix)
- # 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/files/nufw-2.2.13-destdir.patch b/net-firewall/nufw/files/nufw-2.2.13-destdir.patch
new file mode 100644
index 000000000000..92d1c0c41ea5
--- /dev/null
+++ b/net-firewall/nufw/files/nufw-2.2.13-destdir.patch
@@ -0,0 +1,12 @@
+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/nufw-2.2.10.ebuild b/net-firewall/nufw/nufw-2.2.10.ebuild
deleted file mode 100644
index b2281d637008..000000000000
--- a/net-firewall/nufw/nufw-2.2.10.ebuild
+++ /dev/null
@@ -1,103 +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.10.ebuild,v 1.3 2007/12/28 19:23:56 cedk Exp $
-
-inherit autotools 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 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? ( dev-db/postgresql )
-	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}/${P}-destdir.patch"
-
-	# 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
-}
-
-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}
-}
-
-pkg_postinst() {
-	install_cert /etc/nufw/{nufw,nuauth}
-}
diff --git a/net-firewall/nufw/nufw-2.2.10-r1.ebuild b/net-firewall/nufw/nufw-2.2.13.ebuild
index 7617d7b7cc7b..8312ef162a30 100644
--- a/net-firewall/nufw/nufw-2.2.10-r1.ebuild
+++ b/net-firewall/nufw/nufw-2.2.13.ebuild
@@ -1,6 +1,6 @@
 # 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.10-r1.ebuild,v 1.1 2008/02/27 20:58:34 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.13.ebuild,v 1.1 2008/03/28 00:10:19 cedk Exp $
 
 inherit autotools ssl-cert eutils pam
 
@@ -38,9 +38,9 @@ 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"
+	epatch "${FILESDIR}"/${P}-destdir.patch
 
-	# This tests requre inl_tests to be installed. We don't have it now in our
+	# 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