import UBI containernetworking-plugins-1.4.0-2.el9_4

This commit is contained in:
eabdullin 2024-04-30 15:12:52 +00:00
parent 63fadbfd5e
commit eaa77cb9cf
3 changed files with 16 additions and 11 deletions

View File

@ -1 +1 @@
af940e2272301b20b369e34c9597b96e0007c391 SOURCES/v1.3.0.tar.gz 98f660ef5b47681465ca05a6871345ae397f062c SOURCES/v1.4.0.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/v1.3.0.tar.gz SOURCES/v1.4.0.tar.gz

View File

@ -16,15 +16,15 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -
Epoch: 1 Epoch: 1
Name: containernetworking-plugins Name: containernetworking-plugins
Version: 1.3.0 Version: 1.4.0
Release: 6%{?dist} Release: 2%{?dist}
Summary: CNI network plugins Summary: CNI network plugins
License: ASL 2.0 License: ASL 2.0
URL: https://%{provider_prefix} URL: https://%{provider_prefix}
Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
# https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
ExclusiveArch: %{go_arches} ExclusiveArch: %{go_arches}
BuildRequires: golang >= 1.20.10 BuildRequires: golang >= 1.16.6
BuildRequires: git BuildRequires: git
BuildRequires: /usr/bin/go-md2man BuildRequires: /usr/bin/go-md2man
BuildRequires: systemd-devel BuildRequires: systemd-devel
@ -41,6 +41,7 @@ when the container is deleted.
%prep %prep
%autosetup -Sgit -n %{repo}-%{version} %autosetup -Sgit -n %{repo}-%{version}
rm -rf plugins/main/windows rm -rf plugins/main/windows
sed -i 's,/opt/cni/bin/,/usr/libexec/cni/,' plugins/ipam/dhcp/systemd/cni-dhcp.service
%build %build
export ORG_PATH="%{provider}.%{provider_tld}/%{project}" export ORG_PATH="%{provider}.%{provider_tld}/%{project}"
@ -122,13 +123,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_unitdir}/cni-dhcp.socket %{_unitdir}/cni-dhcp.socket
%changelog %changelog
* Sun Dec 03 2023 Lokesh Mandvekar <lsm5@redhat.com> - 1:1.3.0-6 * Mon Mar 04 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-2
- rebuild because of CVE-2023-29409 - rebuild
- Related: Jira:RHEL-7453 - Related: RHEL-18372
* Mon Sep 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5 * Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-1
- rebuild because of CVE-2023-39318 CVE-2023-39319 CVE-2023-39321 CVE-2023-39322 - update to https://github.com/containernetworking/plugins/releases/tag/v1.4.0
- Related: #RHEL-2780 - Related: RHEL-2112
* Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5
- fix path to dhcp service
- Resolves: #RHEL-3140
* Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4 * Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4
- add Epoch in Provides - add Epoch in Provides