merge in improvements from Sunrise Overlay by Heath Caldwell <hncaldwell@gentoo.org>

Package-Manager: portage-2.1.6_rc2/cvs/Linux 2.6.27-gentoo-r2 x86_64

4 files changed, 51 insertions, 12 deletions

diff --git a/sys-auth/nss-ldapd/ChangeLog b/sys-auth/nss-ldapd/ChangeLog
index 01d6e898b684..7e0f464f1047 100644
--- a/sys-auth/nss-ldapd/ChangeLog
+++ b/sys-auth/nss-ldapd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-auth/nss-ldapd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/ChangeLog,v 1.1 2008/12/04 22:17:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/ChangeLog,v 1.2 2008/12/05 21:12:51 cardoe Exp $
+
+  05 Dec 2008; Doug Goldstein <cardoe@gentoo.org> files/nslcd.rc,
+  nss-ldapd-0.6.7.ebuild:
+  merge in improvements from Sunrise Overlay by Heath Caldwell
+  <hncaldwell@gentoo.org>
 
 *nss-ldapd-0.6.7 (04 Dec 2008)
 
diff --git a/sys-auth/nss-ldapd/Manifest b/sys-auth/nss-ldapd/Manifest
index 32ba12a82eaa..a01b8140c093 100644
--- a/sys-auth/nss-ldapd/Manifest
+++ b/sys-auth/nss-ldapd/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX nslcd.rc 433 RMD160 4e34d480f18e4e25daac1acde000e1566ae43387 SHA1 1daecefb8faed9781e16b5a2cc17fd2e699d8af8 SHA256 c05af2b00642ffe2221b3d0ed0fec7f179819bef8e687279096b70e0a88e8595
+AUX nslcd.rc 803 RMD160 d6a0b5f6fc9649041a27e538ab145814506f45e7 SHA1 eaa8374cf59e00384f1f150389627f20a5da57ff SHA256 badab5c2c2322efa8071ade3b78f3d65a1fa018ee214e4d60c707d568a16d6e1
 DIST nss-ldapd-0.6.7.tar.gz 376893 RMD160 e8494ae71a23d1e9f458e4adb5446dc128262398 SHA1 dd984b9c53832cef445411e166f1f8f6117350cb SHA256 322803b7dd29107d3cec961527166c9b3440786f8a0cdb79fc5a23a62fb1c7fe
-EBUILD nss-ldapd-0.6.7.ebuild 1121 RMD160 508b22ec8e6873f19c182a259532188fcf3b861f SHA1 0fc892e8d297d6937e12797ead6db65d6abd4dd4 SHA256 9a47cee654fadf6884119f339fb027a62da21cfa8272be3a3cccbd81e3fbed17
-MISC ChangeLog 663 RMD160 14009fd102da8e9ae90d1fa22a4d58b2ffed01c1 SHA1 2776d025122936666dd4cde29ce2a520c5544141 SHA256 e87b5ef297bbe350e96c328f039bfbbba2076fa0f02c57d33a169f334aa29393
+EBUILD nss-ldapd-0.6.7.ebuild 1511 RMD160 69bca98651e29c9a9a941325521f95fa81bae811 SHA1 34ab334f4696a5ef007bb81298b675577da208d0 SHA256 04b2c94a8b5cd0de8b6eda0afc0ab1e47862d32f88807d54e9da45a1eaf5158b
+MISC ChangeLog 845 RMD160 fa699fe3ca652ed724aa8cbf001f0c0bff13cb68 SHA1 481b530d7bd4b3dd4755e6fcc2b0a859bb2669ae SHA256 7392b708581a8b796e962f0f74589fe15f2aa6ebe691efaae8be86d8a4ed17ac
 MISC metadata.xml 249 RMD160 a6d8f8c77b7aa9c00354b9734fad35c6b715556c SHA1 e0e7d183a6079c2dc3422f6a2bc9ff78c59a7acb SHA256 d32e4832e4abc1c29f58427f90bc4c2ecd9677058ef2c6ccb85d69a72187d780
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk4VvgACgkQoeSe8B0zEfxOJACeOnWgUk1B9IrHgVbUii3+bxNV
-Y5QAn0T1rWp1U5xZLDv4HGKVRvZlkITR
-=zbZP
+iEYEARECAAYFAkk5mWQACgkQoeSe8B0zEfxFMgCdHXU1jQLcrKFGr+Xh+tFh5N1j
+IHoAnArX2Wow/fhcDiBw2dzebtC/QBLX
+=pmDt
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/nss-ldapd/files/nslcd.rc b/sys-auth/nss-ldapd/files/nslcd.rc
index 79a7fbeeb900..60f4e340cf9e 100644
--- a/sys-auth/nss-ldapd/files/nslcd.rc
+++ b/sys-auth/nss-ldapd/files/nslcd.rc
@@ -1,17 +1,35 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/files/nslcd.rc,v 1.1 2008/12/04 22:17:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/files/nslcd.rc,v 1.2 2008/12/05 21:12:52 cardoe Exp $
+
+opts="checkconfig"
 
 depend() {
 	need net	
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f /etc/nss-ldapd.conf ] ; then
+		eerror "Please create /etc/nss-ldapd.conf"
+		eerror "Example config: /usr/share/nss-ldapd/nss-ldapd.conf"
+		return 1
+	fi
+	return 0
 }
 
 start() {
+	checkconfig || return $?
+
+	ebegin "Starting nslcd"
 	start-stop-daemon --start --pidfile /var/run/nslcd/nslcd.pid \
 		--exec /usr/sbin/nslcd
+	eend $? "Failed to start nslcd"
 }
 
 stop() {
+	ebegin "Stopping nslcd"
 	start-stop-daemon --stop --pidfile /var/run/nslcd/nslcd.pid
+	eend $? "Failed to stop nslcd"
 }
diff --git a/sys-auth/nss-ldapd/nss-ldapd-0.6.7.ebuild b/sys-auth/nss-ldapd/nss-ldapd-0.6.7.ebuild
index 5e09048417a9..4a2c2a40e042 100644
--- a/sys-auth/nss-ldapd/nss-ldapd-0.6.7.ebuild
+++ b/sys-auth/nss-ldapd/nss-ldapd-0.6.7.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-ldapd-0.6.7.ebuild,v 1.1 2008/12/04 22:17:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-ldapd/nss-ldapd-0.6.7.ebuild,v 1.2 2008/12/05 21:12:51 cardoe Exp $
+
+inherit multilib
 
 DESCRIPTION="NSS module for name lookups using LDAP"
 HOMEPAGE="http://ch.tudelft.nl/~arthur/nss-ldapd/"
@@ -12,11 +14,15 @@ KEYWORDS="~amd64"
 IUSE="debug"
 
 DEPEND="net-nds/openldap
+		sasl? ( dev-libs/cyrus-sasl )
+		kerberos? ( virtual/krb5 )
 		!sys-auth/nss_ldap"
 RDEPEND="${DEPEND}"
 
 src_compile() {
+	# nss libraries always go in /lib on Gentoo
 	econf --enable-warnings --with-ldap-lib=openldap $(use_enable debug) \
+		--libdir=/$(get_libdir) \
 		|| die "econf failed"
 	emake || die "emake failed"
 }
@@ -24,11 +30,17 @@ src_compile() {
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
 
+	dodoc NEWS ChangeLog AUTHORS README
+
 	# for socket and pid file
-	mkdir "${D}"/var/run/nslcd
+	keepdir /var/run/nslcd
 
 	# init script
 	newinitd "${FILESDIR}"/nslcd.rc nslcd
+
+	# make an example copy
+	insinto /usr/share/nss-ldapd
+	doins nss-ldapd.conf
 }
 
 pkg_postinst() {
@@ -36,6 +48,10 @@ pkg_postinst() {
 	elog "For this to work you must configure /etc/nss-ldapd.conf"
 	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
 	elog
-	elog "After configuring it, you MUST add `nslcd` to be started"
-	elog "i.e. $ rc-update add nslcd default"
+	elog "In order to use nss-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	elog
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
 }