[PR PATCH] grype: update to 0.68.1

[PR PATCH] grype: update to 0.68.1

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 378 bytes --]

There is a new pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages grype
https://github.com/void-linux/void-packages/pull/46116

grype: update to 0.68.1
#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/46116.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grype-46116.patch --]
[-- Type: text/x-diff, Size: 1958 bytes --]

From b912bd78981325957674e280bf550367520a4c54 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Mon, 18 Sep 2023 13:40:18 -0400
Subject: [PATCH] grype: update to 0.68.1

---
 srcpkgs/grype/patches/fix-go-version.patch | 13 +++++++++++++
 srcpkgs/grype/template                     |  6 ++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/grype/patches/fix-go-version.patch

diff --git a/srcpkgs/grype/patches/fix-go-version.patch b/srcpkgs/grype/patches/fix-go-version.patch
new file mode 100644
index 0000000000000..746a67a0a6b22
--- /dev/null
+++ b/srcpkgs/grype/patches/fix-go-version.patch
@@ -0,0 +1,13 @@
+# Requirement for v1.21.1 has nothing to do with program capabilities, see https://github.com/anchore/grype/pull/1484
+diff --git a/go.mod b/go.mod
+index 3d72c07fa9..efdc329286 100644
+--- a/go.mod
++++ b/go.mod
+@@ -1,6 +1,6 @@
+ module github.com/anchore/grype
+ 
+-go 1.21.1
++go 1.21.0
+ 
+ require (
+ 	github.com/CycloneDX/cyclonedx-go v0.7.1
diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index e5af3b550f65c..89d5a909b69b7 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,19 +1,17 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.66.0
+version=0.68.1
 revision=1
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"
 go_package="github.com/anchore/grype/cmd/grype"
-hostmakedepends="go1.20"
 short_desc="Vulnerability scanner for container images and filesystems"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=b0e38671975c0871f1b9a7bacba376f90ecb429973cb4b5b9cf90a3f4e072304
-export GOTOOLCHAIN=go1.20
+checksum=cd8bc7eadd8ab4a9ff872dc30142e8451f0580380f292360d020cea3f9d51309
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

Re: [PR PATCH] [Updated] grype: update to 0.68.1

[cinerea0]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

There is an updated pull request by cinerea0 against master on the void-packages repository

https://github.com/cinerea0/void-packages grype
https://github.com/void-linux/void-packages/pull/46116

grype: update to 0.68.1
#### Testing the changes
- I tested the changes in this PR: **YES**


A patch file from https://github.com/void-linux/void-packages/pull/46116.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-grype-46116.patch --]
[-- Type: text/x-diff, Size: 1958 bytes --]

From 2a6faf012ebd0ed91e03065c162fe96d7d5896c9 Mon Sep 17 00:00:00 2001
From: cinerea0 <cinerea0@disroot.org>
Date: Thu, 21 Sep 2023 12:47:38 -0400
Subject: [PATCH] grype: update to 0.69.0

---
 srcpkgs/grype/patches/fix-go-version.patch | 13 +++++++++++++
 srcpkgs/grype/template                     |  6 ++----
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 srcpkgs/grype/patches/fix-go-version.patch

diff --git a/srcpkgs/grype/patches/fix-go-version.patch b/srcpkgs/grype/patches/fix-go-version.patch
new file mode 100644
index 0000000000000..746a67a0a6b22
--- /dev/null
+++ b/srcpkgs/grype/patches/fix-go-version.patch
@@ -0,0 +1,13 @@
+# Requirement for v1.21.1 has nothing to do with program capabilities, see https://github.com/anchore/grype/pull/1484
+diff --git a/go.mod b/go.mod
+index 3d72c07fa9..efdc329286 100644
+--- a/go.mod
++++ b/go.mod
+@@ -1,6 +1,6 @@
+ module github.com/anchore/grype
+ 
+-go 1.21.1
++go 1.21.0
+ 
+ require (
+ 	github.com/CycloneDX/cyclonedx-go v0.7.1
diff --git a/srcpkgs/grype/template b/srcpkgs/grype/template
index e5af3b550f65c..d40afcc7f1c09 100644
--- a/srcpkgs/grype/template
+++ b/srcpkgs/grype/template
@@ -1,19 +1,17 @@
 # Template file for 'grype'
 pkgname=grype
-version=0.66.0
+version=0.69.0
 revision=1
 build_style=go
 build_helper=qemu
 go_import_path="github.com/anchore/grype"
 go_package="github.com/anchore/grype/cmd/grype"
-hostmakedepends="go1.20"
 short_desc="Vulnerability scanner for container images and filesystems"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="Apache-2.0"
 homepage="https://github.com/anchore/grype"
 distfiles="https://github.com/anchore/grype/archive/refs/tags/v${version}.tar.gz"
-checksum=b0e38671975c0871f1b9a7bacba376f90ecb429973cb4b5b9cf90a3f4e072304
-export GOTOOLCHAIN=go1.20
+checksum=d20e1fb2fdc28af123ce197ceef3ac9dd99327f3a298e7e3e2eb1dd5dd7b43a3
 
 post_install() {
 	grype="${DESTDIR}/usr/bin/grype"

Re: [PR PATCH] [Merged]: grype: update to 0.69.0

[Duncaen]

[-- Attachment #1: Type: text/plain, Size: 227 bytes --]

There's a merged pull request on the void-packages repository

grype: update to 0.69.0
https://github.com/void-linux/void-packages/pull/46116

Description:
#### Testing the changes
- I tested the changes in this PR: **YES**