From: Roy Marples Date: Fri, 23 Feb 2007 12:09:39 +0000 (+0000) Subject: nscd init script no longer requires bash X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=49fe56a70d4f12b57e798d82373ba59cf4ba0a1a;p=gentoo.git nscd init script no longer requires bash Package-Manager: portage-2.1.2-r10 --- diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index faf70d72f834..5176ad7cc0bd 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.503 2007/02/17 00:29:58 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.504 2007/02/23 12:09:39 uberlord Exp $ + + 23 Feb 2007; Roy Marples files/nscd: + nscd init script no longer requires bash 17 Feb 2007; Mike Frysinger glibc-2.5.ebuild: We no longer support i386-* hosts #165772. diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index 70d09044e23f..e7582584a80b 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a SHA1 d1dceb79689e9c627ebd630389ec1948d7a0a6e4 SHA256 0bc07eb47578d5bfb98774b18bf07aee2af44a7ccd947602c223b34e0d88394a MD5 941f13d27badc76c1e3704c59acaff26 files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 RMD160 f1162b7f313f7ea18fb178157d3bd6205d818e3a files/2.3.1/glibc-2.3.1-ctype-compat-v3.patch 2823 @@ -409,10 +406,10 @@ AUX locales.build 699 RMD160 2a186105be5b00ec48aedef734e9dba5aee19895 SHA1 02ce7 MD5 e2fcd927c601ed4e8ab2a985a9314716 files/locales.build 699 RMD160 2a186105be5b00ec48aedef734e9dba5aee19895 files/locales.build 699 SHA256 094a5e02148d522be5a5ec2b95fb7305d5503f6d13d1ffa9088e9dad21af1c8a files/locales.build 699 -AUX nscd 1468 RMD160 4358dc846a186c9db730693f9485b4d4358f3967 SHA1 f340187d998effff8b84250394a608c7305539bf SHA256 12b5d0732e646b3a456646b943930cc5c21cc82635e42ccefe8f197e61d570fe -MD5 1314d7f9022322cd0d1198dcddf1214d files/nscd 1468 -RMD160 4358dc846a186c9db730693f9485b4d4358f3967 files/nscd 1468 -SHA256 12b5d0732e646b3a456646b943930cc5c21cc82635e42ccefe8f197e61d570fe files/nscd 1468 +AUX nscd 1621 RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 SHA1 5751fe798024c2021b7b3ed3e798618e2a38244a SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 +MD5 d142c6e0b4fd508f485d0aa9c5d12a91 files/nscd 1621 +RMD160 f6d20c4c3814f70d7741f3fa2e0b53ba32c37960 files/nscd 1621 +SHA256 6165db3a2fcb251d4f3655c0461e018ce9c92a37f7f22a8fd2b75178b5435bc8 files/nscd 1621 AUX nscd.conf 1158 RMD160 50651e89a0cb206b1d37dae8840527694fe561b5 SHA1 5f5166aa6e0bffa57c52c39d3ec51ad3b0efa607 SHA256 378b7953adf5aa0e03bff49b7c654cae67b3efee7c92361b385fe7d3e9fb57c7 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158 RMD160 50651e89a0cb206b1d37dae8840527694fe561b5 files/nscd.conf 1158 @@ -496,10 +493,10 @@ EBUILD glibc-2.5.ebuild 37430 RMD160 5defef6c522d0940fedf1aafbb261907140861ed SH MD5 96738d14e1c39ab374745658416701f1 glibc-2.5.ebuild 37430 RMD160 5defef6c522d0940fedf1aafbb261907140861ed glibc-2.5.ebuild 37430 SHA256 f3317f82df1652c15024dd231c8a334b724644638f7872cb5709eb057e92eb33 glibc-2.5.ebuild 37430 -MISC ChangeLog 98861 RMD160 e050b2ca16a9c3e20b2d79bc1d30e4f883e476c3 SHA1 8a26e1a294fc4ac253a2ab20b5900c4f103020a2 SHA256 3e0f35f1e8503a9a5eb01d1b11e91b584dedaf8cbfc4c7b6800eced144ed8977 -MD5 edcaca1fdfda756d24b590cb2496c2b5 ChangeLog 98861 -RMD160 e050b2ca16a9c3e20b2d79bc1d30e4f883e476c3 ChangeLog 98861 -SHA256 3e0f35f1e8503a9a5eb01d1b11e91b584dedaf8cbfc4c7b6800eced144ed8977 ChangeLog 98861 +MISC ChangeLog 98968 RMD160 583103629a2fac8e40f87aa13c53fe49151998da SHA1 ad8207a90b71a86d544bcbf20992272a800f98bd SHA256 70c82c56f5105405ded3f521be80d32f93dfebd8060236ff5e9b3d1d16a7669f +MD5 243430921b955208ecb372350559d303 ChangeLog 98968 +RMD160 583103629a2fac8e40f87aa13c53fe49151998da ChangeLog 98968 +SHA256 70c82c56f5105405ded3f521be80d32f93dfebd8060236ff5e9b3d1d16a7669f ChangeLog 98968 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a MD5 567094e03359ffc1c95af7356395228d metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162 @@ -528,10 +525,3 @@ SHA256 a49f96d87bda9dfbe73ac717c2a1dea7b4715c9c2e6031f404e3d7ee1209efea files/di MD5 5b7e320e8b8b1a96ace60aa95385c122 files/digest-glibc-2.5 1286 RMD160 6302561abceb3a88449dfe74bd6f2e373f00dec3 files/digest-glibc-2.5 1286 SHA256 c20b8f42085597085e3589fbfd2dc5351f0c63a5492a55f82b59a1481b2a28f3 files/digest-glibc-2.5 1286 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) - -iD8DBQFF1kyz8bi6rjpTunYRApT3AKCSdDHr5Ewae/tEHaCpm3en8wjajwCgr3su -Yj/Ru69txTmUeFXVbN4F43w= -=zmJz ------END PGP SIGNATURE----- diff --git a/sys-libs/glibc/files/nscd b/sys-libs/glibc/files/nscd index a683e8fa6444..b102de070527 100755 --- a/sys-libs/glibc/files/nscd +++ b/sys-libs/glibc/files/nscd @@ -1,18 +1,18 @@ #!/sbin/runscript # Copyright 1999-2005 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.6 2006/06/18 06:49:50 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/nscd,v 1.7 2007/02/23 12:09:39 uberlord Exp $ depend() { use dns ldap net slapd } checkconfig() { - if [[ ! -d /var/run/nscd ]] ; then + if [ ! -d /var/run/nscd ] ; then mkdir -p /var/run/nscd chmod 755 /var/run/nscd fi - if [[ -z ${NSCD_PERMS_OK} && $(stat -c %a /var/run/nscd) != "755" ]] ; then + if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then echo "" ewarn "nscd run dir is not world readable, you should reset the perms:" ewarn "chmod 755 /var/run/nscd" @@ -46,15 +46,18 @@ start() { done < /etc/nsswitch.conf` local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)" mkdir -p "$(dirname ${pidfile})" + save_options pidfile "${pidfile}" start-stop-daemon --start --quiet \ - --exec /usr/sbin/nscd --pid ${pidfile} \ + --exec /usr/sbin/nscd --pidfile "${pidfile}" \ -- $secure eend $? } stop() { + local pidfile="$(get_options pidfile)" + [ -n "${pidfile}" ] && pidfile="--pidfile ${pidfile}" ebegin "Shutting down Name Service Cache Daemon" - start-stop-daemon --stop --quiet --exec /usr/sbin/nscd + start-stop-daemon --stop --quiet --exec /usr/sbin/nscd ${pidfile} eend $? }