dirkmueller/trivy
SHA256
1
0
Fork 0
forked from pool/trivy
Code Pull Requests Activity

Accepting request 900585 from devel:kubic

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/900585
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy?expand=0&rev=9
This commit is contained in:
Dominique Leuenberger 2021-06-19 21:02:56 +00:00 committed by Git OBS Bridge
parent 451a3e6950
commit cb2b277dbf
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-suse-mark-sle-15.3-as-maintained-add-opensuse-15.3.patch Normal file
View File

@ -0,0 +1,42 @@
From 4a321591fb95f317dc90dfda9a7815a6902a9ed6 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Thu, 10 Jun 2021 14:41:09 +0200
Subject: [PATCH] suse: mark sle 15.3 as maintained, add opensuse 15.3
SLE 15.3 is about to be released and will be maintained until
6 months after 15.4. this allows us to guess the 15 SP2 EOL date,
so updating that as well.
---
pkg/detector/ospkg/suse/suse.go | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/pkg/detector/ospkg/suse/suse.go b/pkg/detector/ospkg/suse/suse.go
index 6216840..2cba114 100644
--- a/pkg/detector/ospkg/suse/suse.go
+++ b/pkg/detector/ospkg/suse/suse.go
@@ -38,10 +38,11 @@ var (
"12.5": time.Date(2024, 10, 31, 23, 59, 59, 0, time.UTC),
"15": time.Date(2019, 12, 31, 23, 59, 59, 0, time.UTC),
"15.1": time.Date(2021, 1, 31, 23, 59, 59, 0, time.UTC),
- // 6 months after SLES 15 SP3 release
- "15.2": time.Date(2021, 10, 31, 23, 59, 59, 0, time.UTC),
+ "15.2": time.Date(2021, 12, 31, 23, 59, 59, 0, time.UTC),
// 6 months after SLES 15 SP4 release
- // "15.3": time.Date(2028, 7, 31, 23, 59, 59, 0, time.UTC),
+ "15.3": time.Date(2028, 7, 31, 23, 59, 59, 0, time.UTC),
+ // 6 months after SLES 15 SP5 release
+ // "15.4": time.Date(2028, 7, 31, 23, 59, 59, 0, time.UTC),
}
opensuseEolDates = map[string]time.Time{
@@ -52,6 +53,7 @@ var (
"15.0": time.Date(2019, 12, 3, 23, 59, 59, 0, time.UTC),
"15.1": time.Date(2020, 11, 30, 23, 59, 59, 0, time.UTC),
"15.2": time.Date(2021, 11, 30, 23, 59, 59, 0, time.UTC),
+ "15.3": time.Date(2022, 11, 30, 23, 59, 59, 0, time.UTC),
}
)
--
2.31.1

10
trivy.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Thu Jun 10 12:46:10 UTC 2021 - Dirk Müller <dmueller@suse.com>
- add 0001-suse-mark-sle-15.3-as-maintained-add-opensuse-15.3.patch
-------------------------------------------------------------------
Thu Jun 10 08:31:11 UTC 2021 - Dirk Müller <dmueller@suse.com>
- strip binaries
-------------------------------------------------------------------
Mon Jun 07 19:14:07 UTC 2021 - dmueller@suse.com

2
trivy.spec
View File

@ -27,12 +27,12 @@ Group: System/Management
URL: https://github.com/aquasecurity/trivy
Source: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
Patch0: 0001-suse-mark-sle-15.3-as-maintained-add-opensuse-15.3.patch
BuildRequires: golang-packaging
BuildRequires: golang(API) >= 1.16
Requires: ca-certificates
Requires: git-core
Requires: rpm
%{go_nostrip}
%description
Trivy (`tri` pronounced like trigger, `vy` pronounced like envy) is a simple and