| 1 |
commit: f58ea78c13b6078eade21a0de13e032e9ef49854 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Feb 7 02:43:09 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Feb 7 02:45:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f58ea78c |
| 7 |
|
| 8 |
sys-libs/glibc: re-enable SSP for m68k; drop obsolete option in 2.35/9999 |
| 9 |
|
| 10 |
- Re-enable SSP for m68k (it works now!) [0] |
| 11 |
- Drop no-op/obsolete/removed '--enable-stackguard-randomization' [1] |
| 12 |
|
| 13 |
But defer a decision on whether to make USE=ssp continue to |
| 14 |
mean -fstack-protector-strong or change to -fstack-protector-all now that |
| 15 |
test failure issues have veen fixed. |
| 16 |
|
| 17 |
[0] https://sourceware.org/PR24202 |
| 18 |
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=f294306ba1385b096f4e4cac9146a989f1e6d1c0 |
| 19 |
|
| 20 |
Bug: https://bugs.gentoo.org/832738 |
| 21 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 22 |
|
| 23 |
sys-libs/glibc/glibc-2.35.ebuild | 18 +++--------------- |
| 24 |
sys-libs/glibc/glibc-9999.ebuild | 24 ++++++------------------ |
| 25 |
2 files changed, 9 insertions(+), 33 deletions(-) |
| 26 |
|
| 27 |
diff --git a/sys-libs/glibc/glibc-2.35.ebuild b/sys-libs/glibc/glibc-2.35.ebuild |
| 28 |
index 3365dded67ed..39ebc6f3a02b 100644 |
| 29 |
--- a/sys-libs/glibc/glibc-2.35.ebuild |
| 30 |
+++ b/sys-libs/glibc/glibc-2.35.ebuild |
| 31 |
@@ -898,21 +898,9 @@ glibc_do_configure() { |
| 32 |
echo |
| 33 |
local myconf=() |
| 34 |
|
| 35 |
- case ${CTARGET} in |
| 36 |
- m68k*) |
| 37 |
- # setjmp() is not compatible with stack protection: |
| 38 |
- # https://sourceware.org/PR24202 |
| 39 |
- myconf+=( --enable-stack-protector=no ) |
| 40 |
- ;; |
| 41 |
- *) |
| 42 |
- # Use '=strong' instead of '=all' to protect only functions |
| 43 |
- # worth protecting from stack smashes. |
| 44 |
- # '=all' is also known to have a problem in IFUNC resolution |
| 45 |
- # tests: https://sourceware.org/PR25680, bug #712356. |
| 46 |
- myconf+=( --enable-stack-protector=$(usex ssp strong no) ) |
| 47 |
- ;; |
| 48 |
- esac |
| 49 |
- myconf+=( --enable-stackguard-randomization ) |
| 50 |
+ # Use '=strong' instead of '=all' to protect only functions |
| 51 |
+ # worth protecting from stack smashes. |
| 52 |
+ myconf+=( --enable-stack-protector=$(usex ssp strong no) ) |
| 53 |
|
| 54 |
# Keep a whitelist of targets supporing IFUNC. glibc's ./configure |
| 55 |
# is not robust enough to detect proper support: |
| 56 |
|
| 57 |
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild |
| 58 |
index b97550bf18f0..39ebc6f3a02b 100644 |
| 59 |
--- a/sys-libs/glibc/glibc-9999.ebuild |
| 60 |
+++ b/sys-libs/glibc/glibc-9999.ebuild |
| 61 |
@@ -23,7 +23,7 @@ SLOT="2.2" |
| 62 |
EMULTILIB_PKG="true" |
| 63 |
|
| 64 |
# Gentoo patchset (ignored for live ebuilds) |
| 65 |
-PATCH_VER=2 |
| 66 |
+PATCH_VER=1 |
| 67 |
PATCH_DEV=dilfridge |
| 68 |
|
| 69 |
if [[ ${PV} == 9999* ]]; then |
| 70 |
@@ -148,13 +148,13 @@ RESTRICT="!test? ( test )" |
| 71 |
if [[ ${CATEGORY} == cross-* ]] ; then |
| 72 |
BDEPEND+=" !headers-only? ( |
| 73 |
>=${CATEGORY}/binutils-2.27 |
| 74 |
- >=${CATEGORY}/gcc-6 |
| 75 |
+ >=${CATEGORY}/gcc-6.2 |
| 76 |
)" |
| 77 |
[[ ${CATEGORY} == *-linux* ]] && DEPEND+=" ${CATEGORY}/linux-headers" |
| 78 |
else |
| 79 |
BDEPEND+=" |
| 80 |
>=sys-devel/binutils-2.27 |
| 81 |
- >=sys-devel/gcc-6 |
| 82 |
+ >=sys-devel/gcc-6.2 |
| 83 |
" |
| 84 |
DEPEND+=" virtual/os-headers " |
| 85 |
RDEPEND+=" |
| 86 |
@@ -898,21 +898,9 @@ glibc_do_configure() { |
| 87 |
echo |
| 88 |
local myconf=() |
| 89 |
|
| 90 |
- case ${CTARGET} in |
| 91 |
- m68k*) |
| 92 |
- # setjmp() is not compatible with stack protection: |
| 93 |
- # https://sourceware.org/PR24202 |
| 94 |
- myconf+=( --enable-stack-protector=no ) |
| 95 |
- ;; |
| 96 |
- *) |
| 97 |
- # Use '=strong' instead of '=all' to protect only functions |
| 98 |
- # worth protecting from stack smashes. |
| 99 |
- # '=all' is also known to have a problem in IFUNC resolution |
| 100 |
- # tests: https://sourceware.org/PR25680, bug #712356. |
| 101 |
- myconf+=( --enable-stack-protector=$(usex ssp strong no) ) |
| 102 |
- ;; |
| 103 |
- esac |
| 104 |
- myconf+=( --enable-stackguard-randomization ) |
| 105 |
+ # Use '=strong' instead of '=all' to protect only functions |
| 106 |
+ # worth protecting from stack smashes. |
| 107 |
+ myconf+=( --enable-stack-protector=$(usex ssp strong no) ) |
| 108 |
|
| 109 |
# Keep a whitelist of targets supporing IFUNC. glibc's ./configure |
| 110 |
# is not robust enough to detect proper support: |
Archives