Version bump and fix include dir for bug #308957

Package-Manager: portage-2.1.7.16/cvs/Linux i686

3 files changed, 109 insertions, 2 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index c607fc625c93..3ae3bdac4d6b 100644
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-firewall/nufw
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.36 2010/03/18 14:59:22 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.37 2010/03/18 17:11:18 cedk Exp $
+
+*nufw-2.2.22 (18 Mar 2010)
+
+  18 Mar 2010; Cédric Krier <cedk@gentoo.org> +nufw-2.2.22.ebuild:
+  Version bump and fix include dir for bug #308957
 
   18 Mar 2010; Cédric Krier <cedk@gentoo.org>
   -files/nufw-2.2.6-auth_mysql.patch, -nufw-2.2.8.ebuild:
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index 580171007764..35a1f2b3c231 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -4,6 +4,8 @@ AUX nufw-2.2.21-fix-gnutls.patch 950 RMD160 f02b7449f35066d8a32381f9bde0f6f58626
 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.21.tar.bz2 593079 RMD160 b0e4f337819ace5bcacae3f5b86c82f9b4b4b0dd SHA1 cde6429ba5ab8731234de5e77cc9b108cdf346ab SHA256 7dab7b2e06cc9f72d365680c206ec2e58a4984eec0427f854c686a990656a669
+DIST nufw-2.2.22.tar.bz2 597491 RMD160 9fba3d33b5fa5697fb07c7d68b9ecd1b69eb593e SHA1 5e8417f3bce5f925ef5fd62ef40ec1a236af9f4a SHA256 92603813b4138bfd52b5873c68d7c6e43f78885a414067e57bd2c1e8eba66b8c
 EBUILD nufw-2.2.21.ebuild 3007 RMD160 f213ad7b51da761cb54f03cb9c328138c5531d93 SHA1 0602e0689ed4f2e9af108e8f7cf6272d81303c6c SHA256 ce18bdef6af2838e12cc32c57ce27b5448687677266ec5e7fcfb28f5d9befcb9
-MISC ChangeLog 5006 RMD160 f58ebd27f67a70e3c13306884b205349be394235 SHA1 6b8eda934617a89ac5a4d681647849806921efa7 SHA256 d5caf7e3809b336d05479bb70133189ac527409d1b9c0df5f04f2db43d7f3bcd
+EBUILD nufw-2.2.22.ebuild 2697 RMD160 9f12344f19e53512f2c06442e2584712043e3309 SHA1 aa2b75480afebb4eb30a482fbea88b45465fcbb3 SHA256 f77b0297aabec5a84144522eb5b916aad2e788448843298a894316d3b4751d7a
+MISC ChangeLog 5154 RMD160 fc73ade8fc02533498bb3c892afac2bfc6ec186d SHA1 43a7ff4d175de63a94bdb0121a620d5fc4e17548 SHA256 3767fc45984a3d686770048439fb2af835dcbee3b946d2eb1d5894d297ee4af8
 MISC metadata.xml 596 RMD160 910d6a2760bf94a6a479e44c0a0ebca36accf38f SHA1 16e2aca2136d2242072a9fd2895dc05a24c453af SHA256 760d2b302957c5913c45b736d677ab04aab002c1a16ff07ccdb6d3a903138dbc
diff --git a/net-firewall/nufw/nufw-2.2.22.ebuild b/net-firewall/nufw/nufw-2.2.22.ebuild
new file mode 100644
index 000000000000..d0145a497f46
--- /dev/null
+++ b/net-firewall/nufw/nufw-2.2.22.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/nufw-2.2.22.ebuild,v 1.1 2010/03/18 17:11:18 cedk Exp $
+
+inherit ssl-cert eutils pam
+
+DESCRIPTION="An enterprise grade authenticating firewall based on netfilter"
+HOMEPAGE="http://www.nufw.org/"
+SRC_URI="http://www.nufw.org/attachments/download/39/${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"
+}
+
+src_compile() {
+	econf \
+		--with-shared \
+		$(use_enable static) \
+		$(use_enable pam_nuauth pam-nufw) \
+		$(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) \
+		--with-user-mark \
+		--sysconfdir="/etc/nufw" \
+		--localstatedir="/var" \
+		--includedir="/usr/include/nufw" \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_test() {
+	ewarn "Tests are skiped! They require root privileges."
+	true
+}
+
+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}
+}