Version bump

Package-Manager: portage-2.1.6.4/cvs/Linux 2.6.27-hardened-r3 i686

6 files changed, 18 insertions, 142 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/Manifest b/net-firewall/nufw/Manifest
index a85a39ced076..47aca66d086d 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -1,24 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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.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.13.tar.bz2 580217 RMD160 536849af58da8cbe632a05bd519f717a6eb115da SHA1 06dd7d5f59cc85c6f1c7ed16ba996a8d0b1eb0b2 SHA256 5c842c4f5dcbf7e6051dc1dcfac5f029f77726f1d45760911e54e3cdbaffb552
-DIST nufw-2.2.14.tar.bz2 571192 RMD160 2ca88ca1e23d96c8d13e09c3260741686a60af01 SHA1 7b7cf829a6a29684b3a4d5abc1d788f2731fde84 SHA256 5553ab6d6ca1a30775be69803d58b32ff5748f9a5615df107ac3f72ddf7aabc5
+DIST nufw-2.2.20.tar.bz2 593676 RMD160 460bd569925bef3f42022342ba2a1d100b96ff64 SHA1 8016d4c796db29c0669b8c0d31bcc84a21cd3a3b SHA256 2042f30e5b12184785ce655f3f58a846ad697ad3f12c7eff0f788feab3c15b86
 DIST nufw-2.2.8.tar.bz2 542010 RMD160 8723d70b66fe0d0f07ecb89a806356b6554be304 SHA1 858e1ce82fd4f8ea2a8a29d289b95e6a31c8b581 SHA256 ef479e7006e2037d78331d5f7f35fa6fffc23bcea9e05e793db723a5052dbf1f
-EBUILD nufw-2.2.13.ebuild 2988 RMD160 7612555a260ef687b164e83d62d48f1589daa03f SHA1 f98b54b2613dc5a5b8825ee06c1973945f264049 SHA256 7a8809e6abde11d3838d8e1bff619b2f35200905f52b588f590c91a04c5531fe
-EBUILD nufw-2.2.14.ebuild 2996 RMD160 157c607b9aba7e75d533b92e7789753ee90b2c6b SHA1 bca86af6ffcfea21417b5521238bc28de8041c9f SHA256 f68d72d08626bbe6a715994d4e186ed37a481fb4de97520ee6852940c555b90d
+EBUILD nufw-2.2.20.ebuild 2962 RMD160 a9be42357c94fec3bfa43c59458fb22fe64c0071 SHA1 4d717117318b8a9835a19f4dc16756e2934a6b1b SHA256 e560b0a3ee7ffd1b4a2d9780c8a7cc0d55d3990b00513b9548b548e9ab3ffe6a
 EBUILD nufw-2.2.8.ebuild 2890 RMD160 3b7e1491e333553b7854bdbe0623c3df000e716b SHA1 56ddbb08211a1136170d7d2f1f10c5d569f6f96e SHA256 159654ab677934b02563cfc1e9631777c9851ee0a08d343266e908733cfd9ea0
-MISC ChangeLog 4301 RMD160 ac9c83daa863dc0a66dd8de69cab90859a8c441e SHA1 001ad5b231772bc1c40626d09d5321f56e50467c SHA256 1a63252e10e28c63d4672f6b419e47b51678f0d38a6dbd9247bc2abcdd976988
-MISC metadata.xml 596 RMD160 910d6a2760bf94a6a479e44c0a0ebca36accf38f SHA1 16e2aca2136d2242072a9fd2895dc05a24c453af SHA256 760d2b302957c5913c45b736d677ab04aab002c1a16ff07ccdb6d3a903138dbc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkioS28ACgkQoeSe8B0zEfwzngCghUG6QClRVsUtjpy5zxfv0clf
-r70An3Ldd/GKarmpI6SckhKiVgNJMrUb
-=nUAs
------END PGP SIGNATURE-----
+MISC ChangeLog 4505 RMD160 fb37714c1502c8aefbf60ab68f299b00a75207d5 SHA1 cbcc0fd285ce05d2b67fdeff0a4b10e149d17f1b SHA256 d8b8a390a6a4b47078dcda2e58b335e389754b9b735776cbcfdc70b6c0657116
+MISC metadata.xml 660 RMD160 b051661f8b453ac370e24f8c221279d86f1992b3 SHA1 ebe26b7ff0b7907dfcbf1f6ceeed918718a7fe76 SHA256 5ca8e0e9c3b2c8a016748fae7b985c6d7b7ab7632080e036513454388ce1a5b3
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"