vapier 15/05/27 13:55:42 Modified: pkg_preinst.eblit Added: pkg_pretend.eblit Log: Run devpts check in pkg_pretend when using newer EAPIs #539928 by teika. (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.14 sys-libs/glibc/files/eblits/pkg_preinst.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.14&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?rev=1.14&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit?r1=1.13&r2=1.14 Index: pkg_preinst.eblit =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- pkg_preinst.eblit 10 Aug 2014 03:35:56 -0000 1.13 +++ pkg_preinst.eblit 27 May 2015 13:55:42 -0000 1.14 @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.13 2014/08/10 03:35:56 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_preinst.eblit,v 1.14 2015/05/27 13:55:42 vapier Exp $ # Simple test to make sure our new glibc isnt completely broken. # Make sure we don't test with statically built binaries since @@ -53,17 +53,8 @@ [[ -d ${D}/$(get_libdir) ]] || return 0 glibc_sanity_check - # Make sure devpts is mounted correctly for use w/out setuid pt_chown. - if in_iuse suid && ! use suid ; then - if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then - eerror "In order to use glibc with USE=-suid, you must make sure that" - eerror "you have devpts mounted at /dev/pts with the gid=5 option." - eerror "Openrc should do this for you, so you should check /etc/fstab" - eerror "and make sure you do not have any invalid settings there." - # Do not die on older kernels as devpts did not export these settings #489520. - if version_is_at_least 2.6.25 $(uname -r) ; then - die "mount & fix your /dev/pts settings" - fi - fi + # For newer EAPIs, this was run in pkg_pretend. + if [[ ${EAPI:-0} == [0123] ]] ; then + check_devpts fi } 1.1 sys-libs/glibc/files/eblits/pkg_pretend.eblit file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_pretend.eblit?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-libs/glibc/files/eblits/pkg_pretend.eblit?rev=1.1&content-type=text/plain Index: pkg_pretend.eblit =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/files/eblits/pkg_pretend.eblit,v 1.1 2015/05/27 13:55:42 vapier Exp $ check_devpts() { # Make sure devpts is mounted correctly for use w/out setuid pt_chown. # If merely building the binary package, then there's nothing to verify. [[ ${MERGE_TYPE} == "buildonly" ]] && return # Only sanity check when installing the native glibc. [[ ${ROOT} != "/" ]] && return # Older versions always installed setuid, so no need to check. in_iuse suid || return # If they're opting in to the old suid code, then no need to check. use suid && return if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then eerror "In order to use glibc with USE=-suid, you must make sure that" eerror "you have devpts mounted at /dev/pts with the gid=5 option." eerror "Openrc should do this for you, so you should check /etc/fstab" eerror "and make sure you do not have any invalid settings there." # Do not die on older kernels as devpts did not export these settings #489520. if version_is_at_least 2.6.25 $(uname -r) ; then die "mount & fix your /dev/pts settings" fi fi } eblit-glibc-pkg_pretend() { # For older EAPIs, this is run in pkg_preinst. if [[ ${EAPI:-0} != [0123] ]] ; then check_devpts fi }
