Compare commits

...

No commits in common. "c8-stream-1.0" and "stream-container-tools-rhel8-rhel-8.10.0" have entirely different histories.

4 changed files with 171 additions and 22 deletions

View File

@ -1 +0,0 @@
97ba3a594cae5771913218e3a4a9722ccc88e2e3 SOURCES/plugins-9ebe139.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/plugins-9ebe139.tar.gz /*.tar.gz

View File

@ -1,16 +1,13 @@
%global with_debug 1
%global with_check 0 %global with_check 0
%if 0%{?with_debug}
%global _find_debuginfo_dwz_opts %{nil} %global _find_debuginfo_dwz_opts %{nil}
%global _dwz_low_mem_die_limit 0 %global _dwz_low_mem_die_limit 0
%else
%global debug_package %{nil}
%endif
%if ! 0%{?gobuild:1}
%define gobuild(o:) \ %define gobuild(o:) \
go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -linkmode=external -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v %{?**};
%define gotest(o:) go test %define gotest(o:) go test
%endif
%global provider github %global provider github
%global provider_tld com %global provider_tld com
@ -19,22 +16,23 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
# https://github.com/containernetworking/plugins # https://github.com/containernetworking/plugins
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix} %global import_path %{provider_prefix}
%global commit 9ebe139e77e82afb122e335328007bca86905ae4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Epoch: 1
Name: containernetworking-plugins Name: containernetworking-plugins
Version: 0.7.4 Version: 1.4.0
Release: 4.git%{shortcommit}%{?dist} Release: 5%{?dist}
Summary: Some CNI network plugins, maintained by the containernetworking team. 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/%{commit}/%{repo}-%{shortcommit}.tar.gz Source0: https://%{provider_prefix}/archive/v%{version}.tar.gz
ExcludeArch: ppc64 i686 # https://fedoraproject.org/wiki/PackagingDrafts/Go#Go_Language_Architectures
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. ExclusiveArch: %{go_arches}
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: golang >= 1.17.7
BuildRequires: git BuildRequires: git
BuildRequires: go-md2man BuildRequires: /usr/bin/go-md2man
Provides: containernetworking-cni = %{version}-%{release} BuildRequires: systemd-devel
Requires: systemd
Provides: containernetworking-cni = %{epoch}:%{version}-%{release}
%description %description
The CNI (Container Network Interface) project consists of a specification The CNI (Container Network Interface) project consists of a specification
@ -44,7 +42,9 @@ only with network connectivity of containers and removing allocated resources
when the container is deleted. when the container is deleted.
%prep %prep
%autosetup -Sgit -n %{repo}-%{commit} %autosetup -Sgit -n %{repo}-%{version}
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}"
@ -56,6 +56,8 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
fi fi
export GOPATH=$(pwd)/gopath export GOPATH=$(pwd)/gopath
export GO111MODULE=off
export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
mkdir -p $(pwd)/bin mkdir -p $(pwd)/bin
echo "Building plugins" echo "Building plugins"
@ -72,6 +74,10 @@ done
install -d -p %{buildroot}%{_libexecdir}/cni/ install -d -p %{buildroot}%{_libexecdir}/cni/
install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni install -p -m 0755 bin/* %{buildroot}/%{_libexecdir}/cni
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}
%check %check
%if 0%{?with_check} %if 0%{?with_check}
# Since we aren't packaging up the vendor directory we need to link # Since we aren't packaging up the vendor directory we need to link
@ -116,12 +122,155 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%doc *.md %doc *.md
%dir %{_libexecdir}/cni %dir %{_libexecdir}/cni
%{_libexecdir}/cni/* %{_libexecdir}/cni/*
%{_unitdir}/cni-dhcp.service
%{_unitdir}/cni-dhcp.socket
%changelog %changelog
* Fri Jun 26 2020 Jindrich Novy <jnovy@redhat.com> - 0.7.4-4.git9ebe139 * Mon Aug 05 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-5
- bump release to preserve upgrade path - rebuild for golang fixes
- Related: RHEL-28452
* Thu Aug 01 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-4
- rebuild for golang fixes
- Related: RHEL-28452
* Fri Jun 21 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-3
- rebuild for CVE-2024-1394
- Resolves: RHEL-24294
* Fri Feb 23 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-2
- rebuild
- Resolves: RHEL-18390
* Tue Jan 02 2024 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.4.0
- Related: Jira:RHEL-2110
* Thu Sep 14 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-5
- fix path to dhcp service
- Resolves: #RHEL-3789
* Fri Aug 11 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-4
- add Epoch in Provides
- Related: #2176055
* Sat Jul 08 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-3
- remove no_openssl for FIPS compliance
- Related: #2176055
* Thu Jun 15 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-2
- rebuild for following CVEs:
CVE-2022-41724 CVE-2022-41725 CVE-2023-24538 CVE-2023-24534 CVE-2023-24536 CVE-2022-41723 CVE-2023-24539 CVE-2023-24540 CVE-2023-29400
- Resolves: #2179944
- Resolves: #2187342
- Resolves: #2187360
- Resolves: #2203693
- Resolves: #2207506
* Fri May 12 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.3.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.3.0
- Related: #2176055
* Thu Mar 09 2023 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.2.0
- Related: #2176055
* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-3
- BuildRequires: /usr/bin/go-md2man
- Related: #2061390
* Fri Apr 08 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-2
- bump golang BR to 1.17.7
- Related: #2061390
* Thu Mar 10 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.1.1
- Related: #2061390
* Mon Mar 07 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.1.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.1.0
- Related: #2061390
* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.0.1-2
- revert back to https://github.com/containernetworking/plugins/releases/tag/v1.0.1
- Related: #2001445
* Mon Feb 28 2022 Jindrich Novy <jnovy@redhat.com> - 1.1.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.1.0
- Related: #2001445
* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.1-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.0.1
- Related: #2001445
* Thu Aug 12 2021 Jindrich Novy <jnovy@redhat.com> - 1.0.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v1.0.0
- Related: #1934415
* Sat Feb 06 2021 Jindrich Novy <jnovy@redhat.com> - 0.9.1-1
- update to https://github.com/containernetworking/plugins/releases/tag/v0.9.1
- Related: #1883490
* Thu Dec 10 2020 Jindrich Novy <jnovy@redhat.com> - 0.9.0-1
- update to https://github.com/containernetworking/plugins/releases/tag/v0.9.0
- Related: #1883490
* Tue Dec 08 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-3
- use ExcludeArch: i686 again as the go_arches macro is broken
- Related: #1883490
* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-2
- attempt to fix linker error with golang-1.15
- Related: #1883490
* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.7-1
- synchronize with stream-container-tools-rhel8
- Related: #1883490
* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-2
- propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
- Related: #1821193 - Related: #1821193
* Thu May 14 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.6-1
- update to https://github.com/containernetworking/plugins/releases/tag/v0.8.6
- Related: #1821193
* Tue May 12 2020 Jindrich Novy <jnovy@redhat.com> - 0.8.5-1
- synchronize containter-tools 8.3.0 with 8.2.1
- Related: #1821193
* Thu Dec 12 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-5
- compile with no_openssl
- Related: RHELPLAN-25139
* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-4
- compile in FIPS mode
- Related: RHELPLAN-25139
* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-3
- be sure to use golang >= 1.12.12-4
- Related: RHELPLAN-25139
* Wed Dec 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-2
- build with GO111MODULE=off
- Related: RHELPLAN-25139
* Wed Dec 04 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-1
- update to 0.8.3
- Related: RHELPLAN-25139
* Thu Aug 01 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.1-2
- backport https://github.com/coreos/go-iptables/pull/62
from Michael Cambria
- Resolves: #1627561
* Thu Jun 13 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.8.1-1
- Resolves: #1720319 - bump to v0.8.1
* Sat Jun 01 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.7.5-1
- Resolves: #1616063
- bump to v0.7.5
* Tue Dec 18 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.7.4-3.git9ebe139 * Tue Dec 18 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.7.4-3.git9ebe139
- re-enable debuginfo - re-enable debuginfo

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (v1.4.0.tar.gz) = d812663fb58cfa2bfe35dd70940586d47f11feddd35a86ea7639197b022f9c0e0f487679e2e968eebf1f80b8b1d9cfbd0fe99d80590ae60a8128fa393d713e0b