Gentoo Archives: gentoo-dev

From: William Hubbs <williamh@g.o>
To: gentoo-dev@l.g.o
Cc: William Hubbs <williamh@g.o>
Subject: [gentoo-dev] [PATCH 1/1] profiles/hardened: remove the legasy musl profiles
Date: Thu, 12 Aug 2021 22:36:24
Message-Id: 20210812223544.479-2-williamh@gentoo.org
In Reply to: [gentoo-dev] [PATCH 0/1] remove the legasy musl profiles by William Hubbs
1 Signed-off-by: William Hubbs <williamh@g.o>
2 ---
3 profiles/hardened/linux/musl/eapi | 1 -
4 profiles/hardened/linux/musl/make.defaults | 5 -----
5 profiles/hardened/linux/musl/mips/eapi | 1 -
6 profiles/hardened/linux/musl/mips/mipsel/eapi | 1 -
7 profiles/hardened/linux/musl/mips/mipsel/parent | 2 --
8 profiles/hardened/linux/musl/mips/parent | 2 --
9 profiles/hardened/linux/musl/package.use.mask | 6 ------
10 profiles/hardened/linux/musl/use.force | 8 --------
11 profiles/hardened/linux/musl/use.mask | 17 -----------------
12 profiles/profiles.desc | 2 --
13 10 files changed, 45 deletions(-)
14 delete mode 100644 profiles/hardened/linux/musl/eapi
15 delete mode 100644 profiles/hardened/linux/musl/make.defaults
16 delete mode 100644 profiles/hardened/linux/musl/mips/eapi
17 delete mode 100644 profiles/hardened/linux/musl/mips/mipsel/eapi
18 delete mode 100644 profiles/hardened/linux/musl/mips/mipsel/parent
19 delete mode 100644 profiles/hardened/linux/musl/mips/parent
20 delete mode 100644 profiles/hardened/linux/musl/package.use.mask
21 delete mode 100644 profiles/hardened/linux/musl/use.force
22 delete mode 100644 profiles/hardened/linux/musl/use.mask
23
24 diff --git a/profiles/hardened/linux/musl/eapi b/profiles/hardened/linux/musl/eapi
25 deleted file mode 100644
26 index 7ed6ff82de6..00000000000
27 --- a/profiles/hardened/linux/musl/eapi
28 +++ /dev/null
29 @@ -1 +0,0 @@
30 -5
31 diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
32 deleted file mode 100644
33 index 1212f635f54..00000000000
34 --- a/profiles/hardened/linux/musl/make.defaults
35 +++ /dev/null
36 @@ -1,5 +0,0 @@
37 -# Copyright 1999-2017 Gentoo Foundation.
38 -# Distributed under the terms of the GNU General Public License v2
39 -
40 -USE="${USE} hardened pic -jit -orc"
41 -BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
42 diff --git a/profiles/hardened/linux/musl/mips/eapi b/profiles/hardened/linux/musl/mips/eapi
43 deleted file mode 100644
44 index 7ed6ff82de6..00000000000
45 --- a/profiles/hardened/linux/musl/mips/eapi
46 +++ /dev/null
47 @@ -1 +0,0 @@
48 -5
49 diff --git a/profiles/hardened/linux/musl/mips/mipsel/eapi b/profiles/hardened/linux/musl/mips/mipsel/eapi
50 deleted file mode 100644
51 index 7ed6ff82de6..00000000000
52 --- a/profiles/hardened/linux/musl/mips/mipsel/eapi
53 +++ /dev/null
54 @@ -1 +0,0 @@
55 -5
56 diff --git a/profiles/hardened/linux/musl/mips/mipsel/parent b/profiles/hardened/linux/musl/mips/mipsel/parent
57 deleted file mode 100644
58 index c3e31b29715..00000000000
59 --- a/profiles/hardened/linux/musl/mips/mipsel/parent
60 +++ /dev/null
61 @@ -1,2 +0,0 @@
62 -../../../../../default/linux/musl/mips/mipsel
63 -..
64 diff --git a/profiles/hardened/linux/musl/mips/parent b/profiles/hardened/linux/musl/mips/parent
65 deleted file mode 100644
66 index 506bb45139d..00000000000
67 --- a/profiles/hardened/linux/musl/mips/parent
68 +++ /dev/null
69 @@ -1,2 +0,0 @@
70 -../../../../default/linux/musl/mips
71 -..
72 diff --git a/profiles/hardened/linux/musl/package.use.mask b/profiles/hardened/linux/musl/package.use.mask
73 deleted file mode 100644
74 index ce38400b406..00000000000
75 --- a/profiles/hardened/linux/musl/package.use.mask
76 +++ /dev/null
77 @@ -1,6 +0,0 @@
78 -# Copyright 1999-2015 Gentoo Foundation.
79 -# Distributed under the terms of the GNU General Public License v2
80 -
81 -# Matthias Maier <tamiko@××××××.org> (2017-05-11)
82 -# masked in base, unmask for hardened/musl/
83 -sys-devel/gcc -pie
84 diff --git a/profiles/hardened/linux/musl/use.force b/profiles/hardened/linux/musl/use.force
85 deleted file mode 100644
86 index e2d7cf05ec5..00000000000
87 --- a/profiles/hardened/linux/musl/use.force
88 +++ /dev/null
89 @@ -1,8 +0,0 @@
90 -# Copyright 1999-2013 Gentoo Foundation.
91 -# Distributed under the terms of the GNU General Public License v2
92 -
93 -elibc_musl
94 -
95 -# Make sure people don't accidentally turn of ssp/pie in important packages.
96 -pie
97 -ssp
98 diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
99 deleted file mode 100644
100 index b851b043ca0..00000000000
101 --- a/profiles/hardened/linux/musl/use.mask
102 +++ /dev/null
103 @@ -1,17 +0,0 @@
104 -# Copyright 1999-2015 Gentoo Foundation.
105 -# Distributed under the terms of the GNU General Public License v2
106 -
107 --elibc_musl
108 -elibc_uclibc
109 -elibc_glibc
110 -
111 --hardened
112 -
113 -# precompiled headers are not compat with ASLR.
114 -pch
115 -
116 -# prelink is masked for hardened
117 -prelink
118 -
119 -# profile are incompatible when linking with pie
120 -profile
121 diff --git a/profiles/profiles.desc b/profiles/profiles.desc
122 index e7e19692b5d..c02a0d23c6c 100644
123 --- a/profiles/profiles.desc
124 +++ b/profiles/profiles.desc
125 @@ -254,9 +254,7 @@ arm default/linux/arm/17.0/musl/armv7a/hardened exp
126 arm64 default/linux/arm64/17.0/musl exp
127 arm64 default/linux/arm64/17.0/musl/hardened exp
128 mips default/linux/musl/mips exp
129 -mips hardened/linux/musl/mips exp
130 mips default/linux/musl/mips/mipsel exp
131 -mips hardened/linux/musl/mips/mipsel exp
132 ppc default/linux/powerpc/ppc32/17.0/musl exp
133 ppc default/linux/powerpc/ppc32/17.0/musl/hardened exp
134 x86 default/linux/x86/17.0/musl exp
135 --
136 2.31.1