Bump version to 1.21.6

Signed-off-by: David Shea <[email protected]>
Signed-off-by: Nalin Dahyabhai <[email protected]>

Author: dashea

CHANGELOG.md

@@ -1,6 +1,39 @@
 ![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Changelog
+
+## v1.21.6 (2025-12-12)
+    Bump runc to v1.2.9 - CVE-2025-52881
+    Makefile: drop non-Linux cross-compile targets
+    Update golang.org/x/tools to v0.26.0
+    tests/tools: update ginkgo and golangci-lint
+    Update other dependencies
+    Update go-selinux uses to handle API changes
+    Switch to moby/sys/userns for RunningInUserNS
+    Bump CI environment
+    CI: switch to debian for testing there
+    Handle errors.Cause() returning not-completely-unwrapped errors
+    Update to compensate for containers/common API changes
+    Update linter configuration and address some warnings
+    use c/image/pkg/blobcache
+    Stop setting "parent" in docker format
+    commit: set "parent" for docker format only when requested
+    Builder.SetWorkDir(): trim off a path separator suffix, if there is one
+    Update man pages
+    Make "buildah build" an alias for "buildah bud"
+    Update expected error messages
+    Remove -cover flag from test-unit target
+    vendor c/common
+    chroot tests: use the same default seccomp profile
+    util.SortMounts(): make the returned order more stable
+    Backport permissions fixup for test git server from #5550
+    run: handle relabeling bind mounts ourselves
+    Add a dummy "runtime" that just dumps its config file
+    runUsingRuntime: use named constants for runtime states
+    Update the selinux spc test
+    bud --pull=false --arch test: accept either RPM or Go arch names
+    Add /usr/lib/cni to define.DefaultCNIPluginPath
+
 ## v1.21.5 (2022-09-20)
     run: add container gid to additional groups
     run: do not set the inheritable capabilities

changelog.txt

@@ -1,3 +1,35 @@
+- Changelog for v1.21.6 (2025-12-12)
+  * Bump runc to v1.2.9 - CVE-2025-52881
+  * Makefile: drop non-Linux cross-compile targets
+  * Update golang.org/x/tools to v0.26.0
+  * tests/tools: update ginkgo and golangci-lint
+  * Update other dependencies
+  * Update go-selinux uses to handle API changes
+  * Switch to moby/sys/userns for RunningInUserNS
+  * Bump CI environment
+  * CI: switch to debian for testing there
+  * Handle errors.Cause() returning not-completely-unwrapped errors
+  * Update to compensate for containers/common API changes
+  * Update linter configuration and address some warnings
+  * use c/image/pkg/blobcache
+  * Stop setting "parent" in docker format
+  * commit: set "parent" for docker format only when requested
+  * Builder.SetWorkDir(): trim off a path separator suffix, if there is one
+  * Update man pages
+  * Make "buildah build" an alias for "buildah bud"
+  * Update expected error messages
+  * Remove -cover flag from test-unit target
+  * vendor c/common
+  * chroot tests: use the same default seccomp profile
+  * util.SortMounts(): make the returned order more stable
+  * Backport permissions fixup for test git server from #5550
+  * run: handle relabeling bind mounts ourselves
+  * Add a dummy "runtime" that just dumps its config file
+  * runUsingRuntime: use named constants for runtime states
+  * Update the selinux spc test
+  * bud --pull=false --arch test: accept either RPM or Go arch names
+  * Add /usr/lib/cni to define.DefaultCNIPluginPath
+
 - Changelog for v1.21.5 (2022-09-20)
   * run: add container gid to additional groups
   * run: do not set the inheritable capabilities

contrib/rpm/buildah.spec

@@ -26,7 +26,7 @@
 
 Name:           buildah
 # Bump version in define/types.go too
-Version:        1.21.5
+Version:        1.21.6
 Release:        1.git%{shortcommit}%{?dist}
 Summary:        A command line tool used to creating OCI Images
 License:        ASL 2.0
@@ -100,6 +100,38 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 %{_datadir}/bash-completion/completions/*
 
 %changelog
+* Fri Dec 12 2025 Nalin Dahyabhai <[email protected]> 1.21.6-1
+- Bump runc to v1.2.9 - CVE-2025-52881
+- Makefile: drop non-Linux cross-compile targets
+- Update golang.org/x/tools to v0.26.0
+- tests/tools: update ginkgo and golangci-lint
+- Update other dependencies
+- Update go-selinux uses to handle API changes
+- Switch to moby/sys/userns for RunningInUserNS
+- Bump CI environment
+- CI: switch to debian for testing there
+- Handle errors.Cause() returning not-completely-unwrapped errors
+- Update to compensate for containers/common API changes
+- Update linter configuration and address some warnings
+- use c/image/pkg/blobcache
+- Stop setting "parent" in docker format
+- commit: set "parent" for docker format only when requested
+- Builder.SetWorkDir(): trim off a path separator suffix, if there is one
+- Update man pages
+- Make "buildah build" an alias for "buildah bud"
+- Update expected error messages
+- Remove -cover flag from test-unit target
+- vendor c/common
+- chroot tests: use the same default seccomp profile
+- util.SortMounts(): make the returned order more stable
+- Backport permissions fixup for test git server from #5550
+- run: handle relabeling bind mounts ourselves
+- Add a dummy "runtime" that just dumps its config file
+- runUsingRuntime: use named constants for runtime states
+- Update the selinux spc test
+- bud --pull=false --arch test: accept either RPM or Go arch names
+- Add /usr/lib/cni to define.DefaultCNIPluginPath
+
 * Tue Sep 20 2022 Nalin Dahyabhai <[email protected]> 1.21.5-1
 - run: add container gid to additional groups
 - run: do not set the inheritable capabilities

define/types.go

@@ -28,7 +28,7 @@ const (
 	Package = "buildah"
 	// Version for the Package.  Bump version in contrib/rpm/buildah.spec
 	// too.
-	Version = "1.21.5"
+	Version = "1.21.6"
 
 	// DefaultRuntime if containers.conf fails.
 	DefaultRuntime = "runc"