Merge pull request #3397 from nalind/1.21.4

[release-1.21] bump to v1.21.4

CHANGELOG.md

@@ -1,12 +1,17 @@
 ![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Changelog
+## v1.21.4 (2021-07-22)
+    tests: make it easer to override the location of the copy helper
+    tests: add and use a "copy" helper instead of podman load/save
+    vendor containers/common@v0.38.16
+
 ## v1.21.3 (2021-07-01)
     chroot: fix environment value leakage to intermediate processes
     (CVE-2021-3602).
 
 ## v1.21.2 (2021-06-28)
-  * vendor common@v0.38.12 and storage@v1.31.3
+    vendor common@v0.38.12 and storage@v1.31.3
 
 ## v1.21.1 (2021-06-02)
     Fix handling of auth.json file while in a user namespace

changelog.txt

@@ -1,3 +1,8 @@
+- Changelog for v1.21.4 (2021-07-22)
+  * tests: make it easer to override the location of the copy helper
+  * tests: add and use a "copy" helper instead of podman load/save
+  * vendor containers/common@v0.38.16
+
 - Changelog for v1.21.3 (2021-07-01)
   * chroot: fix environment value leakage to intermediate processes
   (CVE-2021-3602).

contrib/rpm/buildah.spec

@@ -26,7 +26,7 @@
 
 Name:           buildah
 # Bump version in define/types.go too
-Version:        1.21.3
+Version:        1.21.4
 Release:        1.git%{shortcommit}%{?dist}
 Summary:        A command line tool used to creating OCI Images
 License:        ASL 2.0
@@ -100,6 +100,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} install install.completions
 %{_datadir}/bash-completion/completions/*
 
 %changelog
+* Thu Jul 22 2021 Nalin Dahyabhai <nalin@redhat.com> 1.21.4-1
+- tests: make it easer to override the location of the copy helper
+- tests: add and use a "copy" helper instead of podman load/save
+- vendor containers/common@v0.38.16
+
 * Thu Jul 1 2021 Nalin Dahyabhai <nalin@redhat.com> 1.21.3-1
 - chroot: fix environment value leakage to intermediate processes
   (CVE-2021-3602)

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