From 3d611306a8a655eb0bf2502daebe083f63dd450f352938caaa89ab6a47fc5a8b Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 19 Apr 2022 07:58:28 +0000
Subject: [PATCH] Accepting request 970622 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/970622
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/trivy?expand=0&rev=22
---
 _service            |  2 +-
 _servicedata        |  2 +-
 trivy-0.25.3.tar.gz |  3 ---
 trivy-0.26.0.tar.gz |  3 +++
 trivy.changes       | 29 +++++++++++++++++++++++++++++
 trivy.spec          |  2 +-
 vendor.tar.gz       |  4 ++--
 7 files changed, 37 insertions(+), 8 deletions(-)
 delete mode 100644 trivy-0.25.3.tar.gz
 create mode 100644 trivy-0.26.0.tar.gz

diff --git a/_service b/_service
index 3513a2a..5410c4e 100644
--- a/_service
+++ b/_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.25.3</param>
+    <param name="revision">v0.26.0</param>
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="changesgenerate">enable</param>
diff --git a/_servicedata b/_servicedata
index 8664109..ccbf9f9 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/aquasecurity/trivy</param>
-              <param name="changesrevision">d4e3df81e856ac682cb9adec2ea8d1011262775f</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">a0047a7983b4b598f27706391cd6f89a63450653</param></service></servicedata>
\ No newline at end of file
diff --git a/trivy-0.25.3.tar.gz b/trivy-0.25.3.tar.gz
deleted file mode 100644
index 69d5858..0000000
--- a/trivy-0.25.3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f1d7c8dd13a5d862ad1c8d5d1cb29e88fab90e2e049dc3dadd3997986cad1969
-size 6624795
diff --git a/trivy-0.26.0.tar.gz b/trivy-0.26.0.tar.gz
new file mode 100644
index 0000000..eac9099
--- /dev/null
+++ b/trivy-0.26.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cf6384037898f649bb2b262b1c268c1aaf78116fb71b23be334cb88209f8727d
+size 6681194
diff --git a/trivy.changes b/trivy.changes
index 82444d8..9f3386c 100644
--- a/trivy.changes
+++ b/trivy.changes
@@ -1,3 +1,32 @@
+-------------------------------------------------------------------
+Sat Apr 16 09:04:55 UTC 2022 - kastl@b1-systems.de
+
+- Update to version 0.26.0:
+  * feat(alpine): warn mixing versions (#2000)
+  * Update ASFF template (#1914)
+  * chore(deps): replace `containerd/containerd` version to fix CVE-2022-23648 (#1994)
+  * chore(deps): bump alpine from 3.15.3 to 3.15.4 (#1993)
+  * test(go): add integration tests for gomod (#1989)
+  * fix(python): fixed panic when scan .egg archive (#1992)
+  * fix(go): set correct go modules type (#1990)
+  * feat(alpine): support apk repositories (#1987)
+  * docs: add CBL-Mariner (#1982)
+  * docs(go): fix version (#1986)
+  * feat(go): support go.mod in Go 1.17+ (#1985)
+  * ci: fix URLs in the PR template (#1972)
+  * ci: add semantic pull requests check (#1968)
+  * docs(issue): added docs for wrong detection issues (#1961)
+
+-------------------------------------------------------------------
+Thu Apr 14 20:12:09 UTC 2022 - kastl@b1-systems.de
+
+- Update to version 0.25.4:
+  * docs: move CONTRIBUTING.md to docs (#1971)
+  * refactor(table): use file name instead package path (#1966)
+  * fix(sbom): add --db-repository (#1964)
+  * feat(table): add PkgPath in table result (#1960)
+  * fix(pom): merge multiple pom imports in a good manner (#1959)
+
 -------------------------------------------------------------------
 Wed Apr 06 07:35:16 UTC 2022 - kastl@b1-systems.de
 
diff --git a/trivy.spec b/trivy.spec
index e92f8e6..a9e8a83 100644
--- a/trivy.spec
+++ b/trivy.spec
@@ -19,7 +19,7 @@
 
 %global goipath github.com/aquasecurity/trivy
 Name:           trivy
-Version:        0.25.3
+Version:        0.26.0
 Release:        0
 Summary:        A Simple and Comprehensive Vulnerability Scanner for Containers
 License:        Apache-2.0
diff --git a/vendor.tar.gz b/vendor.tar.gz
index 5cee906..f471cc4 100644
--- a/vendor.tar.gz
+++ b/vendor.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4f5483a218c97212aab076652e6a83d2a0b5b2988ceb641633820094cb0055ca
-size 34391279
+oid sha256:371a19f600d8cfdbb1e955455ee5ea36ab3e6baf99fd38a85176dbf63fffcdc3
+size 34432145