Try with upstream PR

aquasecurity/trivy#5339
aminvakil · Oct 5, 2023 · b27df56 · b27df56
1 parent 71b9aa9
commit b27df56
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/trivy-git/.SRCINFO b/trivy-git/.SRCINFO
@@ -14,7 +14,8 @@ pkgbase = trivy-git
 	provides = trivy
 	conflicts = trivy
 	source = git+https://github.com/aquasecurity/trivy.git
+	source = https://github.com/aquasecurity/trivy/pull/5339.patch
 	sha256sums = SKIP
+	sha256sums = 61ceb690273f4a49ce350b2aacccf745701d10690e81dd125ca5d326ba01c2d8
 
 pkgname = trivy-git
-
diff --git a/trivy-git/PKGBUILD b/trivy-git/PKGBUILD
@@ -14,8 +14,9 @@ optdepends=("rpm: RHEL/CentOS based image support")
 makedepends=("go" "btrfs-progs" "git")
 provides=('trivy')
 conflicts=('trivy')
-source=("git+${url}.git")
-sha256sums=('SKIP')
+source=("git+${url}.git"
+"https://github.com/aquasecurity/trivy/pull/5339.patch")
+sha256sums=('SKIP' '61ceb690273f4a49ce350b2aacccf745701d10690e81dd125ca5d326ba01c2d8')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -24,6 +25,11 @@ pkgver() {
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+  patch --forward --strip=1 --input=../../5339.patch
+}
+
 build() {
   cd "${srcdir}/${_pkgname}/cmd/trivy"
   export CGO_CPPFLAGS="${CPPFLAGS}"