Merge pull request #5942 from dashea/dshea-release-1.26.9

[release-1.26] Bump version to 1.26.9

Author: openshift-merge-bot[bot]

.cirrus.yml

@@ -6,7 +6,7 @@ env:
     #### Global variables used for all tasks
     ####
     # Name of the ultimate destination branch for this CI run, PR or post-merge.
-    DEST_BRANCH: "main"
+    DEST_BRANCH: "release-1.26"
     GOPATH: "/var/tmp/go"
     GOSRC: "${GOPATH}/src/github.com/containers/buildah"
     # Overrides default location (/tmp/cirrus) for repo clone

CHANGELOG.md

@@ -2,6 +2,20 @@
 
 # Changelog
 
+## v1.26.9 (2025-01-24)
+
+    Add build-tag comments
+    Fix cache locks with multiple mounts
+    Disable windows cross compile targets
+    Fix TOCTOU error when bind and cache mounts use "src" values
+    define.TempDirForURL(): always use an intermediate subdirectory
+    internal/volume.GetBindMount(): discard writes in bind mounts
+    pkg/overlay: add a MountLabel flag to Options
+    pkg/overlay: add a ForceMount flag to Options
+    Add internal/volumes.bindFromChroot()
+    Add an internal/open package
+    Allow cache mounts to be stages or additional build contexts
+
 ## v1.26.8 (2024-10-21)
 
     Properly validate cache IDs and sources

changelog.txt

@@ -1,3 +1,16 @@
+- Changelog for v1.26.9 (2025-01-24)
+  * Add build-tag comments
+  * Fix cache locks with multiple mounts
+  * Disable windows cross compile targets
+  * Fix TOCTOU error when bind and cache mounts use "src" values
+  * define.TempDirForURL(): always use an intermediate subdirectory
+  * internal/volume.GetBindMount(): discard writes in bind mounts
+  * pkg/overlay: add a MountLabel flag to Options
+  * pkg/overlay: add a ForceMount flag to Options
+  * Add internal/volumes.bindFromChroot()
+  * Add an internal/open package
+  * Allow cache mounts to be stages or additional build contexts
+
 - Changelog for v1.26.8 (2024-10-21)
   * Properly validate cache IDs and sources
 

contrib/rpm/buildah.spec

@@ -26,7 +26,7 @@
 
 Name:           buildah
 # Bump version in define/types.go too
-Version:        1.26.8
+Version:        1.26.9
 Release:        1.git%{shortcommit}%{?dist}
 Summary:        A command line tool used to creating OCI Images
 License:        ASL 2.0
@@ -100,6 +100,19 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 %{_datadir}/bash-completion/completions/*
 
 %changelog
+* Fri Jan 24 2025 David Shea <dshea@redhat.com> 1.26.9-1
+- Add build-tag comments
+- Fix cache locks with multiple mounts
+- Disable windows cross compile targets
+- Fix TOCTOU error when bind and cache mounts use "src" values
+- define.TempDirForURL(): always use an intermediate subdirectory
+- internal/volume.GetBindMount(): discard writes in bind mounts
+- pkg/overlay: add a MountLabel flag to Options
+- pkg/overlay: add a ForceMount flag to Options
+- Add internal/volumes.bindFromChroot()
+- Add an internal/open package
+- Allow cache mounts to be stages or additional build contexts
+
 * Mon Oct 21 2024 David Shea <dshea@redhat.com> 1.26.8-1
 - Properly validate cache IDs and sources
 

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.8"
+	Version = "1.26.9"
 
 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"