Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 539928 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/sys-libs/glibc//files/eblits/pkg_preinst.eblit (-14 lines)
Lines 52-69 Link Here
52
	[[ ${ROOT} != "/" ]] && return 0
52
	[[ ${ROOT} != "/" ]] && return 0
53
	[[ -d ${D}/$(get_libdir) ]] || return 0
53
	[[ -d ${D}/$(get_libdir) ]] || return 0
54
	glibc_sanity_check
54
	glibc_sanity_check
55
56
	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
57
	if in_iuse suid && ! use suid ; then
58
		if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
59
			eerror "In order to use glibc with USE=-suid, you must make sure that"
60
			eerror "you have devpts mounted at /dev/pts with the gid=5 option."
61
			eerror "Openrc should do this for you, so you should check /etc/fstab"
62
			eerror "and make sure you do not have any invalid settings there."
63
			# Do not die on older kernels as devpts did not export these settings #489520.
64
			if version_is_at_least 2.6.25 $(uname -r) ; then
65
				die "mount & fix your /dev/pts settings"
66
			fi
67
		fi
68
	fi
69
}
55
}
(-)/usr/portage/sys-libs/glibc//files/eblits/pkg_setup.eblit (+15 lines)
Lines 122-125 Link Here
122
			die "old __guard detected"
122
			die "old __guard detected"
123
		fi
123
		fi
124
	fi
124
	fi
125
126
	# Make sure devpts is mounted correctly for use w/out setuid pt_chown.
127
	just_headers && return
128
	if in_iuse suid && ! use suid ; then
129
		if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then
130
			eerror "In order to use glibc with USE=-suid, you must make sure that"
131
			eerror "you have devpts mounted at /dev/pts with the gid=5 option."
132
			eerror "Openrc should do this for you, so you should check /etc/fstab"
133
			eerror "and make sure you do not have any invalid settings there."
134
			# Do not die on older kernels as devpts did not export these settings #489520.
135
			if version_is_at_least 2.6.25 $(uname -r) ; then
136
				die "mount & fix your /dev/pts settings"
137
			fi
138
		fi
139
	fi
125
}
140
}

Return to bug 539928