commit: b262745c3362ed866f77973d17af64e2a205488e Author: Matt Jolly <Matt.Jolly <AT> footclan <DOT> ninja> AuthorDate: Tue May 11 10:36:10 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue May 11 17:04:51 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b262745c
sys-libs/glibc: Remove check for 'files' provider. The check for a files provider breaks on certain valid nsswitch.conf configurations. As the check was only required for =sys-libs/glibc-2.26 it has been removed. Closes: https://bugs.gentoo.org/789435 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Matt Jolly <Kangie <AT> footclan.ninja> Closes: https://github.com/gentoo/gentoo/pull/20769 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-libs/glibc/glibc-2.33.ebuild | 15 --------------- sys-libs/glibc/glibc-9999.ebuild | 15 --------------- 2 files changed, 30 deletions(-) diff --git a/sys-libs/glibc/glibc-2.33.ebuild b/sys-libs/glibc/glibc-2.33.ebuild index 8cda845c34b..f2eabcd84c0 100644 --- a/sys-libs/glibc/glibc-2.33.ebuild +++ b/sys-libs/glibc/glibc-2.33.ebuild @@ -649,21 +649,6 @@ sanity_prechecks() { ewarn "hypervisor, which is probably not what you want." 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 - # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... if ! is_crosscompile ; then diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild index 95493a554e2..d99367f1bca 100644 --- a/sys-libs/glibc/glibc-9999.ebuild +++ b/sys-libs/glibc/glibc-9999.ebuild @@ -650,21 +650,6 @@ sanity_prechecks() { ewarn "hypervisor, which is probably not what you want." 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 - # ABI-specific checks follow here. Hey, we have a lot more specific conditions that # we test for... if ! is_crosscompile ; then
