version bump; cleanup

Package-Manager: portage-2.1.4

5 files changed, 82 insertions, 29 deletions

diff --git a/www-apache/mod_auth_nufw/ChangeLog b/www-apache/mod_auth_nufw/ChangeLog
index b042f77691ed..dbac198cfca1 100644
--- a/www-apache/mod_auth_nufw/ChangeLog
+++ b/www-apache/mod_auth_nufw/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_auth_nufw
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.4 2007/12/28 16:42:59 hollow Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/ChangeLog,v 1.5 2008/01/27 17:17:24 hollow Exp $
+
+*mod_auth_nufw-2.2.1 (27 Jan 2008)
+
+  27 Jan 2008; Benedikt Böhm <hollow@gentoo.org>
+  files/50_mod_auth_nufw.conf, +mod_auth_nufw-2.2.1.ebuild:
+  version bump; cleanup
 
   28 Dec 2007; Benedikt Böhm <hollow@gentoo.org>
   mod_auth_nufw-2.2.0.ebuild:
diff --git a/www-apache/mod_auth_nufw/Manifest b/www-apache/mod_auth_nufw/Manifest
index 5b0955f6010d..84de42d80f59 100644
--- a/www-apache/mod_auth_nufw/Manifest
+++ b/www-apache/mod_auth_nufw/Manifest
@@ -1,23 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 50_mod_auth_nufw.conf 593 RMD160 e3bd71372572ece8431cf766532cdfac6931a673 SHA1 967e41ba64b9c6788241b5525d38b68b35f00823 SHA256 b785a3a180313d484d2076092e21eb3d1909d20c6838758fc02b08e4cc5502de
-MD5 40a36aa1ef23bb3707651ea3bf10853f files/50_mod_auth_nufw.conf 593
-RMD160 e3bd71372572ece8431cf766532cdfac6931a673 files/50_mod_auth_nufw.conf 593
-SHA256 b785a3a180313d484d2076092e21eb3d1909d20c6838758fc02b08e4cc5502de files/50_mod_auth_nufw.conf 593
+AUX 50_mod_auth_nufw.conf 117 RMD160 fa810b83fd166403daff48daa650e035bbc4a9cb SHA1 534b31b5ff2ea739fa3a47f728bb5b7edfdd0ad6 SHA256 3e729160a919aa8d1aad215cebf10d89a3295d0edf830bb6a333d06b37d27bd3
+MD5 7dfa940d6056d82ade31b9a48eb86cef files/50_mod_auth_nufw.conf 117
+RMD160 fa810b83fd166403daff48daa650e035bbc4a9cb files/50_mod_auth_nufw.conf 117
+SHA256 3e729160a919aa8d1aad215cebf10d89a3295d0edf830bb6a333d06b37d27bd3 files/50_mod_auth_nufw.conf 117
 AUX mod_auth_nufw-2.2.0-configure_in.patch 1937 RMD160 caeb6b9c6ead11bf9ee53836799441779b43cd7f SHA1 d28bfc59f40126479d101a2be74625193c23fa6e SHA256 c02cea50dde1c26ceeef3dcbf66508d02d648493cd7f780711068a26e3577e2a
 MD5 fb078cf917fe304f04ed71b4042d91ae files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 RMD160 caeb6b9c6ead11bf9ee53836799441779b43cd7f files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 SHA256 c02cea50dde1c26ceeef3dcbf66508d02d648493cd7f780711068a26e3577e2a files/mod_auth_nufw-2.2.0-configure_in.patch 1937
 DIST mod_auth_nufw-2.2.0.tar.gz 42703 RMD160 75469adb58e24dd06837eea1256cf2069e76ac93 SHA1 46a37b29d5c2e1bce320505cd8221a582d3cc0d8 SHA256 e97379c4b032bb8109df048ca675646ff9c9df934c3089c882ba2f1fef49e173
+DIST mod_auth_nufw-2.2.1.tar.gz 104300 RMD160 87b5e86f50fa169ed9e9224405f1dd27bcc504f0 SHA1 ebb1837b7d7f86d6e21fe840cfaff9b834b51011 SHA256 fee066dd68c602dd5082691e19e419c4e451a631158611d5992e52e91df154b9
 EBUILD mod_auth_nufw-2.2.0.ebuild 1569 RMD160 1e916d0359839804a9a8069553e0ed71d33d4b19 SHA1 0b24c8083f17f25c4ee4e3b545ac9449dfc2026b SHA256 816ee01a3f06f0c497e6f4e8ec55b3c7afe1ab04426ba013dc44b994f7d826eb
 MD5 704ac3b506c3c8f3b97022f502edb3d7 mod_auth_nufw-2.2.0.ebuild 1569
 RMD160 1e916d0359839804a9a8069553e0ed71d33d4b19 mod_auth_nufw-2.2.0.ebuild 1569
 SHA256 816ee01a3f06f0c497e6f4e8ec55b3c7afe1ab04426ba013dc44b994f7d826eb mod_auth_nufw-2.2.0.ebuild 1569
-MISC ChangeLog 1504 RMD160 6440426fe95692e84d21a8652bac803e71096820 SHA1 05ad14cbabde7c1e6471cf956858faab73cbf7bf SHA256 396020f8e24da58cd2111f29e0e0c6ff7753e5f4165068614d5449bcc5a8d9e1
-MD5 bf3a70b730f84758ccad7eb38c644d35 ChangeLog 1504
-RMD160 6440426fe95692e84d21a8652bac803e71096820 ChangeLog 1504
-SHA256 396020f8e24da58cd2111f29e0e0c6ff7753e5f4165068614d5449bcc5a8d9e1 ChangeLog 1504
+EBUILD mod_auth_nufw-2.2.1.ebuild 1414 RMD160 e84814598e1f4dd35f49742786674b6aa4575ad2 SHA1 d4f28089be90a81d0348c59fee92d1521941322d SHA256 053d8fb949eb6c6226144d644b4e9b9e666d3677e2b8f34c0516735f43918270
+MD5 27d08352196df3634eea25eab764e3b4 mod_auth_nufw-2.2.1.ebuild 1414
+RMD160 e84814598e1f4dd35f49742786674b6aa4575ad2 mod_auth_nufw-2.2.1.ebuild 1414
+SHA256 053d8fb949eb6c6226144d644b4e9b9e666d3677e2b8f34c0516735f43918270 mod_auth_nufw-2.2.1.ebuild 1414
+MISC ChangeLog 1675 RMD160 323fc49b6b9408e03487b6f50c5b0f0c7deb7f0e SHA1 7498e32a7412a3f393c47fb9ded9e895fdf49ab3 SHA256 409d60429ef27775584f7fedbb4712372833b296b4822c2157264b024bfe6f8f
+MD5 b8a5b2c202cfdbe7c180991a01ddbfc4 ChangeLog 1675
+RMD160 323fc49b6b9408e03487b6f50c5b0f0c7deb7f0e ChangeLog 1675
+SHA256 409d60429ef27775584f7fedbb4712372833b296b4822c2157264b024bfe6f8f ChangeLog 1675
 MISC metadata.xml 298 RMD160 42658edeb89d62bf18bc9562280953153dcb182a SHA1 d9e6e505b41289470f4f5ff83db6768b0dbda994 SHA256 3f0c5e1607b53756bf87acea7196a98866f254aaec52a86001eb949d3d96bccc
 MD5 6139eed6578304a312c52508728fde77 metadata.xml 298
 RMD160 42658edeb89d62bf18bc9562280953153dcb182a metadata.xml 298
@@ -25,10 +30,13 @@ SHA256 3f0c5e1607b53756bf87acea7196a98866f254aaec52a86001eb949d3d96bccc metadata
 MD5 2bd7a0b4020a8dd098d0de86ec309ce1 files/digest-mod_auth_nufw-2.2.0 256
 RMD160 b5c1c516320c8dd74c0e591014b8b4c28c5d4177 files/digest-mod_auth_nufw-2.2.0 256
 SHA256 0575961c3411e6e8adfb250393a98eb6588757cf24b22a22b5b41c3e055bf872 files/digest-mod_auth_nufw-2.2.0 256
+MD5 019409851ab3b99a981ef493b97a526f files/digest-mod_auth_nufw-2.2.1 259
+RMD160 d8323e243d27cfb293947bf7db3eca6b2aaa0fde files/digest-mod_auth_nufw-2.2.1 259
+SHA256 95001bed631583868ddfbbf2b683f112506d0f1bd360c245fb755041db4f1db7 files/digest-mod_auth_nufw-2.2.1 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.8 (GNU/Linux)
 
-iD8DBQFHdSermPFBzbX68WERAvkFAJsFf3S1uP0R/ZXb5QPk3I5bkdA6HACfSpcB
-XpVUeCRTCWzOgc1eKjf9b20=
-=7VM3
+iEYEARECAAYFAkecvKkACgkQmPFBzbX68WGolwCbBw5mlf0BuNMrd+MKGchw9u20
+XRAAnRnxdTwrpUH33aov0uLTGTH+SKs/
+=lAHh
 -----END PGP SIGNATURE-----
diff --git a/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf b/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf
index 3b0aa0dc3f06..23e03dcf1760 100644
--- a/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf
+++ b/www-apache/mod_auth_nufw/files/50_mod_auth_nufw.conf
@@ -1,18 +1,5 @@
 <IfDefine AUTH_NUFW>
-  <IfModule !mod_auth_nufw.c>
-    LoadModule mod_auth_nufw extramodules/mod_auth_nufw.so
-  </IfModule>
+LoadModule mod_auth_nufw extramodules/mod_auth_nufw.so
 </IfDefine>
 
-<IfModule mod_auth_nufw.c>
-
-#
-#This module allows for a totally transparent, and strict, identification of users.
-#It uses Nufw as backend, performs SQL requests on the Nufw-fed SQL tables, and 
-#optionnaly resolves numeric userids through a LDAP directory. 
-#It also features LDAP basic caching features.
-#This module is probably of no use if not used with Nufw, as it lays 
-#on a database constantly up-to-date with user network activity.
-#
-
-</IfModule>
+# vim: ts=4 filetype=apache
diff --git a/www-apache/mod_auth_nufw/files/digest-mod_auth_nufw-2.2.1 b/www-apache/mod_auth_nufw/files/digest-mod_auth_nufw-2.2.1
new file mode 100644
index 000000000000..bd1b8efd0445
--- /dev/null
+++ b/www-apache/mod_auth_nufw/files/digest-mod_auth_nufw-2.2.1
@@ -0,0 +1,3 @@
+MD5 5aa5c12e753de23368a5b84b882206fa mod_auth_nufw-2.2.1.tar.gz 104300
+RMD160 87b5e86f50fa169ed9e9224405f1dd27bcc504f0 mod_auth_nufw-2.2.1.tar.gz 104300
+SHA256 fee066dd68c602dd5082691e19e419c4e451a631158611d5992e52e91df154b9 mod_auth_nufw-2.2.1.tar.gz 104300
diff --git a/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild
new file mode 100644
index 000000000000..071290882413
--- /dev/null
+++ b/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_auth_nufw/mod_auth_nufw-2.2.1.ebuild,v 1.1 2008/01/27 17:17:24 hollow Exp $
+
+inherit eutils apache-module autotools
+
+DESCRIPTION="A NuFW authentication module for Apache."
+HOMEPAGE="http://software.inl.fr/trac/wiki/EdenWall/mod_auth_nufw"
+SRC_URI="http://software.inl.fr/releases/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="mysql postgres"
+
+DEPEND="mysql? ( virtual/mysql )
+	postgres? ( dev-db/postgresql )"
+RDEPEND="${DEPEND}"
+
+APACHE2_MOD_FILE="mod_auth_nufw.so"
+APACHE2_MOD_CONF="50_${PN}"
+APACHE2_MOD_DEFINE="AUTH_NUFW"
+
+DOCFILES="doc/mod_auth_nufw.html"
+
+need_apache2_2
+
+pkg_setup() {
+	local cnt=0
+	use mysql && cnt="$((${cnt} + 1))"
+	use postgres && cnt="$((${cnt} + 1))"
+	if [[ "${cnt}" -ne 1 ]] ; then
+		eerror "You have set ${P} to use multiple SQL engines."
+		eerror "I don't know which to use!"
+		eerror "You can use /etc/portage/package.use to	set per-package USE flags."
+		eerror "Set it so only one SQL engine type, mysql or postgres, is enabled."
+		die "Please set only one SQL engine type!"
+	fi
+}
+
+src_compile() {
+	CPPFLAGS="-I$(/usr/bin/apr-1-config --includedir) ${CPPFLAGS}" \
+	econf \
+		--with-apache22 \
+		--with-apxs=${APXS2} \
+		$(use_with mysql) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}