Compare commits

...

No commits in common. "imports/c8-stream-2.0/containernetworking-plugins-0.8.3-4.module+el8.5.0+14796+e4386a39" and "c8-stream-1.0" have entirely different histories.

3 changed files with 12 additions and 39 deletions

View File

@ -1 +1 @@
78fc72f4a51634078171068805db4e4b245c6af9 SOURCES/plugins-d5efdfe.tar.gz
97ba3a594cae5771913218e3a4a9722ccc88e2e3 SOURCES/plugins-9ebe139.tar.gz

2
.gitignore vendored
View File

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

View File

@ -8,11 +8,9 @@
%global debug_package %{nil}
%endif
%if ! 0%{?gobuild:1}
%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 %{?**};
%define gotest(o:) go test
%endif
%global provider github
%global provider_tld com
@ -21,18 +19,19 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUIL
# https://github.com/containernetworking/plugins
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix}
%global commit d5efdfe1f6d6e8e9e9494e3f43be54f76c0f8fd6
%global commit 9ebe139e77e82afb122e335328007bca86905ae4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: containernetworking-plugins
Version: 0.8.3
Release: 4%{?dist}
Summary: CNI network plugins
Version: 0.7.4
Release: 4.git%{shortcommit}%{?dist}
Summary: Some CNI network plugins, maintained by the containernetworking team.
License: ASL 2.0
URL: https://%{provider_prefix}
Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
ExcludeArch: ppc64 i686
BuildRequires: golang >= 1.12.12-4
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: git
BuildRequires: go-md2man
Provides: containernetworking-cni = %{version}-%{release}
@ -45,8 +44,7 @@ only with network connectivity of containers and removing allocated resources
when the container is deleted.
%prep
%autosetup -n %{repo}-%{commit} -p1
rm -rf plugins/main/windows
%autosetup -Sgit -n %{repo}-%{commit}
%build
export ORG_PATH="%{provider}.%{provider_tld}/%{project}"
@ -58,7 +56,6 @@ if [ ! -h gopath/src/${REPO_PATH} ]; then
fi
export GOPATH=$(pwd)/gopath
export GO111MODULE=off
mkdir -p $(pwd)/bin
echo "Building plugins"
@ -121,33 +118,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_libexecdir}/cni/*
%changelog
* Thu Dec 12 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-4
- compile with no_openssl
- Related: RHELPLAN-25139
* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-3
- compile in FIPS mode
- Related: RHELPLAN-25139
* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 0.8.3-2
- be sure to use golang >= 1.12.12-4
- Related: RHELPLAN-25139
* Thu Dec 05 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
* Fri Jun 26 2020 Jindrich Novy <jnovy@redhat.com> - 0.7.4-4.git9ebe139
- bump release to preserve upgrade path
- Related: #1821193
* Tue Dec 18 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.7.4-3.git9ebe139
- re-enable debuginfo