Hello community,
here is the log from the commit of package trivy for openSUSE:Factory checked
in at 2020-10-29 14:52:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trivy (Old)
and /work/SRC/openSUSE:Factory/.trivy.new.3463 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trivy"
Thu Oct 29 14:52:19 2020 rev:3 rq:844854 version:0.12.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/trivy/trivy.changes 2020-10-21
14:40:26.785675270 +0200
+++ /work/SRC/openSUSE:Factory/.trivy.new.3463/trivy.changes 2020-10-29
14:52:24.525247230 +0100
@@ -1,0 +2,18 @@
+Wed Oct 28 12:47:30 UTC 2020 - Dirk Mueller <dmuel...@suse.com>
+
+- revert _service and build changes in last update to use
+ the proper macros
+- set VERSION parameter properly (jsc#CAPS-105)
+- remove update-end-of-life-dates.patch
+
+-------------------------------------------------------------------
+Thu Oct 22 14:20:24 UTC 2020 - Stefan Nica <sn...@suse.com>
+
+- Require golang >= 1.15 to fix EINTR read issues (jsc#CAPS-170)
+
+-------------------------------------------------------------------
+Thu Oct 22 13:16:40 UTC 2020 - Dirk Mueller <dmuel...@suse.com>
+
+- add update-end-of-life-dates.patch
+
+-------------------------------------------------------------------
New:
----
_servicedata
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trivy.spec ++++++
--- /var/tmp/diff_new_pack.ZNJVnw/_old 2020-10-29 14:52:26.181247791 +0100
+++ /var/tmp/diff_new_pack.ZNJVnw/_new 2020-10-29 14:52:26.185247792 +0100
@@ -16,6 +16,8 @@
#
# nodebuginfo
+
+%global goipath github.com/aquasecurity/trivy
Name: trivy
Version: 0.12.0
Release: 0
@@ -26,12 +28,9 @@
Source: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
BuildRequires: golang-packaging
-BuildRequires: golang(API) = 1.13
-
-# As specified in their documentation. The version of these packages doesn't
-# seem to matter too much.
-Requires: git-core
+BuildRequires: golang(API) >= 1.15
Requires: ca-certificates
+Requires: git-core
Requires: rpm
%{go_nostrip}
@@ -46,19 +45,18 @@
name of the container.
%prep
-%setup -q -a1
-
-# Even though this is a bit ugly because it falls outside of the scope of the
-# original intent of the `LDFLAGS` variable, it's useful to do it once just so
-# we don't have to patch both `build` and `install`.
-sed -i -e 's|LDFLAGS=|LDFLAGS=-buildmode=pie -mod vendor |g' Makefile
+%setup -qa1
+%autopatch -p1
%build
-make build VERSION=%{version}
+%goprep %{goipath}
+
+export CGO_ENABLED=0
+
+%gobuild -mod vendor -ldflags "-X=main.version=%{version}" cmd/trivy
%install
-make install VERSION=%{version}
-install -D -m 0755 ~/go/bin/%{name} "%{buildroot}/%{_bindir}/%{name}"
+%goinstall
%files
%license LICENSE
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ZNJVnw/_old 2020-10-29 14:52:26.221247805 +0100
+++ /var/tmp/diff_new_pack.ZNJVnw/_new 2020-10-29 14:52:26.221247805 +0100
@@ -2,8 +2,9 @@
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/aquasecurity/trivy</param>
<param name="scm">git</param>
- <param name="versionformat">0.12.0</param>
<param name="revision">v0.12.0</param>
+ <param name="versionformat">@PARENT_TAG@</param>
+ <param name="versionrewrite-pattern">v(.*)</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="disabled">
++++++ _servicedata ++++++
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/aquasecurity/trivy</param>
<param
name="changesrevision">49691ba85e9e0f94546b031b3a8b80b3ba949f0f</param></service></servicedata>++++++
vendor.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/vendor/modules.txt new/vendor/modules.txt
--- old/vendor/modules.txt 2020-10-20 15:34:13.612680399 +0200
+++ new/vendor/modules.txt 2020-10-28 13:42:50.490733400 +0100
@@ -9,6 +9,7 @@
github.com/GoogleCloudPlatform/docker-credential-gcr/util
github.com/GoogleCloudPlatform/docker-credential-gcr/util/cmd
# github.com/Masterminds/semver/v3 v3.1.0
+## explicit
github.com/Masterminds/semver/v3
# github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
github.com/Microsoft/go-winio
@@ -20,8 +21,10 @@
# github.com/VividCortex/ewma v1.1.1
github.com/VividCortex/ewma
# github.com/aquasecurity/bolt-fixtures v0.0.0-20200825112230-c0f517aea2ed
+## explicit
github.com/aquasecurity/bolt-fixtures
# github.com/aquasecurity/fanal v0.0.0-20200820074632-6de62ef86882
+## explicit
github.com/aquasecurity/fanal/analyzer
github.com/aquasecurity/fanal/analyzer/command/apk
github.com/aquasecurity/fanal/analyzer/library
@@ -58,6 +61,7 @@
github.com/aquasecurity/fanal/utils
github.com/aquasecurity/fanal/walker
# github.com/aquasecurity/go-dep-parser v0.0.0-20190819075924-ea223f0ef24b
+## explicit
github.com/aquasecurity/go-dep-parser/pkg/bundler
github.com/aquasecurity/go-dep-parser/pkg/cargo
github.com/aquasecurity/go-dep-parser/pkg/composer
@@ -67,6 +71,7 @@
github.com/aquasecurity/go-dep-parser/pkg/types
github.com/aquasecurity/go-dep-parser/pkg/yarn
# github.com/aquasecurity/trivy-db v0.0.0-20200826140828-6da6467703aa
+## explicit
github.com/aquasecurity/trivy-db/pkg/db
github.com/aquasecurity/trivy-db/pkg/types
github.com/aquasecurity/trivy-db/pkg/utils
@@ -138,10 +143,13 @@
# github.com/briandowns/spinner v0.0.0-20190319032542-ac46072a5a91
github.com/briandowns/spinner
# github.com/caarlos0/env/v6 v6.0.0
+## explicit
github.com/caarlos0/env/v6
# github.com/cenkalti/backoff v2.2.1+incompatible
+## explicit
github.com/cenkalti/backoff
# github.com/cheggaaa/pb/v3 v3.0.3
+## explicit
github.com/cheggaaa/pb/v3
github.com/cheggaaa/pb/v3/termutil
# github.com/containerd/containerd v1.3.3
@@ -166,6 +174,7 @@
github.com/docker/distribution/reference
github.com/docker/distribution/registry/api/errcode
# github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7
+## explicit
github.com/docker/docker/api
github.com/docker/docker/api/types
github.com/docker/docker/api/types/blkiodev
@@ -197,6 +206,7 @@
github.com/docker/docker-credential-helpers/client
github.com/docker/docker-credential-helpers/credentials
# github.com/docker/go-connections v0.4.0
+## explicit
github.com/docker/go-connections/nat
github.com/docker/go-connections/sockets
github.com/docker/go-connections/tlsconfig
@@ -287,6 +297,7 @@
# github.com/gogo/protobuf v1.3.1
github.com/gogo/protobuf/proto
# github.com/golang/protobuf v1.3.3
+## explicit
github.com/golang/protobuf/jsonpb
github.com/golang/protobuf/proto
github.com/golang/protobuf/ptypes
@@ -296,6 +307,7 @@
github.com/golang/protobuf/ptypes/struct
github.com/golang/protobuf/ptypes/timestamp
# github.com/google/go-containerregistry v0.0.0-20200331213917-3d03ed9b1ca2
+## explicit
github.com/google/go-containerregistry/pkg/authn
github.com/google/go-containerregistry/pkg/internal/retry
github.com/google/go-containerregistry/pkg/internal/retry/wait
@@ -310,10 +322,12 @@
github.com/google/go-containerregistry/pkg/v1/types
github.com/google/go-containerregistry/pkg/v1/v1util
# github.com/google/go-github/v28 v28.1.1
+## explicit
github.com/google/go-github/v28/github
# github.com/google/go-querystring v1.0.0
github.com/google/go-querystring/query
# github.com/google/wire v0.3.0
+## explicit
github.com/google/wire
# github.com/hashicorp/errwrap v1.0.0
github.com/hashicorp/errwrap
@@ -328,16 +342,20 @@
# github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd
github.com/kevinburke/ssh_config
# github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f
+## explicit
github.com/knqyf263/go-apk-version
# github.com/knqyf263/go-deb-version v0.0.0-20190517075300-09fca494f03d
+## explicit
github.com/knqyf263/go-deb-version
# github.com/knqyf263/go-rpm-version v0.0.0-20170716094938-74609b86c936
+## explicit
github.com/knqyf263/go-rpm-version
# github.com/knqyf263/nested v0.0.1
github.com/knqyf263/nested
# github.com/konsorten/go-windows-terminal-sequences v1.0.2
github.com/konsorten/go-windows-terminal-sequences
# github.com/kylelemons/godebug v1.1.0
+## explicit
github.com/kylelemons/godebug/diff
github.com/kylelemons/godebug/pretty
# github.com/mattn/go-colorable v0.1.7
@@ -349,8 +367,10 @@
# github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/go-homedir
# github.com/olekukonko/tablewriter v0.0.2-0.20190607075207-195002e6e56a
+## explicit
github.com/olekukonko/tablewriter
# github.com/open-policy-agent/opa v0.21.1
+## explicit
github.com/open-policy-agent/opa/ast
github.com/open-policy-agent/opa/ast/internal/scanner
github.com/open-policy-agent/opa/ast/internal/tokens
@@ -420,22 +440,27 @@
# github.com/sirupsen/logrus v1.5.0
github.com/sirupsen/logrus
# github.com/spf13/afero v1.2.2
+## explicit
github.com/spf13/afero
github.com/spf13/afero/mem
# github.com/stretchr/objx v0.3.0
github.com/stretchr/objx
# github.com/stretchr/testify v1.6.1
+## explicit
github.com/stretchr/testify/assert
github.com/stretchr/testify/mock
github.com/stretchr/testify/require
# github.com/testcontainers/testcontainers-go v0.3.1
+## explicit
github.com/testcontainers/testcontainers-go
github.com/testcontainers/testcontainers-go/wait
# github.com/twitchtv/twirp v5.10.1+incompatible
+## explicit
github.com/twitchtv/twirp
github.com/twitchtv/twirp/ctxsetters
github.com/twitchtv/twirp/internal/contextkeys
# github.com/urfave/cli/v2 v2.2.0
+## explicit
github.com/urfave/cli/v2
# github.com/xanzy/ssh-agent v0.2.1
github.com/xanzy/ssh-agent
@@ -444,12 +469,15 @@
# go.etcd.io/bbolt v1.3.5
go.etcd.io/bbolt
# go.uber.org/atomic v1.5.1
+## explicit
go.uber.org/atomic
# go.uber.org/multierr v1.4.0
+## explicit
go.uber.org/multierr
# go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee
go.uber.org/tools/update-license
# go.uber.org/zap v1.13.0
+## explicit
go.uber.org/zap
go.uber.org/zap/buffer
go.uber.org/zap/internal/bufferpool
@@ -486,6 +514,7 @@
golang.org/x/net/proxy
golang.org/x/net/publicsuffix
# golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+## explicit
golang.org/x/oauth2
golang.org/x/oauth2/google
golang.org/x/oauth2/internal
@@ -515,6 +544,7 @@
golang.org/x/tools/go/types/typeutil
golang.org/x/tools/internal/packagesinternal
# golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+## explicit
golang.org/x/xerrors
golang.org/x/xerrors/internal
# google.golang.org/appengine v1.5.0
@@ -572,6 +602,7 @@
honnef.co/go/tools/unused
honnef.co/go/tools/version
# k8s.io/utils v0.0.0-20191114184206-e782cd3c129f
+## explicit
k8s.io/utils/clock
k8s.io/utils/clock/testing
# moul.io/http2curl v1.0.0
