packages/k3s-containerd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add PIE,BIND_NOW,RELRO secure compilation options

Browse Source 
(cherry picked from commit e5cbee4500453efb9393b5c621e276fe06c6a395)
This commit is contained in:
wk333 2023-03-03 11:07:27 +08:00 committed by openeuler-sync-bot
parent 22f59bcf60
commit 0a0e281de7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
k3s-containerd.spec
View File

@ -3,7 +3,7 @@
%global version_suffix k3s1 %global version_suffix k3s1
Version: 1.6.6 Version: 1.6.6
Name: k3s-containerd Name: k3s-containerd
Release: 3 Release: 4
Summary: An industry-standard container runtime Summary: An industry-standard container runtime
License: Apache-2.0 License: Apache-2.0
URL: https://github.com/k3s-io/containerd URL: https://github.com/k3s-io/containerd
@ -53,7 +53,7 @@ VERSIONFLAGS="
TAGS="apparmor seccomp netgo osusergo providerless urfave_cli_no_docs" TAGS="apparmor seccomp netgo osusergo providerless urfave_cli_no_docs"
LDFLAGS=" -w -s" LDFLAGS=" -w -s"
CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS" -o k3s-containerd/bin ./cmd/containerd CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS" -o k3s-containerd/bin ./cmd/containerd
CGO_ENABLED=1 go build -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS" -o k3s-containerd/bin ./cmd/containerd-shim-runc-v2 CGO_ENABLED=1 go build -buildmode=pie -tags "$TAGS" -ldflags "$VERSIONFLAGS $LDFLAGS -linkmode=external -extldflags '-Wl,-z,relro -Wl,-z,now'" -o k3s-containerd/bin ./cmd/containerd-shim-runc-v2
%install %install
install -d -p %{buildroot}%{_libexecdir}/containerd/ install -d -p %{buildroot}%{_libexecdir}/containerd/
@ -68,6 +68,9 @@ cp -rf %{_builddir}/containerd-%{version}-%{version_suffix}/. %{buildroot}%{_lib
%changelog %changelog
* Fri Mar 03 2023 wangkai <wangkai385@h-partners.com> - 1.6.6-k3s1-4
- Add PIE,BIND_NOW,RELRO secure compilation options
* Wed Aug 03 2022 liukuo <liukuo@kylinos.cn> - 1.6.6-k3s1-3 * Wed Aug 03 2022 liukuo <liukuo@kylinos.cn> - 1.6.6-k3s1-3
- License compliance rectification - License compliance rectification