1 |
commit: c9f6a29817f5039507af213da5abb0254b13da19 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 11 20:52:29 2020 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 11 20:52:29 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f6a298 |
7 |
|
8 |
sys-libs/glibc: drop devpts mount checks, bug #704780 |
9 |
|
10 |
This is the same as b793253be2f42 |
11 |
("sys-libs/glibc: drop devpts mount checks, bug #704780") |
12 |
applied to stable ebuilds. |
13 |
|
14 |
Toralf reports that sys-apps/bubblewrap also does not |
15 |
follow tty group convention when mounts devpts. Let's |
16 |
drop it from stable ebuilds as well. |
17 |
|
18 |
Reported-by: Toralf Förster |
19 |
Reported-by: Kai Krakow |
20 |
Closes: https://bugs.gentoo.org/704780 |
21 |
Package-Manager: Portage-2.3.99, Repoman-2.3.22 |
22 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
23 |
|
24 |
sys-libs/glibc/glibc-2.30-r8.ebuild | 24 ------------------------ |
25 |
1 file changed, 24 deletions(-) |
26 |
|
27 |
diff --git a/sys-libs/glibc/glibc-2.30-r8.ebuild b/sys-libs/glibc/glibc-2.30-r8.ebuild |
28 |
index 14ca4e95a44..aea0098e69f 100644 |
29 |
--- a/sys-libs/glibc/glibc-2.30-r8.ebuild |
30 |
+++ b/sys-libs/glibc/glibc-2.30-r8.ebuild |
31 |
@@ -516,27 +516,6 @@ glibc_banner() { |
32 |
echo "${b}" |
33 |
} |
34 |
|
35 |
-check_devpts() { |
36 |
- # Make sure devpts is mounted correctly for use w/out setuid pt_chown. |
37 |
- |
38 |
- # If merely building the binary package, then there's nothing to verify. |
39 |
- [[ ${MERGE_TYPE} == "buildonly" ]] && return |
40 |
- |
41 |
- # Only sanity check when installing the native glibc. |
42 |
- [[ -n ${ROOT} ]] && return |
43 |
- |
44 |
- # If they're opting in to the old suid code, then no need to check. |
45 |
- use suid && return |
46 |
- |
47 |
- if awk '$3 == "devpts" && $4 ~ /[, ]gid=5[, ]/ { exit 1 }' /proc/mounts ; then |
48 |
- eerror "In order to use glibc with USE=-suid, you must make sure that" |
49 |
- eerror "you have devpts mounted at /dev/pts with the gid=5 option." |
50 |
- eerror "Openrc should do this for you, so you should check /etc/fstab" |
51 |
- eerror "and make sure you do not have any invalid settings there." |
52 |
- die "mount & fix your /dev/pts settings" |
53 |
- fi |
54 |
-} |
55 |
- |
56 |
# The following Kernel version handling functions are mostly copied from portage |
57 |
# source. It's better not to use linux-info.eclass here since a) it adds too |
58 |
# much magic, see bug 326693 for some of the arguments, and b) some of the |
59 |
@@ -606,9 +585,6 @@ get_kheader_version() { |
60 |
# pkg_ and src_ phases, so we call this function both in pkg_pretend and in |
61 |
# src_unpack. |
62 |
sanity_prechecks() { |
63 |
- # Make sure devpts is mounted correctly for use w/out setuid pt_chown |
64 |
- check_devpts |
65 |
- |
66 |
# Prevent native builds from downgrading |
67 |
if [[ ${MERGE_TYPE} != "buildonly" ]] && \ |
68 |
[[ -z ${ROOT} ]] && \ |