From bd0a6ee2a97e78af8491d09201d750f780932da4 Mon Sep 17 00:00:00 2001
From: Sarah Alsmiller <sarah.alsmiller@hashicorp.com>
Date: Wed, 18 Dec 2024 17:05:59 +0000
Subject: [PATCH] backport of commit b3e625765ae1efce7a4831479d7b0757612c597d

---
 .changelog/22011.txt       | 2 +-
 .release/security-scan.hcl | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/.changelog/22011.txt b/.changelog/22011.txt
index 572eb2f42bd8..cf4800dd088e 100644
--- a/.changelog/22011.txt
+++ b/.changelog/22011.txt
@@ -1,4 +1,4 @@
 ```release-note:security
-Update `registry.access.redhat.com/ubi9-minimal` image to 9.5 to address [CVE-2019-12900](https://nvd.nist.gov/vuln/detail/cve-2019-12900),[CVE-2024-3596](https://nvd.nist.gov/vuln/detail/CVE-2024-3596),[CVE-2024-2511](https://nvd.nist.gov/vuln/detail/CVE-2024-2511),[CVE-2024-26458](https://nvd.nist.gov/vuln/detail/CVE-2024-26458),[CVE-2024-4067](https://nvd.nist.gov/vuln/detail/CVE-2024-4067).
+Update `registry.access.redhat.com/ubi9-minimal` image to 9.5 to address [CVE-2024-3596](https://nvd.nist.gov/vuln/detail/CVE-2024-3596),[CVE-2024-2511](https://nvd.nist.gov/vuln/detail/CVE-2024-2511),[CVE-2024-26458](https://nvd.nist.gov/vuln/detail/CVE-2024-26458).
 ```
 
diff --git a/.release/security-scan.hcl b/.release/security-scan.hcl
index d18ea456070e..48325fbbd24f 100644
--- a/.release/security-scan.hcl
+++ b/.release/security-scan.hcl
@@ -37,6 +37,8 @@ container {
 	triage {
 		suppress {
 			vulnerabilities = [
+				"CVE-2024-4067", # libsolv@0:0.7.24-3.el9
+				"CVE-2019-12900" # bzip2-libs@0:1.0.8-8.el9
 			]
 			paths = [
 				"internal/tools/proto-gen-rpc-glue/e2e/consul/*",