added DEFINE + fixed some bugs + version bump

(Portage version: 2.0.51.16)

6 files changed, 67 insertions, 7 deletions

diff --git a/net-www/mod_ldap_userdir/ChangeLog b/net-www/mod_ldap_userdir/ChangeLog
index 8de754d497bc..25d5664f175d 100644
--- a/net-www/mod_ldap_userdir/ChangeLog
+++ b/net-www/mod_ldap_userdir/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-www/mod_ldap_userdir
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/ChangeLog,v 1.8 2005/01/13 23:38:50 vericgar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/ChangeLog,v 1.9 2005/02/25 12:14:39 hollow Exp $
+
+*mod_ldap_userdir-1.1.5 (25 Feb 2005)
+
+  25 Feb 2005; Benedikt Boehm <hollow@gentoo.org>
+  files/1.1.4-r1/47_mod_ldap_userdir.conf, mod_ldap_userdir-1.1.4-r1.ebuild,
+  +mod_ldap_userdir-1.1.5.ebuild:
+  added DEFINE + fixed some bugs + version bump
 
   13 Jan 2005; Michael Stewart <vericgar@gentoo.org>
   mod_ldap_userdir-1.1.4-r1.ebuild:
diff --git a/net-www/mod_ldap_userdir/Manifest b/net-www/mod_ldap_userdir/Manifest
index befc5cef98ab..67826ea2325d 100644
--- a/net-www/mod_ldap_userdir/Manifest
+++ b/net-www/mod_ldap_userdir/Manifest
@@ -1,10 +1,12 @@
-MD5 e33c05e4d235260908ea91bbd68f3d3a ChangeLog 1351
+MD5 87e02032b3bd0b9263978242460c9aba ChangeLog 1600
 MD5 0d18f0fe5d603b41b988373892caf195 metadata.xml 226
 MD5 43234743c77c311d56dc31df3394210c mod_ldap_userdir-1.1.1.ebuild 1760
+MD5 269d72db17e227bb1189f59bb7622924 mod_ldap_userdir-1.1.4-r1.ebuild 1261
 MD5 9ca5c3a8b167b6754f5c444e42919b6a mod_ldap_userdir-1.1.4.ebuild 1764
-MD5 877ed8386139bf29355839519bef99a9 mod_ldap_userdir-1.1.4-r1.ebuild 1191
+MD5 ad31d063a5a183d3fb0e680e9f9e9128 mod_ldap_userdir-1.1.5.ebuild 1275
 MD5 650877f5bf9738cca23bbbeeb5bf87d9 files/47_mod_ldap_userdir.conf 375
 MD5 7c29da41475b54ecba7e1ca97c9d9bea files/digest-mod_ldap_userdir-1.1.1 73
-MD5 9d191153d39cdfc62b5be04e66ec88c4 files/digest-mod_ldap_userdir-1.1.4 73
 MD5 9d191153d39cdfc62b5be04e66ec88c4 files/digest-mod_ldap_userdir-1.1.4-r1 73
-MD5 d74d45e0b376cedc4cddc7ada0efe685 files/1.1.4-r1/47_mod_ldap_userdir.conf 370
+MD5 9d191153d39cdfc62b5be04e66ec88c4 files/digest-mod_ldap_userdir-1.1.4 73
+MD5 b89b865212327846622772a687a363df files/digest-mod_ldap_userdir-1.1.5 73
+MD5 2c9d531cb0d54faa89c88213c28ecf26 files/1.1.4-r1/47_mod_ldap_userdir.conf 371
diff --git a/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf b/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf
index 73ec9713c026..9bed1105ce05 100644
--- a/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf
+++ b/net-www/mod_ldap_userdir/files/1.1.4-r1/47_mod_ldap_userdir.conf
@@ -1,4 +1,4 @@
-<IfDefine LDAPuserdir>
+<IfDefine LDAP_USERDIR>
   <IfModule !mod_ldap_userdir.c>
     LoadModule ldap_userdir_module	modules/mod_ldap_userdir.so
   </IfModule>
diff --git a/net-www/mod_ldap_userdir/files/digest-mod_ldap_userdir-1.1.5 b/net-www/mod_ldap_userdir/files/digest-mod_ldap_userdir-1.1.5
new file mode 100644
index 000000000000..447c5f9409db
--- /dev/null
+++ b/net-www/mod_ldap_userdir/files/digest-mod_ldap_userdir-1.1.5
@@ -0,0 +1 @@
+MD5 91770bf3b5a87cf2f91bf511a16d8890 mod_ldap_userdir-1.1.5.tar.gz 37203
diff --git a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild
index 06fa69be6b85..c153e12f6aca 100644
--- a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild
+++ b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild,v 1.5 2005/02/08 01:04:49 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.4-r1.ebuild,v 1.6 2005/02/25 12:14:39 hollow Exp $
 
 inherit apache-module
 
@@ -17,8 +17,12 @@ LICENSE="GPL-1"
 SLOT="0"
 
 DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
+
 APACHE1_MOD_CONF="${PVR}/47_mod_ldap_userdir"
+APACHE1_MOD_DEFINE="LDAP_USERDIR"
+
 APACHE2_MOD_CONF="${PVR}/47_mod_ldap_userdir"
+APACHE2_MOD_DEFINE="LDAP_USERDIR"
 
 need_apache
 
diff --git a/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
new file mode 100644
index 000000000000..392883e155f9
--- /dev/null
+++ b/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-www/mod_ldap_userdir/mod_ldap_userdir-1.1.5.ebuild,v 1.1 2005/02/25 12:14:39 hollow Exp $
+
+inherit apache-module
+
+IUSE="ssl"
+DESCRIPTION="Apache module that enables ~/public_html from an LDAP directory."
+HOMEPAGE="http://horde.net/~jwm/software/mod_ldap_userdir/"
+KEYWORDS="~x86 ~ppc"
+
+SRC_URI="http://horde.net/~jwm/software/mod_ldap_userdir/${P}.tar.gz"
+
+DEPEND="ssl? ( dev-libs/openssl )
+		net-nds/openldap"
+LICENSE="GPL-1"
+SLOT="0"
+
+DOCFILES="DIRECTIVES README user-ldif posixAccount-objectclass"
+
+APACHE1_MOD_CONF="1.1.4-r1/47_mod_ldap_userdir"
+APACHE1_MOD_DEFINE="LDAP_USERDIR"
+
+APACHE2_MOD_CONF="1.1.4-r1/47_mod_ldap_userdir"
+APACHE2_MOD_DEFINE="LDAP_USERDIR"
+
+need_apache
+
+src_compile() {
+	local myargs="-lldap -llber -c ${PN}.c"
+	useq ssl && myargs="${myargs} -D TLS=1"
+
+	if useq apache2; then
+		APXS2_ARGS="${myargs}"
+	else
+		APXS1_ARGS="${myargs}"
+	fi
+
+	apache-module_src_compile
+}
+
+src_install() {
+	apache-module_src_install
+	useq apache2 && fperms 600 ${APACHE2_MODULES_CONFDIR}/$(basename ${APACHE2_MOD_CONF}).conf
+	useq apache2 || fperms 600 ${APACHE1_MODULES_CONFDIR}/$(basename ${APACHE1_MOD_CONF}).conf
+}