Accepting request 1099718 from devel:Factory:git-workflow:staging:dirkmueller:trivy:4

Update to 0.43.1



(🤖: Submission of trivy via pool/trivy#4 by dirkmueller)

OBS-URL: https://build.opensuse.org/request/show/1099718
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy?expand=0&rev=56

_scmsync.obsinfo

@@ -1,4 +1,4 @@
-mtime: 1688392392
-commit: de36092857fcbc957d70878ac2820425c07d1752
+mtime: 1689851983
+commit: 6fda4ae520211599a57cefcb305a98c83f616b89
 url: https://src.opensuse.org/dirkmueller/trivy.git
-revision: de36092857fcbc957d70878ac2820425c07d1752
+revision: 6fda4ae520211599a57cefcb305a98c83f616b89

_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.43.0</param>
+    <param name="revision">v0.43.1</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>

_servicedata

@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/aquasecurity/trivy</param>
-              <param name="changesrevision">600819248ded6688801f6e92a9a49e9fa97b654b</param></service></servicedata>
+              <param name="changesrevision">5d76abadc92f7a3d85da6769dd794d7ece8941cf</param></service></servicedata>

eol-dates.patch

@@ -1,22 +0,0 @@
-From 08770a6dfefcd1ad3c11abd395cef1af7c4a14a3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Dirk=20M=C3=BCller?= <dirk@dmllr.de>
-Date: Fri, 30 Jun 2023 16:48:52 +0200
-Subject: [PATCH] fix(suse): Add openSUSE Leap 15.5 eol date as well
-
-Taken directly from https://en.opensuse.org/Lifetime
----
- pkg/detector/ospkg/suse/suse.go | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pkg/detector/ospkg/suse/suse.go b/pkg/detector/ospkg/suse/suse.go
-index 11a4d70c5a8..cbf0c4fd991 100644
---- a/pkg/detector/ospkg/suse/suse.go
-+++ b/pkg/detector/ospkg/suse/suse.go
-@@ -55,6 +55,7 @@ var (
- 		"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),
- 		"15.4": time.Date(2023, 11, 30, 23, 59, 59, 0, time.UTC),
-+		"15.5": time.Date(2024, 12, 31, 23, 59, 59, 0, time.UTC),
- 	}
- )
- 

trivy.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Jul 13 08:47:12 UTC 2023 - dmueller@suse.com
+
+- Update to version 0.43.1:
+  * chore(deps): Update defsec to v0.90.3 (#4793)
+  * chore(deps): bump google.golang.org/protobuf from 1.30.0 to 1.31.0 (#4752)
+  * chore(deps): bump alpine from 3.18.0 to 3.18.2 (#4748)
+  * chore(deps): bump github.com/alicebob/miniredis/v2 from 2.30.3 to 2.30.4 (#4758)
+  * docs(image): fix the comment on the soft/hard link (#4740)
+  * check Type when filling pkgs in vulns (#4776)
+  * feat: add support of linux/ppc64le and linux/s390x architectures for Install.sh script (#4770)
+  * chore(deps): bump modernc.org/sqlite from 1.20.3 to 1.23.1 (#4756)
+  * fix(rocky): add architectures support for advisories (#4691)
+  * chore(deps): bump github.com/opencontainers/image-spec (#4751)
+  * chore(deps): bump github.com/package-url/packageurl-go (#4754)
+  * chore(deps): bump golang.org/x/sync from 0.2.0 to 0.3.0 (#4750)
+  * chore(deps): bump github.com/tetratelabs/wazero from 1.2.0 to 1.2.1 (#4755)
+  * chore(deps): bump github.com/testcontainers/testcontainers-go (#4759)
+  * fix: documentation about reseting trivy image (#4733)
+  * fix(suse): Add openSUSE Leap 15.5 eol date as well (#4744)
+  * fix: update Amazon Linux 1 EOL (#4761)
+- drop eol-dates.patch (all upstream)
+
 -------------------------------------------------------------------
 Mon Jul 03 13:22:20 UTC 2023 - dmueller@suse.com
 

trivy.spec

@@ -17,7 +17,7 @@
 
 
 Name:           trivy
-Version:        0.43.0
+Version:        0.43.1
 Release:        0
 Summary:        A Simple and Comprehensive Vulnerability Scanner for Containers
 License:        Apache-2.0
@@ -25,7 +25,6 @@ Group:          System/Management
 URL:            https://github.com/aquasecurity/trivy
 Source:         %{name}-%{version}.tar.zst
 Source1:        vendor.tar.zst
-Patch1:         eol-dates.patch
 BuildRequires:  golang-packaging
 BuildRequires:  zstd
 BuildRequires:  golang(API) = 1.19