From 584b539d0721075134cd97e7ac9e262b856b7b1338f0f34b0cd0bdd40cefbfd7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 29 Oct 2020 13:52:19 +0000 Subject: [PATCH] Accepting request 844854 from devel:kubic - 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 - Require golang >= 1.15 to fix EINTR read issues (jsc#CAPS-170) - add update-end-of-life-dates.patch OBS-URL: https://build.opensuse.org/request/show/844854 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy?expand=0&rev=3 --- _service | 3 ++- _servicedata | 4 ++++ trivy.changes | 18 ++++++++++++++++++ trivy.spec | 26 ++++++++++++-------------- vendor.tar.gz | 4 ++-- 5 files changed, 38 insertions(+), 17 deletions(-) create mode 100644 _servicedata diff --git a/_service b/_service index e8db0c5..b1fdd54 100644 --- a/_service +++ b/_service @@ -2,8 +2,9 @@ https://github.com/aquasecurity/trivy git - 0.12.0 v0.12.0 + @PARENT_TAG@ + v(.*) enable diff --git a/_servicedata b/_servicedata new file mode 100644 index 0000000..79639e4 --- /dev/null +++ b/_servicedata @@ -0,0 +1,4 @@ + + + https://github.com/aquasecurity/trivy + 49691ba85e9e0f94546b031b3a8b80b3ba949f0f \ No newline at end of file diff --git a/trivy.changes b/trivy.changes index cf51c12..24412b8 100644 --- a/trivy.changes +++ b/trivy.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Oct 28 12:47:30 UTC 2020 - Dirk Mueller + +- 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 + +- Require golang >= 1.15 to fix EINTR read issues (jsc#CAPS-170) + +------------------------------------------------------------------- +Thu Oct 22 13:16:40 UTC 2020 - Dirk Mueller + +- add update-end-of-life-dates.patch + ------------------------------------------------------------------- Tue Oct 20 13:13:39 UTC 2020 - msabate@suse.com diff --git a/trivy.spec b/trivy.spec index a37d7b8..902dae3 100644 --- a/trivy.spec +++ b/trivy.spec @@ -16,6 +16,8 @@ # # nodebuginfo + +%global goipath github.com/aquasecurity/trivy Name: trivy Version: 0.12.0 Release: 0 @@ -26,12 +28,9 @@ URL: https://github.com/aquasecurity/trivy 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 @@ scan. All you need to do for scanning is to specify a target such as an image 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 diff --git a/vendor.tar.gz b/vendor.tar.gz index 209e516..f497842 100644 --- a/vendor.tar.gz +++ b/vendor.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9314f5fd015bc69d128430a7350c310cc3c1d69c5db8061332cf1aa84c0a3ad7 -size 5323198 +oid sha256:56fc71936452023e8561d710c1cf507874fcd62cb0cce6f674997059e62c2b02 +size 4965121