diff --git a/0125-runc-compile-option-compliance.patch b/patch/0125-runc-compile-option-compliance.patch similarity index 92% rename from 0125-runc-compile-option-compliance.patch rename to patch/0125-runc-compile-option-compliance.patch index bd564805399f645a37c0f2d48da85d6f96083de5..281e4bc75d2a3fc38f355d07c8fa603209d12f25 100644 --- a/0125-runc-compile-option-compliance.patch +++ b/patch/0125-runc-compile-option-compliance.patch @@ -29,7 +29,7 @@ index 43d15bf..fcf34ea 100644 + CGO_CPPFLAGS="-fstack-protector-strong -fPIE" \ + CGO_LDFLAGS_ALLOW='-Wl,-z,relro,-z,now' \ + CGO_LDFLAGS="-Wl,-z,relro,-z,now -Wl,-z,noexecstack" \ -+ go build -buildmode=pie -i -tags "$(BUILDTAGS) cgo static_build" -ldflags '-extldflags=-static' -ldflags $(LD_FLAGS) -o runc . ++ go build -buildmode=pie -tags "$(BUILDTAGS) cgo static_build" -ldflags '-extldflags=-static' -ldflags $(LD_FLAGS) -o runc . release: @flag_list=(seccomp selinux apparmor static); \ diff --git a/runc-openeuler.spec b/runc-openeuler.spec index 5bd8cfe40d829ee1ca7f12a6a8e720220518a78a..4241e437bc2527af25ec7fc54df534c47b52995c 100644 --- a/runc-openeuler.spec +++ b/runc-openeuler.spec @@ -4,7 +4,7 @@ Name: docker-runc Version: 1.0.0.rc3 -Release: 112 +Release: 113 Summary: runc is a CLI tool for spawning and running containers according to the OCI specification. License: ASL 2.0 @@ -52,6 +52,12 @@ install -p -m 755 runc $RPM_BUILD_ROOT/%{_bindir}/runc %{_bindir}/runc %changelog +* Thu Mar 18 2021 xiadanni - 1.0.0.rc3-113 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:do not use -i in go build + * Thu Mar 18 2021 xiadanni - 1.0.0.rc3-112 - Type:bugfix - CVE:NA