Update sys-libs/glibc-2.25-r10

4 files changed, 99 insertions, 4 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 6345a540..d0c53f02 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -23,8 +23,9 @@ AUX eblits/src_install.eblit 8485 SHA256 76505e60026024f616a2b872abc4e41ab619d21
 AUX eblits/src_prepare.eblit 2314 SHA256 f46068258f2cb33a4caeb4d4efedc61e41a606760be3b30d7f25f141a05fb020 SHA512 267a2aebfa2e9654518714b90c6b8aba328fe59d68d7cfebc69897383875b25e0245fab21193f2db50667b80aaed6abb277a7bad9eee1883748b3c803e95e01e WHIRLPOOL ab6aef1d14583310f728a683ccd22ca5246eaa41521f52f929ff0b7619aaab5554c255e353eef9defb9d3949bc80281603ee2576857caa95a8ceace32ca9e17e
 AUX eblits/src_test.eblit 741 SHA256 a48172ec140bdb6916d82895022e4dbeaf135b80c8447afaf7733a9c49dd2591 SHA512 0b7a897442b5a9f38dcb6569dea916ddba502593f3e4df2fb6b887180a84f1c80e72c2e2b5cf730567b4fa33bdf9a217bbcac317b3a1e09ed13a51a0840a3650 WHIRLPOOL 4966f58b893d7b15feca093f4f55ce7ae56420734e56f0c8976b9219976df9a9b133fb54156c377ff77a8d7ab74d667466a8e7109bb8b4740332b95c63804b78
 AUX eblits/src_unpack.eblit 3089 SHA256 81308c8983855dfe30e9f21c06c224c06e536256250d3e625265f1fae448fc57 SHA512 4cac84ebcf6d879426a917930ee2bfb4be23ba035d844424e66f138c5e4a7d5a706faea55187c84afc32aa517b8346483ee04fc5b41bd7e269a10b5e3c2a88ce WHIRLPOOL ac064b9c615ec77f0fc1fa298d864a6c0f1671f5205989812d4e40afaa1734874958443c5089d8fac480707503d7734e8e52339b0a1e290a52e18870f647758f
+AUX nscd.initd 1924 SHA256 bf1cffa93c4b73d1eb12fdd3a6b6d29bf3872acd8bd0249590f5a7fff9a4ebd4 SHA512 4448d77f49e05d07cbcb8f6938dbe3521d7e6ab41930af093a3a916fbd20dc9fd736bfeef1b21554f3fcbfbf190f649d6ab13cad6e52f17e99dd02bbdbcf34af WHIRLPOOL 409d5d096ac5823f1f04eb7c8c03772253105e8f4865fc1356858a80661cedaec667b4394030fe7cf015c9fbb0508b43af5156733c078481b375367a9b215188
 AUX nscd.service 337 SHA256 de7bc9946309d34f0ab44aa22a4d3cf259fe91c57e8000d741cb09ecd3a6caa0 SHA512 2001100f3b054843c69b6fd2d38852c7c824282aa8998c25a3c0352db993705429d25c70d8ce6cb3579f836b7089644c520acac423ebd69cb1b36e94a77c5bea WHIRLPOOL f01d191971b0dc45f541c9ebaaa1a40f3497e2cc838cff6a20a7b1828d726c248abbd94322a5a5ff30c33ddb7d9086cd4d2ba3bdc1811fed59ff292ef3983a72
-AUX nscd.tmpfilesd 111 SHA256 f0f64c4612d2097173854d2ec2e94ecbf4b77c7a6e94d950874e37346aa90d72 SHA512 53b80b331e1a85d8ee16eb2ce547a7249e944926c3d1cdd4a47a5301a5c842ffc7ec1e3dc0a731542a8facf8261c1c57121802d01741aa89898a3476c09da340 WHIRLPOOL cf1fed1a7e2ac1623a84f1cfa2062645afe3f791da2f4ace3859d12aa05df0e282b4c2e367a460015956ac2a8d01fee4cda84917a3adf2c38561dff200335270
+AUX nscd.tmpfilesd 119 SHA256 e379773392799892195506caeef2eb83dab33a351a7ff1f1e282086a582e8d32 SHA512 298d3534deb55f506f661f9fa32fb817498a7a6762957f8bd1d4391246507a682ecf1adfbc9422eeadfd2433e9170e51680d02cda7fdb1c900ba7ad8d7e65dbd WHIRLPOOL 99d6536d2ba14909ebea8efe2c57fb04a3cdd8dda12d199c9912ea2b6fa24abb20bef59557da8eeaad0833ae0fe98575cbf6a2cbc70b9c868a434411ad9fc3ac
 DIST gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 8064097 SHA256 34aec5a59bb4d0ecf908c62fd418461d0f3793238296897687305fd7a1f27299 SHA512 40b93e194ad41a75d649d84d1c49070680f253a13f0617803243bc61c44fed1ca2d0a7572a97ebb79353f312b58b5f6360be916dd7435928cc53935082e15269 WHIRLPOOL bbce19e7fe5c30faa55ddd4e29070f0d1fdfca3a04e8d68e0772260fa9be89ccde63ec92badb490209008df5fee6e53dfdeec4ae51857b90ba298a79315a199f
 DIST glibc-2.17-patches-8.tar.bz2 83707 SHA256 477946a4915dcd0cc0565ff8532d219e2ee868f6e821ea71ce579652d01ccbb3 SHA512 6675357e62b554d9d0f8ef70341b8038f8f89591fba384bc3783ef81aead0532486e2218af71da9c6f88a3b8b382edec81bed36eb636ee231eac80e111acbfd8 WHIRLPOOL 946f431b28ec60cc61d44364187f64a2d6e92ed7c9071126cf70277843c656de4dfac9f184f572f9a72c0cb452d879cdb7aca5b9f92f8ff02a8b1a521fffef43
 DIST glibc-2.17.tar.xz 10981956 SHA256 6914e337401e0e0ade23694e1b2c52a5f09e4eda3270c67e7c3ba93a89b5b23e SHA512 384e54037daaa344a26ce58242acc3f9a249d0765088d18a540a305745afa33ae6dec4024adae958eacd7100be9c713d117260ace8340f6d8c8396dbde4868d2 WHIRLPOOL 9b98c1c298aeff607aaa554341c300c15491b7314f127524fc5c048c67c5059daaf706e6cf206bb69213d5307e37bed87137ab46f504d8072bb778310081fc23
@@ -54,6 +55,6 @@ EBUILD glibc-2.21-r2.ebuild 7803 SHA256 666533a30d5bbefb934af83bdee2827f6663617a
 EBUILD glibc-2.22-r4.ebuild 9363 SHA256 67bee8419cc0542bea3d480d969fa455bbee5f6ee71bf7ae0cd5c8baa582b376 SHA512 5e3722abc69f34da394ecdee3adad991a2cc1fc191e88846389ddbb080d691843d907044f245626d76732c0f1ab1328148ed30cf3b339f22232b2035dd48e65c WHIRLPOOL 723c8319d370b5bbb824caf7db9c8c5153c7427b993392a661acc961d2fc52ef517526dedeeb5c822a9e5865def77fe4a1121006d4fefc414e964e0999fe109c
 EBUILD glibc-2.23-r3.ebuild 7735 SHA256 0641cde2e00a4ade51293b7e22a3ad7e8eff2060c5c9836a27cb98b7e72a2c91 SHA512 e25e9a22da6f502051a618b39ba39a8b56f5d7fae20db1e72325e70d3e01a80e984007e15e5d02f86a8f233c8e694e5df4315c6b050556165bcdb18405ddc3f4 WHIRLPOOL 4bfc9647a5b204afb215cf491f3b6474f503afdd08e49ac8909916bc68a525b60b570a3df7dd305741cbd406a4da20cc2c76645871f447549e7861d2d6dc54af
 EBUILD glibc-2.23-r4.ebuild 7856 SHA256 dbde0163fb246c1aba79091094182cfc6dedbb103935ee83a2c8b57176a40459 SHA512 dda7f365b0356e37e74f38d56406bc9486b43985ed3a9d4d51d43a17ca77edff81336391bd7636e7632f38b7df0128b6bdecc2707d1a87f9825bc6c83df62189 WHIRLPOOL 77f2910c6770b152deb99d1866083ff8b5ef9aa1df0976b84a29a92d62a3f1c72b77d3fb4a7b336cb7d3e7de858c5df8ddfd2b5efc873bedc9bb6265681ed52d
-EBUILD glibc-2.25-r10.ebuild 8035 SHA256 c7f4868ab0a76a1352a14e7e7d59f2609e5eee3715c37fb33a35a0cab6dbddce SHA512 1c0607ae5dd9221ed04f95d97e908da6ecded354450be7505d5dd2046bfefd4d3e6e5e62596fe640a9cc69d0863d863a3cb56d27b053fe6c033973864a2cdee2 WHIRLPOOL 5fc71625fb59e4244d82344cebe92fba8e1690b8d5e3e8d67274b76502410b1b5ec824f5ac194c5762bf9870ed5dd3330b64882c5d3ee4f3865cf8493c28f156
+EBUILD glibc-2.25-r10.ebuild 8299 SHA256 5bda10b348222faf2d2d4a4d636d176d06c7bd195b10a028aff0a776d03897fe SHA512 a01701ee8bb5df511a375664077b941ad1b33e56b3d40eb027f03c1ea9518cc66836626d19c06779ac9afdf5087f8d6289c1d54b0ec13f9f27a0b161651a886e WHIRLPOOL ee6a957ac80f5d1882b3aa3976b8e0860dba5f4145cfc69bda7a42eee78520d379843a45160d5b70312adde228bd8c76377ea14eacfa8553bc3d35191b71ec28
 EBUILD glibc-2.25-r8.ebuild 8070 SHA256 53c8f1dcdfcef6e85a743dad0720deff2e8f9659fb9f092223d600b1a1ec16a1 SHA512 6ad57b1a37f7b73cc158d79b816eef8fdb039c742f21dbed3bcd57c0640fc111635c5ed1bf5b4c94fe724896caf670e1a6c88e3c7259ed3481c664b7b8cd690c WHIRLPOOL a56961a5f2d0c061c07d2111f2900f40ce07720029476e9fe6f5bfb951879408243233fcb2ddb3d9ce5bd1beb8889302fc25f2601e171bd182d00de4ff9eaea9
 EBUILD glibc-2.25-r9.ebuild 8029 SHA256 39b37ca27bf27c3fe336bea6c66f639cf7fb1f40d01c983e7a4e6d13abf79f2e SHA512 aa5d16319418f3390a0c6db7524d044f4ae286fe028f00b1a0a1e09667631470bdc15327285e09c5d0891c0353b5426cd1d19d9af7d2a2a49b9ec4771dc66e75 WHIRLPOOL e69b78c8adca74f7a78231d34f7b79a02e86bc0b3c53846333768ee089b147d4a97a634ff5be48ef7aae6a9e9bea400b305bd31cfa141b40a430ee2446636349
diff --git a/sys-libs/glibc/files/nscd.initd b/sys-libs/glibc/files/nscd.initd
new file mode 100644
index 00000000..6798e27a
--- /dev/null
+++ b/sys-libs/glibc/files/nscd.initd
@@ -0,0 +1,85 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="The 'Name Service Cache Daemon' is a daemon that provides a cache"
+description="${description} for the most common name service requests"
+
+extra_started_commands="flush_all flush_hosts flush_group flush_passwd flush_netgroup flush_services"
+
+description_flush_all="Will invalidate hosts, group, passwd, netgroup and services cache"
+description_flush_hosts="Will invalidate hosts cache"
+description_flush_group="Will invalidate group cache"
+description_flush_passwd="Will invalidate passwd cache"
+description_flush_netgroup="Will invalidate netgroup cache"
+description_flush_services="Will invalidate services cache"
+
+pidfile="/var/run/nscd/nscd.pid"
+command="/usr/sbin/nscd"
+
+depend() {
+	use dns ldap net slapd logger
+}
+
+checkconfig() {
+	if [ ! -d /var/run/nscd ] ; then
+		checkpath -d -m 755 /var/run/nscd
+	fi
+
+	if [ -z "${NSCD_PERMS_OK}" ] && [ "$(stat -c %a /var/run/nscd)" != "755" ] ; then
+		ewarn "nscd run dir is not world readable, you should reset the perms:"
+		ewarn "chmod 755 /var/run/nscd"
+		ewarn "chmod a+rw /var/run/nscd/socket"
+		ewarn "To disable this warning, set 'NSCD_PERMS_OK' in /etc/conf.d/nscd"
+	fi
+
+	if grep -qs '^[[:space:]]*persistent\>' /etc/nscd.conf ; then
+		checkpath -d -m 700 /var/db/nscd
+	fi
+}
+
+_flush() {
+	local table=$1
+
+	ebegin "Flushing ${table} table"
+	${command} --invalidate ${table}
+	eend $?
+}
+
+flush_all() {
+	local has_errors=0
+
+	ebegin "Flushing all caches"
+
+	local table=
+	for table in passwd group hosts netgroup services; do
+		${command} --invalidate ${table}
+		[ $? -ne 0 ] && has_errors=1
+	done
+
+	eend ${has_errors}
+}
+
+flush_hosts() {
+	_flush hosts
+}
+
+flush_group() {
+	_flush group
+}
+
+flush_passwd() {
+        _flush passwd
+}
+
+flush_netgroup() {
+	_flush netgroup
+}
+
+flush_services() {
+	_flush services
+}
+
+start_pre() {
+	checkconfig
+}
diff --git a/sys-libs/glibc/files/nscd.tmpfilesd b/sys-libs/glibc/files/nscd.tmpfilesd
index 52edbba6..a57463ba 100644
--- a/sys-libs/glibc/files/nscd.tmpfilesd
+++ b/sys-libs/glibc/files/nscd.tmpfilesd
@@ -1,4 +1,4 @@
-# Configuration to create /run/nscd directory
+# Configuration to create /var/run/nscd directory
 # Used as part of systemd's tmpfiles
 
-d /run/nscd 0755 root root
+d /var/run/nscd 0755 root root
diff --git a/sys-libs/glibc/glibc-2.25-r10.ebuild b/sys-libs/glibc/glibc-2.25-r10.ebuild
index 053bb7e4..645f479a 100644
--- a/sys-libs/glibc/glibc-2.25-r10.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r10.ebuild
@@ -221,3 +221,12 @@ src_prepare() {
 		cat sysdeps/unix/sysv/linux/x86_64/dl-cache.h
 	fi
 }
+
+src_install() {
+	toolchain-glibc_src_install
+
+	# toolchain-glibc.eclass runs prefixify_ro and a @PIDFILE@ substitution
+	# on the included 'nscd', although it contains neither of the needed
+	# template tokens.
+	use nscd && newinitd "${FILESDIR}"/nscd.initd nscd
+}