Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package cni for openSUSE:Factory checked in
at 2021-05-19 17:48:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cni (Old)
and /work/SRC/openSUSE:Factory/.cni.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cni"
Wed May 19 17:48:44 2021 rev:11 rq:888698 version:0.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/cni/cni.changes 2020-10-08 13:07:09.922899802
+0200
+++ /work/SRC/openSUSE:Factory/.cni.new.2988/cni.changes 2021-05-19
17:48:47.573682389 +0200
@@ -1,0 +2,14 @@
+Sat Apr 24 09:19:04 UTC 2021 - Dirk M??ller <dmuel...@suse.com>
+
+- use buildmode=pie (cnitool is installed into sbindir)
+
+-------------------------------------------------------------------
+Tue Mar 16 05:16:27 UTC 2021 - Jeff Kowalczyk <jkowalc...@suse.com>
+
+- Set GO111MODULE=auto to build with go1.16+
+ * Default changed to GO111MODULE=on in go1.16
+ * Set temporarily until using upstream release with go.mod
+ * Drop BuildRequires: golang-packaging not currently using macros
+ * Add BuildRequires: golang(API) >= 1.13 recommended dependency expression
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cni.spec ++++++
--- /var/tmp/diff_new_pack.yEoBbB/_old 2021-05-19 17:48:48.085680242 +0200
+++ /var/tmp/diff_new_pack.yEoBbB/_new 2021-05-19 17:48:48.085680242 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cni
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -30,16 +30,16 @@
Source: %{name}-%{version}.tar.xz
Source1: 99-loopback.conf
Source2: build.sh
-BuildRequires: golang-packaging
BuildRequires: shadow
BuildRequires: systemd-rpm-macros
BuildRequires: xz
+BuildRequires: golang(API) >= 1.13
Recommends: cni-plugins
Requires(post): %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
-# Make sure that the binary is not getting stripped.
-%{go_nostrip}
+# Remove stripping of Go binaries.
+%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
%description
The CNI (Container Network Interface) project consists of a
@@ -55,6 +55,9 @@
cp %{SOURCE2} build.sh
%build
+# go1.16+ default is GO111MODULE=on set to auto temporarily
+# until using upstream release with go.mod
+export GO111MODULE=auto
sh ./build.sh
%install
++++++ build.sh ++++++
--- /var/tmp/diff_new_pack.yEoBbB/_old 2021-05-19 17:48:48.129680057 +0200
+++ /var/tmp/diff_new_pack.yEoBbB/_new 2021-05-19 17:48:48.129680057 +0200
@@ -13,10 +13,10 @@
export GOPATH=${PWD}/gopath
echo "Building API"
-go build "$@" ${REPO_PATH}/libcni
+go build -buildmode=pie "$@" ${REPO_PATH}/libcni
echo "Building reference CLI"
-go build -o ${PWD}/bin/cnitool "$@" ${REPO_PATH}/cnitool
+go build -buildmode=pie -o ${PWD}/bin/cnitool "$@" ${REPO_PATH}/cnitool
echo "Building plugins"
PLUGINS="plugins/test/*"
@@ -24,6 +24,6 @@
if [ -d $d ]; then
plugin=$(basename $d)
echo " " $plugin
- go build -o ${PWD}/bin/$plugin "$@" ${REPO_PATH}/$d
+ go build -buildmode=pie -o ${PWD}/bin/$plugin "$@"
${REPO_PATH}/$d
fi
done
