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] [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