From 860d644a86068ec11ba1f249c7cf562a2d2f45e4 Mon Sep 17 00:00:00 2001 From: wangshuo Date: Wed, 19 Jun 2024 23:19:32 +0800 Subject: [PATCH] sync from 20.03-LTS-SP4: strip binary files change systemd unit file permission to 644 --- containernetworking-plugins.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/containernetworking-plugins.spec b/containernetworking-plugins.spec index 1c2fce5..23d1436 100644 --- a/containernetworking-plugins.spec +++ b/containernetworking-plugins.spec @@ -16,7 +16,7 @@ Name: %{project}-%{repo} Version: 1.1.1 -Release: 4 +Release: 6 Summary: Libraries for use by writing CNI plugin License: ASL 2.0 URL: https://github.com/containernetworking/plugins @@ -213,13 +213,14 @@ GO111MODULE=off CGO_ENABLED=0 GOPATH=$TMPDIR go build -tags "$TAGS" \ %install install -d -p %{buildroot}%{_libexecdir}/cni/ +strip bin/* install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni cp %{_builddir}/cni %{buildroot}%{_libexecdir}/cni/ install -d -p %{buildroot}/%{gopath}/src/github.com/containernetworking/plugins/ install -dp %{buildroot}%{_unitdir} -install -p plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir} -install -p plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir} +install -p -m 0644 plugins/ipam/dhcp/systemd/cni-dhcp.service %{buildroot}%{_unitdir} +install -p -m 0644 plugins/ipam/dhcp/systemd/cni-dhcp.socket %{buildroot}%{_unitdir} # source codes for building projects %if 0%{?with_devel} @@ -330,6 +331,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog +* Mon Jun 24 2024 wangshuo - 1.1.1-6 +- change systemd unit file permission to 644 + +* Fri Jun 21 2024 zmr_2020 - 1.1.1-5 +- strip binary files + * Thu Dec 28 2023 yaoxin - 1.1.1-4 - Rebuild for golang cves: CVE-2023-24534,CVE-2023-24536,CVE-2023-24537 and CVE-2023-24538 -- Gitee