sys-auth/nss-pam-ldapd: Move rundir to /run; minor style enhancements

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

5 files changed, 229 insertions, 7 deletions

diff --git a/sys-auth/nss-pam-ldapd/ChangeLog b/sys-auth/nss-pam-ldapd/ChangeLog
index 16e5752b6f7e..4a01e0d71be7 100644
--- a/sys-auth/nss-pam-ldapd/ChangeLog
+++ b/sys-auth/nss-pam-ldapd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/nss-pam-ldapd
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.14 2014/03/16 18:57:47 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/ChangeLog,v 1.15 2014/05/26 12:36:51 jlec Exp $
+
+*nss-pam-ldapd-0.9.3-r1 (26 May 2014)
+*nss-pam-ldapd-0.8.14-r1 (26 May 2014)
+
+  26 May 2014; Justin Lecher <jlec@gentoo.org> +nss-pam-ldapd-0.8.14-r1.ebuild,
+  +nss-pam-ldapd-0.9.3-r1.ebuild, +files/nslcd-init-r1, metadata.xml:
+  Move rundir to /run; minor style enhancements
 
   16 Mar 2014; Matthew Thode <prometheanfire@gentoo.org> metadata.xml:
   update metadata
diff --git a/sys-auth/nss-pam-ldapd/files/nslcd-init-r1 b/sys-auth/nss-pam-ldapd/files/nslcd-init-r1
new file mode 100644
index 000000000000..14adc4e1287b
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/files/nslcd-init-r1
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/files/nslcd-init-r1,v 1.1 2014/05/26 12:36:51 jlec Exp $
+
+extra_commands="checkconfig"
+cfg="/etc/nslcd.conf"
+
+depend() {
+	need net	
+	use dns logger
+}
+
+checkconfig() {
+	if [ ! -f "$cfg" ] ; then
+		eerror "Please create $cfg"
+		eerror "Example config: /usr/share/nss-ldapd/nslcd.conf"
+		return 1
+	fi
+	return 0
+}
+
+start() {
+    checkpath -q -d /run/nslcd -o nslcd:nslcd
+	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-pam-ldapd/metadata.xml b/sys-auth/nss-pam-ldapd/metadata.xml
index 2c6d57b9d287..ea0924767f7f 100644
--- a/sys-auth/nss-pam-ldapd/metadata.xml
+++ b/sys-auth/nss-pam-ldapd/metadata.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer>
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<longdescription lang="en">
+  <maintainer>
+    <email>prometheanfire@gentoo.org</email>
+    <name>Matthew Thode</name>
+  </maintainer>
+  <longdescription lang="en">
 	    Provides a Name Service Switch (NSS) module that allows your LDAP
 		server to provide user account, group, host name, alias, netgroup, and
 		basically any other information that you would normally get from /etc
@@ -17,4 +17,3 @@
 		connections, authentication, attribute translation, etc.
 	</longdescription>
 </pkgmetadata>
-
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild
new file mode 100644
index 000000000000..62b4f80b4670
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.8.14-r1.ebuild,v 1.1 2014/05/26 12:36:51 jlec Exp $
+
+EAPI=5
+
+inherit multilib user
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE="debug kerberos sasl +pam"
+
+DEPEND="
+	net-nds/openldap
+	sasl? ( dev-libs/cyrus-sasl )
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup nslcd
+	enewuser nslcd -1 -1 -1 nslcd
+}
+
+src_configure() {
+	# nss libraries always go in /lib on Gentoo
+	myconf="
+		--enable-warnings
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file=/etc/nslcd.conf
+		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		--with-pam-seclib-dir=/$(get_libdir)/security
+		--libdir=/$(get_libdir)
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)"
+
+	if use x86-fbsd; then
+		myconf+=" --with-nss-flavour=freebsd"
+	else
+		myconf+=" --with-nss-flavour=glibc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	# for socket and pid file (not needed bug 452992)
+	#keepdir /run/nslcd
+
+	# init script
+	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+
+	# make an example copy
+	insinto /usr/share/nss-pam-ldapd
+	doins nslcd.conf
+
+	fperms o-r /etc/nslcd.conf
+}
+
+pkg_postinst() {
+	echo
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	echo
+	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	echo
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
+	elog " is now named /etc/nslcd.conf"
+	echo
+}
diff --git a/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.3-r1.ebuild b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..84471095f8b8
--- /dev/null
+++ b/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.3-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/nss-pam-ldapd/nss-pam-ldapd-0.9.3-r1.ebuild,v 1.1 2014/05/26 12:36:51 jlec Exp $
+
+EAPI=5
+
+inherit eutils multilib user
+
+DESCRIPTION="NSS module for name lookups using LDAP"
+HOMEPAGE="http://arthurdejong.org/nss-pam-ldapd/"
+SRC_URI="http://arthurdejong.org/nss-pam-ldapd/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+IUSE="debug kerberos sasl +pam"
+
+DEPEND="
+	net-nds/openldap
+	sasl? ( dev-libs/cyrus-sasl )
+	kerberos? ( virtual/krb5 )
+	pam? ( virtual/pam )
+	!sys-auth/nss_ldap
+	!sys-auth/pam_ldap"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	enewgroup nslcd
+	enewuser nslcd -1 -1 -1 nslcd
+}
+
+src_prepare() {
+	# support user patches
+	epatch_user
+}
+
+src_configure() {
+	# nss libraries always go in /lib on Gentoo
+	myconf="
+		--enable-warnings
+		--with-ldap-lib=openldap
+		--with-ldap-conf-file=/etc/nslcd.conf
+		--with-nslcd-pidfile=/run/nslcd/nslcd.pid
+		--with-nslcd-socket=/run/nslcd/socket
+		--with-pam-seclib-dir=/$(get_libdir)/security
+		--libdir=/$(get_libdir)
+		$(use_enable debug)
+		$(use_enable kerberos)
+		$(use_enable pam)
+		$(use_enable sasl)"
+
+	if use x86-fbsd; then
+		myconf+=" --with-nss-flavour=freebsd"
+	else
+		myconf+=" --with-nss-flavour=glibc"
+	fi
+
+	econf ${myconf}
+}
+
+src_install() {
+	default
+
+	# for socket and pid file (not needed bug 452992)
+	#keepdir /run/nslcd
+
+	# init script
+	newinitd "${FILESDIR}"/nslcd-init-r1 nslcd
+
+	# make an example copy
+	insinto /usr/share/nss-pam-ldapd
+	doins nslcd.conf
+
+	fperms o-r /etc/nslcd.conf
+}
+
+pkg_postinst() {
+	echo
+	elog "For this to work you must configure /etc/nslcd.conf"
+	elog "This configuration is similar to pam_ldap's /etc/ldap.conf"
+	echo
+	elog "In order to use nss-pam-ldapd, nslcd needs to be running. You can"
+	elog "start it like this:"
+	elog "  # /etc/init.d/nslcd start"
+	echo
+	elog "You can add it to the default runlevel like so:"
+	elog " # rc-update add nslcd default"
+	elog
+	elog "If you are upgrading, keep in mind that /etc/nss-ldapd.conf"
+	elog " is now named /etc/nslcd.conf"
+	echo
+}