From f6087dacf6e6abd8a75b5129806555095bb0d6c1 Mon Sep 17 00:00:00 2001
From: CongTianKong <Tic2929014466@hotmail.com>
Date: Fri, 10 Nov 2023 12:47:59 +0800
Subject: [PATCH] fix base commands effected by LD_LIBRARY_PATH
---
make-deb.sh | 6 +++---
make-rpm.sh | 8 ++++----
scripts/ablrun_part | 8 +++++---
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/make-deb.sh b/make-deb.sh
index efcb83d..2382488 100755
--- a/make-deb.sh
+++ b/make-deb.sh
@@ -1,10 +1,10 @@
#!/bin/bash
-LIBC6_DOWNLOAD_URL=http://ftp.cn.debian.org/debian/pool/main/g/glibc/libc6_2.36-9+deb12u1_amd64.deb
-LIBC_BIN_DOWNLOAD_URL=http://ftp.cn.debian.org/debian/pool/main/g/glibc/libc-bin_2.36-9+deb12u1_amd64.deb
+LIBC6_DOWNLOAD_URL=http://ftp.cn.debian.org/debian/pool/main/g/glibc/libc6_2.36-9+deb12u3_amd64.deb
+LIBC_BIN_DOWNLOAD_URL=http://ftp.cn.debian.org/debian/pool/main/g/glibc/libc-bin_2.36-9+deb12u3_amd64.deb
LIBSTDCxx6_DOWNLOAD_URL=http://ftp.cn.debian.org/debian/pool/main/g/gcc-12/libstdc++6_12.2.0-14_amd64.deb
-ABL_VERSION=8
+ABL_VERSION=9
check(){
if [ "$1" != 0 ]
diff --git a/make-rpm.sh b/make-rpm.sh
index e8096d6..ae66941 100755
--- a/make-rpm.sh
+++ b/make-rpm.sh
@@ -1,10 +1,10 @@
#!/bin/bash
-GLIBC_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/glibc/2.38/1.fc39/x86_64/glibc-2.38-1.fc39.x86_64.rpm
-GLIBC_COMMON_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/glibc/2.38/1.fc39/x86_64/glibc-common-2.38-1.fc39.x86_64.rpm
-LIBSTDCxx_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/gcc/13.2.1/1.fc39/x86_64/libstdc++-13.2.1-1.fc39.x86_64.rpm
+GLIBC_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/glibc/2.38/10.fc39/x86_64/glibc-2.38-10.fc39.x86_64.rpm
+GLIBC_COMMON_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/glibc/2.38/10.fc39/x86_64/glibc-common-2.38-10.fc39.x86_64.rpm
+LIBSTDCxx_DOWNLOAD_URL=https://kojipkgs.fedoraproject.org//packages/gcc/13.2.1/4.fc39/x86_64/libstdc++-13.2.1-4.fc39.x86_64.rpm
-ABL_VERSION=8
+ABL_VERSION=9
ABL_RPM_RELEASE=1
check(){
diff --git a/scripts/ablrun_part b/scripts/ablrun_part
index 33f9ef1..5946f18 100755
--- a/scripts/ablrun_part
+++ b/scripts/ablrun_part
@@ -15,9 +15,6 @@ then
exit
fi
-ABL_LD_SO_PATH=`readlink -e $ABL_TARGET_LD_SO_PATH`
-ABL_LIBC_SO_PATH=`readlink -e /${ABL_DIR_PREFIX}/libc.so.6`
-
if [ "$LD_LIBRARY_PATH" = "" ]
then
ABL_LIBRARY_PATH="/usr/${ABL_DIR_PREFIX}/additional-base-lib/"
@@ -25,6 +22,11 @@ else
ABL_LIBRARY_PATH="$LD_LIBRARY_PATH;/usr/${ABL_DIR_PREFIX}/additional-base-lib"
fi
+unset LD_LIBRARY_PATH
+
+ABL_LD_SO_PATH=`readlink -e $ABL_TARGET_LD_SO_PATH`
+ABL_LIBC_SO_PATH=`readlink -e /${ABL_DIR_PREFIX}/libc.so.6`
+
ABL_BWRAP_SETUID=`which bwrap`
ABL_BWRAP_SETUID=`readlink -e "$ABL_BWRAP_SETUID"`
ABL_BWRAP_SETUID=`ls -l "$ABL_BWRAP_SETUID"`