From 60b40b9313f9067f807adf8741669c5cd4cc9be4 Mon Sep 17 00:00:00 2001
From: David Shea <dshea@redhat.com>
Date: Mon, 21 Oct 2024 12:57:52 -0400
Subject: [PATCH] [release-1.29] Bump to 1.26.8

Signed-off-by: David Shea <dshea@redhat.com>
---
 CHANGELOG.md             | 4 ++++
 changelog.txt            | 3 +++
 contrib/rpm/buildah.spec | 5 ++++-
 define/types.go          | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 125d3e7af46..74652872a14 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 # Changelog
 
+## v1.26.8 (2024-10-21)
+
+    Properly validate cache IDs and sources
+
 ## v1.26.7 (2024-04-01)
 
     [release-1.26] conformance tests: don't break on trailing zeroes
diff --git a/changelog.txt b/changelog.txt
index 18b0a8f7581..7b499cfe796 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,6 @@
+- Changelog for v1.26.8 (2024-10-21)
+  * Properly validate cache IDs and sources
+
 - Changelog for v1.26.7 (2024-04-01)
   * [release-1.26] conformance tests: don't break on trailing zeroes
   * [release-1.26] CVE-2024-1753 container escape fix
diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec
index 7f66afc5b65..7a81ff72627 100644
--- a/contrib/rpm/buildah.spec
+++ b/contrib/rpm/buildah.spec
@@ -26,7 +26,7 @@
 
 Name:           buildah
 # Bump version in define/types.go too
-Version:        1.26.7
+Version:        1.26.8
 Release:        1.git%{shortcommit}%{?dist}
 Summary:        A command line tool used to creating OCI Images
 License:        ASL 2.0
@@ -100,6 +100,9 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 %{_datadir}/bash-completion/completions/*
 
 %changelog
+* Mon Oct 21 2024 David Shea <dshea@redhat.com> 1.26.8-1
+- Properly validate cache IDs and sources
+
 * Mon Apr 1 2024 Tom Sweeney <tsweeney@redhat.com> 1.26.7-1
 - [release-1.26] conformance tests: don't break on trailing zeroes
 - [release-1.26] CVE-2024-1753 container escape fix
diff --git a/define/types.go b/define/types.go
index d66b0d5e042..be554fea6c5 100644
--- a/define/types.go
+++ b/define/types.go
@@ -29,7 +29,7 @@ const (
 	Package = "buildah"
 	// Version for the Package.  Bump version in contrib/rpm/buildah.spec
 	// too.
-	Version = "1.26.7"
+	Version = "1.26.8"
 
 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"