Accepting request 851108 from devel:kubic
- Update to version 0.13.0: * fix(oracle): handle ksplice advisories (#745) * fix: version comparison (#740) * updated Readme.md (#737) * Add suse sles 15.2 to the EOL list as well (#734) * Update README.md (#731) * Warn when a user attempts to use trivy without a detectable lockfile (#729) * Add back support for FreeBSD & OpenBSD (#728) * Add support for ppc64le architecture (#724) * Skip packages from unsupported repository (remi) (#695) * Skip downloading DB if a remote DB is not updated (#717) * Sunsetting VendorVectors (#718) * Add GitHub Container Registry to README (#712) * update BUG_REPORT.md using H2 instead of bold formatting (#714) * fix(ci/deb): do not remove old packages for EOL versions (#706) * Add linter check support (#679) * Optimize images (#696) * Update triage.md (#701) - remove 0001-Add-suse-sles-15.2-to-the-EOL-list-as-well.patch (merged) OBS-URL: https://build.opensuse.org/request/show/851108 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy?expand=0&rev=5
This commit is contained in:
parent
f3759f81b0
commit
3d74fa160e
@ -1,36 +0,0 @@
|
||||
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
|
||||
|
2
_service
2
_service
@ -2,7 +2,7 @@
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="url">https://github.com/aquasecurity/trivy</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="revision">v0.12.0</param>
|
||||
<param name="revision">v0.13.0</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="versionrewrite-pattern">v(.*)</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
|
@ -1,4 +1,4 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/aquasecurity/trivy</param>
|
||||
<param name="changesrevision">49691ba85e9e0f94546b031b3a8b80b3ba949f0f</param></service></servicedata>
|
||||
<param name="changesrevision">1391b3bf47d99aec25f2cfa04064fe1c2aeafcad</param></service></servicedata>
|
BIN
trivy-0.12.0.tar.gz
(Stored with Git LFS)
BIN
trivy-0.12.0.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
trivy-0.13.0.tar.gz
(Stored with Git LFS)
Normal file
BIN
trivy-0.13.0.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,26 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 26 15:23:00 UTC 2020 - dmueller@suse.com
|
||||
|
||||
- Update to version 0.13.0:
|
||||
* fix(oracle): handle ksplice advisories (#745)
|
||||
* fix: version comparison (#740)
|
||||
* updated Readme.md (#737)
|
||||
* Add suse sles 15.2 to the EOL list as well (#734)
|
||||
* Update README.md (#731)
|
||||
* Warn when a user attempts to use trivy without a detectable lockfile (#729)
|
||||
* Add back support for FreeBSD & OpenBSD (#728)
|
||||
* Add support for ppc64le architecture (#724)
|
||||
* Skip packages from unsupported repository (remi) (#695)
|
||||
* Skip downloading DB if a remote DB is not updated (#717)
|
||||
* Sunsetting VendorVectors (#718)
|
||||
* Add GitHub Container Registry to README (#712)
|
||||
* update BUG_REPORT.md using H2 instead of bold formatting (#714)
|
||||
* fix(ci/deb): do not remove old packages for EOL versions (#706)
|
||||
* Add linter check support (#679)
|
||||
* Optimize images (#696)
|
||||
* Update triage.md (#701)
|
||||
- remove 0001-Add-suse-sles-15.2-to-the-EOL-list-as-well.patch (merged)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 30 14:52:37 UTC 2020 - Dirk Mueller <dmueller@suse.com>
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
|
||||
%global goipath github.com/aquasecurity/trivy
|
||||
Name: trivy
|
||||
Version: 0.12.0
|
||||
Version: 0.13.0
|
||||
Release: 0
|
||||
Summary: A Simple and Comprehensive Vulnerability Scanner for Containers
|
||||
License: Apache-2.0
|
||||
@ -27,7 +27,6 @@ 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
|
||||
|
BIN
vendor.tar.gz
(Stored with Git LFS)
BIN
vendor.tar.gz
(Stored with Git LFS)
Binary file not shown.
Loading…
Reference in New Issue
Block a user