gentoo resync : 19.11.2017

4 files changed, 49 insertions, 4 deletions

diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index c4301e77e733..2b00cd126a68 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -50,9 +50,9 @@ EBUILD glibc-2.23-r3.ebuild 4890 SHA256 364b764f399b9525f719563cf2d50c0c75c09241
 EBUILD glibc-2.23-r4.ebuild 5011 SHA256 3690a8b559bd563dc9af89d1217f5021c7da1b89eb5ec513e8b725e04cb45e0e SHA512 3695c8acea09838cc79c33379cfcaf0eb774759f3af5863892ff9c63732926764a8a5187ab9aaccdfd358d62c0884feab95a7055735c9295549d5c8f0c198221 WHIRLPOOL d6a6404e9968ea604d578d500ff7cd550097c1cc30713d61253a130d6a26f9f228ea83189abc611b4704e58be2b74323ab8f106faf4d3db92f7c61f27bf43d93
 EBUILD glibc-2.24-r4.ebuild 5047 SHA256 c200272f9c19ce196e788572aa0ff5e0e0a24b37b6fd3b0a85236406b6ea8f11 SHA512 d93834a9012716293c1992d6217eed6364782e6e01c692e349c6edb00bbda6dd5f227f70977e438b46de0861e9a2d4bc8c04270873cec75b1eb395b1328ea8e2 WHIRLPOOL 4dfbf4334444fb77baca96eb14911738f3253709816a6e87ddc2d53c5eebfec22abc32dd61dece00dd250a13574a35df5b8bb3d6812b6fb27e05e192c5d44297
 EBUILD glibc-2.25-r8.ebuild 5040 SHA256 3a4f5ba8e69de50e0e454aba133307a8bd778fdaa06e8869769572cffa203e82 SHA512 e1794aca6c71a8ea5e93388ef4b86e426d19053b32ba606f9392c3c1586a410461921a847a191dc4c774230b48446f412aa1350774cea4aa85f4d3058f14f25a WHIRLPOOL a29f7b356bb02ea996a4c1b9e7f6aa2056fc624cb8fd47fde8fb89cd1ecc9e3964193a25e723ad32d29033fafae481db6313264b3561a30717bd0bd2c7634409
-EBUILD glibc-2.25-r9.ebuild 5041 SHA256 7c8f81684b564a1811e186da9ad31430f623c9f4220488795e3714148ede420d SHA512 08862c8a16318b7c10eb76b542d4b6b555c3db7a941556e4f24d98014da204c696e9156ad06a82dc25d4c796c645091964bc00a5565e499c5f93d9eb81c91cff WHIRLPOOL 4cd043b79007d0bf26459609c08756b7847eb5c51eec31702ef85126275027650186b90a71a23ddd5bd73b74375833d41738ea59b2ad5f7a62ccc9d78a9f0109
-EBUILD glibc-2.26-r3.ebuild 24110 SHA256 a57eaa1a94490cec32d622cc835f9d02c0e0b0ec0450a1aee80f25aee8670d44 SHA512 3ae2aea40c6760cf26a55c447bc12db432e3a8ff68c773e16215b9c265697ada49e3c161498a254397b5f341e98d06dd74ff9aaa4cebe9acb1565111ba7acd43 WHIRLPOOL d613c0ca056cfdb26b523525f1d7acecdd449cc6918fe8834803a39f7d2ef6e2d1a018d6a1a9e92255b0b67234a4ff7d2249123fe7b3485b160b2e5cedf1db1a
-EBUILD glibc-9999.ebuild 23748 SHA256 a930433b65ca897992f5803751a6ac2aa1b81b211ee5c4c70f66cd941742528e SHA512 aec196aa351d008f01520fe7b0805ffcff2b3a8c37c64282889c3e45ba9a08676e8b9e41e1d759b3d5087f4857776b371009f3dc749c77428643047159ee4318 WHIRLPOOL 406f255b67982e3c98207b3c8d8799e2eddce662c8664c19c70359b4c19ef806bbd0fa8b05d4c5539d1b7d6950ec0d1162a0fc2567f639c4c56388d46f62d38e
+EBUILD glibc-2.25-r9.ebuild 5040 SHA256 a83bc110a3634115e4bd81638f27f192bae15460579d75fcc759a7d61a5e8d71 SHA512 7b6a9a0fbcdfb89a843a4d59e8ebfb9bbdbbf314eb897b133bdc43a69da3cec8ff91727a8a1239c5bba0a23514ff634adbf02c40b9055359ca3da5eef78c6563 WHIRLPOOL cd22e24ed191d739bc9e4e93c1c1a9a1a58f578660fd976922042e7f180ff28445289b8212011148bc6f91756c423a508c3283e5742ea80c10793d8ecc32c3fb
+EBUILD glibc-2.26-r3.ebuild 24654 SHA256 6438ce73ada6cbbabb4226a6200a81281ae13341fcfeb217b844377b7cd36079 SHA512 501feeb307e9b581f563d96c92a4456ac880b7783f993476b24ac3ae643f2ea423b19316b93afe064bcbf9be43e710155a5d300fcc8041cbd36f1e2356446966 WHIRLPOOL c633b85b6fe9c6ea7530046e9d7322a51b5eb281f2d0c96e0bf229d4fb1b3ff2ecd7cb52ea959e2516c7d0e73fe988d006c861e6a370bcc18514c7139e991e7d
+EBUILD glibc-9999.ebuild 24896 SHA256 c236687a6e8c65332f1ad0503e6d47912198b9ad14f31cd7add05f9b80f72ddb SHA512 4a0e7d1e7bff6d932a5a2a54a09a855619677336eb91f0f5da8a55ba0d09c68b55861afa43954661c9b8f65ba0887dd39d4d6008c1b2249aa1b7c433729b8ece WHIRLPOOL 6b8fd0edc9fb12d013dd6370561f2d10cc65015c5faf1861f2e35ed5e9a888f84df7d633f431bb22382c511bf87ef1fcf82aac4084d97be0492a0a21aa17c5d4
 MISC ChangeLog 17234 SHA256 6aa54d20b4de284c51e7d0691f861af52e68376d48e91788c79f8ee821300a91 SHA512 39aa17d86df6c1d53c9c2ad268b2123bafccd45a226e064e3b759bda73294c7896d43f9846bf2fa401d29fa04efecee414674d923bb632915175adf7e8b24b2b WHIRLPOOL d60c804c21d7b0065aca45a3f761f0c81f96fe681d60df7f33ce13c879325d23a9908a134f948e50f3c57b5c596c93d1b04932bfb501e88d6d1d88847df62d32
 MISC ChangeLog-2007 108548 SHA256 d622be202eb0d61a363b0ae4065012cd1d494fefaa0c03d4aa7986177cdde6d0 SHA512 fdb3f311a3be4b97a6acfceb1763af5ea69e74d8195522c5d03307f75e15a9382991e9e29dbfdec79e74f1c36328f82648768749bc929e5050ff64b628c7ca98 WHIRLPOOL e550f354394569069e000a7e70ec69c94388a0f415c19b427203f0dcbcbeeec0f5e379ee2af7886cd2d68559e749fab8122e7e077985729d7e0e728ae9096d7a
 MISC ChangeLog-2015 77895 SHA256 d7c16b77521b14a7e1c148f1ad699128e4fcf7caf41a77b46844508ba68acf15 SHA512 1a7fee53e1ec55d0b16b949543b01ad6f429f74293cb6ed730f05a3ddfc4a21fdaf7ee80c0c839d456587a207780ccfefdaf68a236989db5129ffba30c77ff5e WHIRLPOOL 48d46ac586309e415b7d669598c330062afd6fcb2668600d5c62e234d5ab8c3dfd2e81d4f528689efb6d5fb5e2ca5e24c68a4c58be52e1c336127d63224e18fd
diff --git a/sys-libs/glibc/glibc-2.25-r9.ebuild b/sys-libs/glibc/glibc-2.25-r9.ebuild
index ac362fe42e88..b8e8ec81073d 100644
--- a/sys-libs/glibc/glibc-2.25-r9.ebuild
+++ b/sys-libs/glibc/glibc-2.25-r9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="GNU libc6 (also called glibc2) C library"
 HOMEPAGE="https://www.gnu.org/software/libc/libc.html"
 
 LICENSE="LGPL-2.1+ BSD HPND ISC inner-net rc PCRE"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 RESTRICT="strip" # strip ourself #46186
 EMULTILIB_PKG="true"
 
diff --git a/sys-libs/glibc/glibc-2.26-r3.ebuild b/sys-libs/glibc/glibc-2.26-r3.ebuild
index d66113063e92..13aa5ad8bfb6 100644
--- a/sys-libs/glibc/glibc-2.26-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.26-r3.ebuild
@@ -800,4 +800,19 @@ pkg_postinst() {
 		fi
 		locale-gen -j $(makeopts_jobs) --config "${locale_list}"
 	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
 }
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 25412dcedbb8..732d684a7281 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -196,6 +196,21 @@ pkg_pretend() {
 			die "old __guard detected"
 		fi
 	fi
+
+	# Check for sanity of /etc/nsswitch.conf
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] ; then
+		local entry
+		for entry in passwd group shadow; do
+			if ! egrep -q "^[ \t]*${entry}:.*files" "${EROOT}"/etc/nsswitch.conf; then
+				eerror "Your ${EROOT}/etc/nsswitch.conf is out of date."
+				eerror "Please make sure you have 'files' entries for"
+				eerror "'passwd:', 'group:' and 'shadow:' databases."
+				eerror "For more details see:"
+				eerror "  https://wiki.gentoo.org/wiki/Project:Toolchain/nsswitch.conf_in_glibc-2.26"
+				die "nsswitch.conf has no 'files' provider in '${entry}'."
+			fi
+		done
+	fi
 }
 # todo: shouldn't most of these checks be called also in src_configure again?
 # (since consistency is not guaranteed between pkg_ and src_)
@@ -793,4 +808,19 @@ pkg_postinst() {
 
 		use compile-locales || run_locale_gen "${EROOT}"
 	fi
+
+	# Check for sanity of /etc/nsswitch.conf, take 2
+	if [[ -e ${EROOT}/etc/nsswitch.conf ]] && ! has_version sys-auth/libnss-nis ; then
+		local entry
+		for entry in passwd group shadow; do
+			if egrep -q "^[ \t]*${entry}:.*nis" "${EROOT}"/etc/nsswitch.conf; then
+				ewarn ""
+				ewarn "Your ${EROOT}/etc/nsswitch.conf uses NIS. Support for that has been"
+				ewarn "removed from glibc and is now provided by the package"
+				ewarn "  sys-auth/libnss-nis"
+				ewarn "Install it now to keep your NIS setup working."
+				ewarn ""
+			fi
+		done
+	fi
 }