From 901d7de560e8f2b6ba5c20c0cb7a1a696e373854ba51fc071887b573bf63e24f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 13 Jul 2023 09:18:42 +0000 Subject: [PATCH 1/3] [info=46b4e36452c73989d1e9f6536ae754cc7a61d32e] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:dirkmueller:trivy:4/trivy?expand=0&rev=1 --- _scmsync.obsinfo | 6 +++--- _service | 2 +- _servicedata | 2 +- trivy.changes | 22 ++++++++++++++++++++++ trivy.spec | 2 +- vendor.tar.zst | 4 ++-- 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index f2af9f7..cf08a06 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1688392392 -commit: de36092857fcbc957d70878ac2820425c07d1752 +mtime: 1689238221 +commit: 46b4e36452c73989d1e9f6536ae754cc7a61d32e url: https://src.opensuse.org/dirkmueller/trivy.git -revision: de36092857fcbc957d70878ac2820425c07d1752 +revision: 46b4e36452c73989d1e9f6536ae754cc7a61d32e diff --git a/_service b/_service index cfbe6d7..77afdfa 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ https://github.com/aquasecurity/trivy git - v0.43.0 + v0.43.1 @PARENT_TAG@ v(.*) enable diff --git a/_servicedata b/_servicedata index 7d7b8fc..722317c 100644 --- a/_servicedata +++ b/_servicedata @@ -1,4 +1,4 @@ https://github.com/aquasecurity/trivy - 600819248ded6688801f6e92a9a49e9fa97b654b \ No newline at end of file + 5d76abadc92f7a3d85da6769dd794d7ece8941cf \ No newline at end of file diff --git a/trivy.changes b/trivy.changes index b12c3df..54864c3 100644 --- a/trivy.changes +++ b/trivy.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +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) + ------------------------------------------------------------------- Mon Jul 03 13:22:20 UTC 2023 - dmueller@suse.com diff --git a/trivy.spec b/trivy.spec index e738eab..03fc892 100644 --- a/trivy.spec +++ b/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 diff --git a/vendor.tar.zst b/vendor.tar.zst index 9f1c28b..13de250 100644 --- a/vendor.tar.zst +++ b/vendor.tar.zst @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bba3bd992fe7a1f8caefdc071b46a8bcc3d8fd90f55d3a396cd112dd0c385f05 -size 18961663 +oid sha256:4a0f18bfa0a16bb632d09de66d19a28d11cb01298277d87297dcdc56d069a156 +size 19287038 From 94f89a0b8c0b39c4f388970847aff0ee0e32db354b850eb63a0691a9aad452bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 20 Jul 2023 10:38:52 +0000 Subject: [PATCH 2/3] [info=dffe82d98424aa573d09cebce1464cef636da228] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:dirkmueller:trivy:4/trivy?expand=0&rev=2 --- _scmsync.obsinfo | 6 +++--- trivy-0.43.0.tar.zst | 3 --- trivy-0.43.1.tar.zst | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 trivy-0.43.0.tar.zst create mode 100644 trivy-0.43.1.tar.zst diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index cf08a06..ebefd8f 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1689238221 -commit: 46b4e36452c73989d1e9f6536ae754cc7a61d32e +mtime: 1689849496 +commit: dffe82d98424aa573d09cebce1464cef636da228 url: https://src.opensuse.org/dirkmueller/trivy.git -revision: 46b4e36452c73989d1e9f6536ae754cc7a61d32e +revision: dffe82d98424aa573d09cebce1464cef636da228 diff --git a/trivy-0.43.0.tar.zst b/trivy-0.43.0.tar.zst deleted file mode 100644 index b39ab79..0000000 --- a/trivy-0.43.0.tar.zst +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6a204fd5b03c1c5153bcf464abebad58ec127d57b3ebe7f1f52bdd06a0627c5c -size 43439018 diff --git a/trivy-0.43.1.tar.zst b/trivy-0.43.1.tar.zst new file mode 100644 index 0000000..b2021bb --- /dev/null +++ b/trivy-0.43.1.tar.zst @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba1dbd6efd7859bd02b3e97b3b00f092b7c11a3cd93b4beb0a7c68e1047a8a98 +size 43438032 From b25074f6e0763d46951e174747086c31c702df87b1ca7e6e501b379fd90407f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Thu, 20 Jul 2023 11:20:15 +0000 Subject: [PATCH 3/3] [info=6fda4ae520211599a57cefcb305a98c83f616b89] OBS-URL: https://build.opensuse.org/package/show/devel:Factory:git-workflow:staging:dirkmueller:trivy:4/trivy?expand=0&rev=3 --- _scmsync.obsinfo | 6 +++--- eol-dates.patch | 22 ---------------------- trivy.changes | 1 + trivy.spec | 1 - 4 files changed, 4 insertions(+), 26 deletions(-) delete mode 100644 eol-dates.patch diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index ebefd8f..581796c 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1689849496 -commit: dffe82d98424aa573d09cebce1464cef636da228 +mtime: 1689851983 +commit: 6fda4ae520211599a57cefcb305a98c83f616b89 url: https://src.opensuse.org/dirkmueller/trivy.git -revision: dffe82d98424aa573d09cebce1464cef636da228 +revision: 6fda4ae520211599a57cefcb305a98c83f616b89 diff --git a/eol-dates.patch b/eol-dates.patch deleted file mode 100644 index 824b5de..0000000 --- a/eol-dates.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 08770a6dfefcd1ad3c11abd395cef1af7c4a14a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dirk=20M=C3=BCller?= -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), - } - ) - diff --git a/trivy.changes b/trivy.changes index 54864c3..05d04a7 100644 --- a/trivy.changes +++ b/trivy.changes @@ -19,6 +19,7 @@ Thu Jul 13 08:47:12 UTC 2023 - dmueller@suse.com * 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 diff --git a/trivy.spec b/trivy.spec index 03fc892..20aa50b 100644 --- a/trivy.spec +++ b/trivy.spec @@ -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