From b536c01ef1a52cdb2f46c45f0a2a389590ab8453 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 09:36:10 +0000 Subject: import flannel-0.7.1-3.el7 --- diff --git a/SPECS/flannel.spec b/SPECS/flannel.spec index 2ef9764..a0a9fa6 100644 --- a/SPECS/flannel.spec +++ b/SPECS/flannel.spec @@ -21,7 +21,7 @@ Name: flannel Version: 0.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Etcd address management agent for overlay networks License: ASL 2.0 URL: https://%{import_path} @@ -144,7 +144,7 @@ export GOPATH=$(pwd):%{buildroot}/%{gopath}:$(pwd)/Godeps/_workspace %endif %if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; +%define gobuild(o:) go build -buildmode pie -tags=rpm_crashtraceback -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro,-z,now'" -a -v -x %{?**}; %endif export LDFLAGS="-X github.com/coreos/flannel/version.Version=%{version}" @@ -209,6 +209,10 @@ go test %{import_path}/subnet %endif %changelog +* Tue Feb 06 2018 Jan Chaloupka - 0.7.1-3 +- Rebuild for 7.5.0 + resolves: #1542530 + * Tue Jun 06 2017 Jan Chaloupka - 0.7.1-2 - Bump and build for secondary architectures