Version bump and add fix for gnutls >= 2.7.1 for bug #279581

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

4 files changed, 144 insertions, 2 deletions

diff --git a/net-firewall/nufw/ChangeLog b/net-firewall/nufw/ChangeLog
index 047b17710a10..76111ac4f99e 100644
--- a/net-firewall/nufw/ChangeLog
+++ b/net-firewall/nufw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-firewall/nufw
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/nufw/ChangeLog,v 1.33 2009/08/02 17:50:24 cedk Exp $
+
+*nufw-2.2.21 (02 Aug 2009)
+
+  02 Aug 2009; Cédric Krier <cedk@gentoo.org> +nufw-2.2.21.ebuild,
+  +files/nufw-2.2.21-fix-gnutls.patch:
+  Version bump and add fix for gnutls >= 2.7.1 for bug #279581
 
 *nufw-2.2.20 (17 Jan 2009)
 
diff --git a/net-firewall/nufw/Manifest b/net-firewall/nufw/Manifest
index d276eac6b2cb..91ec21d91d46 100644
--- a/net-firewall/nufw/Manifest
+++ b/net-firewall/nufw/Manifest
@@ -1,11 +1,14 @@
 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.21-fix-gnutls.patch 950 RMD160 f02b7449f35066d8a32381f9bde0f6f5862600be SHA1 707eee23fc1679afd9022c2d40d73c56fbe3f160 SHA256 36ce80e16e71bf5c2800f7f90311d80677ffca1761842679ea55621062cec698
 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.20.tar.bz2 593676 RMD160 460bd569925bef3f42022342ba2a1d100b96ff64 SHA1 8016d4c796db29c0669b8c0d31bcc84a21cd3a3b SHA256 2042f30e5b12184785ce655f3f58a846ad697ad3f12c7eff0f788feab3c15b86
+DIST nufw-2.2.21.tar.bz2 593079 RMD160 b0e4f337819ace5bcacae3f5b86c82f9b4b4b0dd SHA1 cde6429ba5ab8731234de5e77cc9b108cdf346ab SHA256 7dab7b2e06cc9f72d365680c206ec2e58a4984eec0427f854c686a990656a669
 DIST nufw-2.2.8.tar.bz2 542010 RMD160 8723d70b66fe0d0f07ecb89a806356b6554be304 SHA1 858e1ce82fd4f8ea2a8a29d289b95e6a31c8b581 SHA256 ef479e7006e2037d78331d5f7f35fa6fffc23bcea9e05e793db723a5052dbf1f
 EBUILD nufw-2.2.20.ebuild 2962 RMD160 a9be42357c94fec3bfa43c59458fb22fe64c0071 SHA1 4d717117318b8a9835a19f4dc16756e2934a6b1b SHA256 e560b0a3ee7ffd1b4a2d9780c8a7cc0d55d3990b00513b9548b548e9ab3ffe6a
+EBUILD nufw-2.2.21.ebuild 3007 RMD160 315d8b1ccab41cb8c2feb410b52d421a6f6c47b2 SHA1 538134f4a38b4a71808d382d9c245a69fdcbbaf4 SHA256 34e35f0f1b666b9a6a3aaacc576140ee38d72f8e72677f514a1423b0a92d098b
 EBUILD nufw-2.2.8.ebuild 2890 RMD160 3b7e1491e333553b7854bdbe0623c3df000e716b SHA1 56ddbb08211a1136170d7d2f1f10c5d569f6f96e SHA256 159654ab677934b02563cfc1e9631777c9851ee0a08d343266e908733cfd9ea0
-MISC ChangeLog 4505 RMD160 fb37714c1502c8aefbf60ab68f299b00a75207d5 SHA1 cbcc0fd285ce05d2b67fdeff0a4b10e149d17f1b SHA256 d8b8a390a6a4b47078dcda2e58b335e389754b9b735776cbcfdc70b6c0657116
+MISC ChangeLog 4704 RMD160 7bec9009197cae7acbcdb5c08a834513c55b29e1 SHA1 0db64525f41b99c2b6456bf5fbc48a3ec4eeda75 SHA256 1ab18000e6372e76b0ce4a9d0251e355e9ef160624c1b6a1777fc482579d9698
 MISC metadata.xml 596 RMD160 910d6a2760bf94a6a479e44c0a0ebca36accf38f SHA1 16e2aca2136d2242072a9fd2895dc05a24c453af SHA256 760d2b302957c5913c45b736d677ab04aab002c1a16ff07ccdb6d3a903138dbc
diff --git a/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch b/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
new file mode 100644
index 000000000000..0700c84b06d8
--- /dev/null
+++ b/net-firewall/nufw/files/nufw-2.2.21-fix-gnutls.patch
@@ -0,0 +1,24 @@
+diff -ru nufw-2.2.21~/configure.ac nufw-2.2.21/configure.ac
+--- nufw-2.2.21~/configure.ac	2009-08-02 19:39:52.000000000 +0200
++++ nufw-2.2.21/configure.ac	2009-08-02 19:42:38.000000000 +0200
+@@ -87,6 +87,7 @@
+ #AM_CHECK_PATH([libgcrypt], [gcry_md_open],AC_DEFINE([HAVE_LIBRARY_GCRYPT],[1],[Gcrypt lib flag]), check_gcrypt=no,[-L/usr/local/lib])
+ #AM_CHECK_PATH(libgnutls], [gnutls_init],AC_DEFINE([HAVE_LIBRARY_GNUTLS],[1],[Gnutls lib flag]), check_gnutls=no)
+ 
++PKG_PROG_PKG_CONFIG
+ 
+ NEED_LIBGCRYPT_VERSION=1.2.0
+ AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_VERSION")
+@@ -99,11 +100,7 @@
+ fi
+ 
+ NEED_LIBGNUTLS_VERSION=1.0.16
+-AM_PATH_LIBGNUTLS("$NEED_LIBGNUTLS_VERSION")
+-if test "x$LIBGNUTLS_LIBS" = "x"; then
+-  AC_MSG_ERROR([libgnutls is needed.
+-                See www.gnu.org/software/gnutls/ .])
+-fi
++PKG_CHECK_MODULES(GNUTLS, gnutls >= $NEED_LIBGNUTLS_VERSION,,exit)
+ 
+ #Configure database support, depending on user input
+ AC_ARG_WITH(prelude-log,
diff --git a/net-firewall/nufw/nufw-2.2.21.ebuild b/net-firewall/nufw/nufw-2.2.21.ebuild
new file mode 100644
index 000000000000..76faec48d95e
--- /dev/null
+++ b/net-firewall/nufw/nufw-2.2.21.ebuild
@@ -0,0 +1,109 @@
+# 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.21.ebuild,v 1.1 2009/08/02 17:50:24 cedk 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}/${P}-fix-gnutls.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-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" \
+		|| 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}
+}