Version bump

Package-Manager: portage-2.1.4.4

6 files changed, 27 insertions, 135 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/Manifest b/net-firewall/nufw/Manifest
index 10b7b3b08fc8..58beebc03b8f 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -1,13 +1,12 @@
 AUX nuauth-conf.d 19 RMD160 be74e62976926a6ebe6930a2d2bf2032dd3ae704 SHA1 2ac3ff2ea1b11b6534df2856849904b515119086 SHA256 dc562afba21239a5a30889b04c021b36b9c19ca17a6d8071bb848eab2d70c538
 AUX nuauth-init.d 522 RMD160 89f255a1ebe12ef629ec9963834c445e0df4a6dc SHA1 0d9c6b0d3434da7f29967e9a727c9b6dbe2a8f8e SHA256 18c988dccda3cbbef92d0a218a8eba62694b5a5fc66980a9120bbd146629ccf3
-AUX nufw-2.2.10-destdir.patch 1164 RMD160 0c00d6e460dc3166150a16bc0bea47958d1367a9 SHA1 4793e70a0175a06723ac2ec739427c700260a069 SHA256 e8d7bc8e99cfe074a2e44c0d47518249904c7f37ddca038e48b96d219157ebd7
+AUX nufw-2.2.13-destdir.patch 543 RMD160 40f0959ee1f8e667acfbf2059f3445097e35e2f7 SHA1 1a59581ac5d8dc410a9d66fca82eb75bb4ea3927 SHA256 ac6557340f014c27dda73b24b7ca3a398a771d078a348da6967312608655ee2d
 AUX nufw-2.2.6-auth_mysql.patch 734 RMD160 a30e44787aefbe153aaaa35f05b8a8e513151ffb SHA1 885876c8c6545841bbad62c3f32086f05a6c7568 SHA256 e7785b9a46c575cedb6b792af88674fac1e0ab3629e5e084df136d55b0ead9b0
 AUX nufw-conf.d 81 RMD160 7bb1a7172915561570f0839e553e9021144421a8 SHA1 1b75760cb661366c8dc1e4307796e3c7e2c25c8d SHA256 c616bb91451f7bf34cfe3139a972be01a562ece6c372d2ee39c3cd5009d2354d
 AUX nufw-init.d 276 RMD160 3aae0f4b5d77f4af5c1966570112fed29dda17a1 SHA1 8154d2a7c2c70077b81ae19cd53e98ae8380774a SHA256 972c3c94a7e290985cc7e8a0ccc40dfa0e10d7eee44e218c70f6fc7f8ed73f9d
-DIST nufw-2.2.10.tar.bz2 554056 RMD160 42d6bfd7b6389b69a35c4f3609b38a3896741846 SHA1 4b51b225c27fb8828699b388079950c6b014a1ee SHA256 f150a3668a347c2055d64c07bb5aede128c98e00b8dd92ebf1245a1a02f4dc11
+DIST nufw-2.2.13.tar.bz2 580217 RMD160 536849af58da8cbe632a05bd519f717a6eb115da SHA1 06dd7d5f59cc85c6f1c7ed16ba996a8d0b1eb0b2 SHA256 5c842c4f5dcbf7e6051dc1dcfac5f029f77726f1d45760911e54e3cdbaffb552
 DIST nufw-2.2.8.tar.bz2 542010 RMD160 8723d70b66fe0d0f07ecb89a806356b6554be304 SHA1 858e1ce82fd4f8ea2a8a29d289b95e6a31c8b581 SHA256 ef479e7006e2037d78331d5f7f35fa6fffc23bcea9e05e793db723a5052dbf1f
-EBUILD nufw-2.2.10-r1.ebuild 2978 RMD160 a3fb26596d4c395ce8fef25cb1d7c0f344b03519 SHA1 971121f5b50456fb745c19a4d4a4ba0d31a2e004 SHA256 561582642904f93d4d3740abc738bd0d90763eded5f4766ea3eec2fb30b38a04
-EBUILD nufw-2.2.10.ebuild 2888 RMD160 bbd14c8bb792222490795de7d707b3fd8fb78137 SHA1 41adf78216cda43c645d5be47f5ddfd7e23724eb SHA256 32e00585331547fce7aa0000a2f78131783feab3f221ac82f83f7597d85b4d26
+EBUILD nufw-2.2.13.ebuild 2976 RMD160 af894902ab8d9aece6b84a706d42b18926110432 SHA1 fc8abe6145bb7afaefd31436acb5ff76919f9c05 SHA256 8f835f7ba776ed57a3d8b44a9a00eff872625788a971fceedf7df09ceb5e0db2
 EBUILD nufw-2.2.8.ebuild 2879 RMD160 1acc2839454f22c77869b8a18e0112c000780640 SHA1 5780b8f70ce1edaca6a84440717fe2af58346901 SHA256 8bbf23de74efbb2555230be438f2ff59ebcdabbf9a2e190f366fa4be8cd84a7f
-MISC ChangeLog 3640 RMD160 fc9b4f8c983d347972b177f55d3e93e52f71c182 SHA1 c825338b437a43d4a7d7a6d837e20ced4caf46d5 SHA256 7c2ffd83dcceb3044f5af2de79ff01eb79dd05548f58bf26f150907f5058c759
+MISC ChangeLog 3869 RMD160 20cf5f785b536e266c05ee42ae5b4cb7b139b3a9 SHA1 57aa9b3dd7661add65b5707ca1789c42f24b1793 SHA256 dc06afdd68eab2715af9ac5a52f4e5f0a9194db9f7a2ca439b7d0701d3e95b2f
 MISC metadata.xml 317 RMD160 7462c099b149003e014c1f17e08dd5783de779c4 SHA1 15f04c20107acb198979af7c4270b40d6e0156a7 SHA256 4812839c16f73def560f5191e6141117e5729871ebbab6d02fc4a53bec2d9869
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