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

Accepting request 846494 from devel:kubic

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/846494
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy?expand=0&rev=4
This commit is contained in:
Dominique Leuenberger 2020-11-06 22:45:37 +00:00 committed by Git OBS Bridge
parent 584b539d07
commit f3759f81b0
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
0001-Add-suse-sles-15.2-to-the-EOL-list-as-well.patch Normal file
View File

@ -0,0 +1,36 @@
From 80efb57cace38e4002b4020a786f988d9e03630d Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Fri, 30 Oct 2020 15:46:27 +0100
Subject: [PATCH] Add suse sles 15.2 to the EOL list as well
without that you get this arning:
WARN This OS version is not on the EOL list: suse linux enterprise server 15.2
which is actually misleading because 15.2 is the most current release,
we just don't know when it ends. we can however assume that it runs
for at least another year.
Signed-off-by: Dirk Mueller <dirk@dmllr.de>
Signed-off-by: Dirk Mueller <dmueller@suse.com>
---
pkg/detector/ospkg/suse/suse.go | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/pkg/detector/ospkg/suse/suse.go b/pkg/detector/ospkg/suse/suse.go
index 114eb40..6216840 100644
--- a/pkg/detector/ospkg/suse/suse.go
+++ b/pkg/detector/ospkg/suse/suse.go
@@ -39,7 +39,9 @@ var (
"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(2028, 7, 31, 23, 59, 59, 0, time.UTC),
+ "15.2": time.Date(2021, 10, 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),
}
opensuseEolDates = map[string]time.Time{
--
2.29.0

5
trivy.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Oct 30 14:52:37 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- add 0001-Add-suse-sles-15.2-to-the-EOL-list-as-well.patch
-------------------------------------------------------------------
Wed Oct 28 12:47:30 UTC 2020 - Dirk Mueller <dmueller@suse.com>

1
trivy.spec
View File

@ -27,6 +27,7 @@ Group: System/Management
URL: https://github.com/aquasecurity/trivy
Source: %{name}-%{version}.tar.gz
Source1: vendor.tar.gz
Patch1: 0001-Add-suse-sles-15.2-to-the-EOL-list-as-well.patch
BuildRequires: golang-packaging
BuildRequires: golang(API) >= 1.15
Requires: ca-certificates