!104 [sync] PR-103: riscv64: 不应用-static-pie补丁

From: @openeuler-sync-bot 
Reviewed-by: @duguhaotian 
Signed-off-by: @duguhaotian

0011-static-compilation-for-cross-version-use.patch

@@ -0,0 +1,26 @@
+From 8de2df7665017e851b319056170dc367edf2b017 Mon Sep 17 00:00:00 2001
+From: yangjiaqi <yangjiaqi16@huawei.com>
+Date: Fri, 10 May 2024 15:28:22 +0800
+Subject: [PATCH] static compilation for cross-version use
+
+Signed-off-by: vegbir <yangjiaqi16@huawei.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index c750d94..d3b3af3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -20,7 +20,7 @@ VERSION := $(shell cat ./VERSION)
+ BEP_DIR=/tmp/syscontainer-tools-build-bep
+ BEP_FLAGS=-tmpdir=/tmp/syscontainer-tools-build-bep
+ 
+-GO_LDFLAGS="-buildid=IdByiSula $(BEP_FLAGS) -linkmode=external -extldflags=-static -extldflags=-Wl,-z,relro,-z,now -X main.gitCommit=${COMMIT} -X main.version=${VERSION}"
++GO_LDFLAGS='-buildid=IdByiSula $(BEP_FLAGS) -linkmode=external -extldflags "-static-pie -Wl,-z,relro,-z,now" -X main.gitCommit=${COMMIT} -X main.version=${VERSION}'
+ 
+ ENV = GOPATH=${GOPATH} \
+       CGO_ENABLED=1 \
+-- 
+2.33.0
+

syscontainer-tools.spec

@@ -1,7 +1,7 @@
 #Basic Information
 Name:           syscontainer-tools
 Version:        0.9
-Release:        62
+Release:        67
 Summary:        syscontainer tools for IT, work with iSulad
 License:        Mulan PSL v2
 URL:            https://gitee.com/openeuler/syscontainer-tools
@@ -18,10 +18,15 @@ Patch7:      0007-use-file-locks-to-avoid-remounting-the-sharepath-mas.patch
 Patch8:      0008-clean-up-run-syscontainer-tools-netns-containerid-di.patch
 Patch9:      0009-drop-useless-function-error-and-info.patch
 Patch10:     0010-fix-log-of-removeUdevRule.patch
+Patch11:     0011-static-compilation-for-cross-version-use.patch
+Patch12:     0012-support-Vnic-specifying-network-namespace.patch
 
 %ifarch sw_64
 Patch1000:   1000-add-sw_64-support-not-upstream-modified-files.patch
 %endif
+%ifarch loongarch64
+Patch1001:   1001-add-loongarch64-support-not-upstream-modified-files.patch
+%endif
 
 #Dependency
 BuildRequires: glibc-static 
@@ -35,6 +40,10 @@ This is syscontainer tools, to make it work, you need a isulad and util-linux
 #Build sections
 %prep
 %autosetup -n %{name}-v%{version} -p1
+%ifarch riscv64
+# not support -static-pie until glibc2.39, gcc14
+%patch11 -R -p1
+%endif
 
 %build
 make init && make
@@ -123,6 +132,36 @@ chmod 0640 ${HOOK_SPEC}/hookspec.json
 rm -rfv %{buildroot}
 
 %changelog
+* Fri Sep 20 2024 laokz <zhangkai@iscas.ac.cn> - 0.9-67
+- Type:fix
+- CVE:NA
+- SUG:NA
+- DESC:riscv64: reverse -static-pie patch due to unsupported tool-chains
+
+* Thu Aug 29 2024 wujichao <wujichao1@huawei.com> - 0.9-66
+- Type:patch
+- CVE:NA
+- SUG:NA
+- DESC:support-Vnic-specifying-network-namespace
+
+* Fri May 10 2024 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-65
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:static compilation for cross-version use
+
+* Mon Mar 11 2024 zhangxianting <zhangxianting@uniontech.com> - 0.9-64
+- Type:patch
+- CVE:NA
+- SUG:NA
+- DESC:patch hunk FAILED bacause of the arch judgement of sw_64 and loongarch64
+
+* Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-63
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:add loongarch64 support
+
 * Mon Dec 25 2023 yangjiaqi <yangjiaqi16@huawei.com> - 0.9-62
 - Type:bugfix
 - CVE:NA