install the nscd init.d script #43076

8 files changed, 62 insertions, 60 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index 1c015a3039f8..deb5984b4294 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.259 2004/09/28 13:23:37 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.260 2004/09/29 05:24:47 vapier Exp $
+
+  29 Sep 2004; Mike Frysinger <vapier@gentoo.org> files/nscd,
+  glibc-2.2.5-r9.ebuild, glibc-2.3.2-r11.ebuild,
+  glibc-2.3.3.20040420-r1.ebuild, glibc-2.3.4.20040619-r1.ebuild,
+  glibc-2.3.4.20040808.ebuild, glibc-2.3.4.20040928.ebuild:
+  Install the nscd init.d script #43076 by Rui Malheiro.
 
 *glibc-2.3.4.20040928 (28 Sep 2004)
 
diff --git a/sys-libs/glibc/files/nscd b/sys-libs/glibc/files/nscd
index 66d203e0f723..bdc0e254b057 100755
--- a/sys-libs/glibc/files/nscd
+++ b/sys-libs/glibc/files/nscd
@@ -1,43 +1,39 @@
-#! /bin/sh
-#RCUPDATE:3 4:72
-
-.  /etc/rc.d/config/functions
-
-SERVICE=nscd
-EXE=/usr/sbin/nscd
-opts="start stop restart"
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.3 2004/09/29 05:24:47 vapier Exp $
 
 start() {
 	ebegin "Starting Name Service Cache Daemon"
-	secure=` cat /etc/nsswitch.conf | while read curline ; do
-	  table=${curline%:*}
-	  entries=${curline##$table:}
-	  table=${table%%[^a-z]*}
-	  case $table in
-	    passwd*|group*|hosts)
-	      for entry in $entries ; do
-		case $entry in
-		  nisplus*)
-		    /usr/sbin/nscd_nischeck $table || echo "-S $table,yes"
-		  ;;
+	secure=`while read curline ; do
+		table=${curline%:*}
+		entries=${curline##$table:}
+		table=${table%%[^a-z]*}
+		case $table in
+			passwd*|group*|hosts)
+			for entry in $entries ; do
+			case $entry in
+				nisplus*)
+					/usr/sbin/nscd_nischeck $table || \
+					/echo "-S $table,yes"
+				;;
+			esac
+			done
+		;;
 		esac
-	      done
-	    ;;
-	  esac
-	done`
-	start-stop-daemon --start --quiet --exec $EXE -- $secure 1>&2
-	eend $? "Error starting $SERVICE"
-}
-stop () {
-	ebegin "Shutting down Name Service Cache Daemon"
-	start-stop-daemon --stop --quiet --pidfile /var/run/nscd.pid 1>&2
-	eend $? "Error stopping $SERVICE"
+		done < /etc/nsswitch.conf`
+	local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)"
+	mkdir -p "$(dirname ${pidfile})"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/nscd --pid ${pidfile} \
+		-- $secure
+	eend $?
 }
 
-restart () {
-	stop
-	start
+stop() {
+	ebegin "Shutting down Name Service Cache Daemon"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd
+	eend $?
 }
 
-doservice ${@}
-
+# vim:ts=4
diff --git a/sys-libs/glibc/glibc-2.2.5-r9.ebuild b/sys-libs/glibc/glibc-2.2.5-r9.ebuild
index 2e5a3f2d000f..56450db51f58 100644
--- a/sys-libs/glibc/glibc-2.2.5-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.2.5-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.12 2004/08/28 01:28:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.13 2004/09/29 05:24:47 vapier Exp $
 
 inherit flag-o-matic gcc eutils
 
@@ -281,10 +281,10 @@ src_install() {
 		doman ${S}/man/*.3thr
 
 		# Install nscd config file
-		insinto /etc
-		doins ${S}/nscd/nscd.conf
+		insinto /etc ; doins ${S}/nscd/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
 
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
diff --git a/sys-libs/glibc/glibc-2.3.2-r11.ebuild b/sys-libs/glibc/glibc-2.3.2-r11.ebuild
index abf9e02d9fb5..2d6351ffd75c 100644
--- a/sys-libs/glibc/glibc-2.3.2-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.3.2-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r11.ebuild,v 1.13 2004/09/24 12:52:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r11.ebuild,v 1.14 2004/09/29 05:24:47 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -610,10 +610,10 @@ EOF
 		}
 
 		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
+		insinto /etc ; doins ${FILESDIR}/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
 
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
diff --git a/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild b/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild
index e4241b3d6425..d14c4859eb84 100644
--- a/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild,v 1.6 2004/09/06 05:25:49 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.3.20040420-r1.ebuild,v 1.7 2004/09/29 05:24:47 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -651,10 +651,10 @@ EOF
 		}
 
 		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
+		insinto /etc ; doins ${FILESDIR}/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
 
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
diff --git a/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild b/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild
index a893bd4ce637..0dc66746cd70 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild,v 1.18 2004/09/19 07:12:14 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040619-r1.ebuild,v 1.19 2004/09/29 05:24:47 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -660,11 +660,11 @@ EOF
 		doman ${S}/man/*.3thr
 
 		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
+		insinto /etc ; doins ${FILESDIR}/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
 
 		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
diff --git a/sys-libs/glibc/glibc-2.3.4.20040808.ebuild b/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
index d4d84b35dc1c..121890abd7e9 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040808.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808.ebuild,v 1.21 2004/09/28 21:55:00 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040808.ebuild,v 1.22 2004/09/29 05:24:47 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -622,11 +622,11 @@ EOF
 		doman ${S}/man/*.3thr
 
 		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
+		insinto /etc ; doins ${FILESDIR}/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
 
 		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/lib/gconv
diff --git a/sys-libs/glibc/glibc-2.3.4.20040928.ebuild b/sys-libs/glibc/glibc-2.3.4.20040928.ebuild
index 9fc9895c3ba7..1ddf9bba88fc 100644
--- a/sys-libs/glibc/glibc-2.3.4.20040928.ebuild
+++ b/sys-libs/glibc/glibc-2.3.4.20040928.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040928.ebuild,v 1.2 2004/09/28 21:55:00 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.4.20040928.ebuild,v 1.3 2004/09/29 05:24:47 vapier Exp $
 
 inherit eutils flag-o-matic gcc
 
@@ -751,11 +751,11 @@ EOF
 		doman ${S}/man/*.3thr
 
 		# Install nscd config file
-		insinto /etc
-		doins ${FILESDIR}/nscd.conf
+		insinto /etc ; doins ${FILESDIR}/nscd.conf
+		exeinto /etc/init.d ; doexe ${FILESDIR}/nscd
 
 		cd ${S}
-		dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \
+		dodoc BUGS ChangeLog* CONFORMANCE FAQ INTERFACE \
 			NEWS NOTES PROJECTS README*
 	else
 		rm -rf ${D}/usr/share ${D}/usr/$(get_libdir)/gconv