From b42c9f45cf3b8c1a24bd14fec93f1aa43f9e29b6 Mon Sep 17 00:00:00 2001 From: shixuantong Date: Tue, 18 Feb 2025 14:42:37 +0800 Subject: [PATCH] glibc testcase use newly built ld.so instead of environment default installed ld.so (cherry picked from commit 39be4915e4725de1e52ced4c6b8d0323703fc8c2) --- glibc.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/glibc.spec b/glibc.spec index f4c9024..8d9af15 100644 --- a/glibc.spec +++ b/glibc.spec @@ -67,7 +67,7 @@ ############################################################################## Name: glibc Version: 2.38 -Release: 53 +Release: 54 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -648,6 +648,7 @@ mkdir $builddir pushd $builddir ../configure CC="%GCC" CXX="%GXX" CFLAGS="$BuildFlags" LDFLAGS="$LinkFlags" \ --prefix=%{_prefix} \ + --enable-hardcoded-path-in-tests \ --with-headers=%{_prefix}/include $EnableKernel \ --with-nonshared-cflags=-Wp,-D_FORTIFY_SOURCE=2 \ --enable-bind-now \ @@ -1087,7 +1088,9 @@ function removeLoadPath() currPath=$(echo $runpathInfo | awk -F "RUNPATH=" '{print $2}') fi - if [ x"$currPath" == x"\$ORIGIN" ]; then + # 2dcaf7064 using rpath instead of runpath with --enable-hardcoded-path-in-tests + # using "\$ORIGIN"* to match rpath address + if [[ x"$currPath" == x"\$ORIGIN"* ]]; then chrpath -d $file findReliantLib $file @@ -1488,6 +1491,9 @@ fi %endif %changelog +* Tue Feb 18 2025 shixuantong - 2.38-54 +- glibc testcase use newly built ld.so instead of environment default installed ld.so + * Thu Feb 06 2025 shixuantong - 2.38-53 - fix CVE-2019-1010023 -- Gitee