buildah: update to 1.29.x

We drop our backported patch, since it is now part of the upstream
project.

We also drop {LINKSHARED} from the build, as with the updated buildah
and golang version bumps in oe-core, we get the following build error:

  | # github.com/containers/buildah/cmd/buildah
  | type:*crypto/elliptic.nistCurve[*crypto/internal/nistec.P384Point]: unreachable sym in relocation: crypto/elliptic.(*nistCurve[*crypto/internal/nistec.P384Point]).Add
  | type:*crypto/elliptic.nistCurve[*crypto/internal/nistec.P384Point]: unreachable sym in relocation: crypto/elliptic.(*nistCurve[*crypto/internal/nistec.P384Point]).Add

It is unclear what the linked shared flag was providing in our build,
and we are generally ok with statically linked go applications. So we
drop the flag until a compelling reason exists to debug the linking
failure.

Bumping buildah to version v1.29.1-1-g7fa17a842, which comprises the following commits:

    faf0d4fcb [release-1.29] Bump to Buildah v1.29.1
    7d5ff3012 Update to c/image 5.24.1
    94b723cb5 Bump to v1.29.0
    c9cbc6d7d tests: improve build-with-network-test
    5e3f26de2 Bump c/storagev1.45.3, c/imagev5.24.0, c/commonv0.51.0
    b70fb1765 build(deps): bump github.com/onsi/gomega from 1.25.0 to 1.26.0
    fe0256d38 Flake 3710 has been closed. Reenable the test.
    f9ef51cbb [CI:DOCS] Fix two diversity issues in a tutorial
    3ef898e41 build(deps): bump github.com/fsouza/go-dockerclient from 1.9.2 to 1.9.3
    0d87e38b6 vendor in latests containers/(storage, common, image)
    15bdd2aad fix bud-multiple-platform-with-base-as-default-arg flake
    ac7458e70 stage_executor: while mounting stages use freshly built stage
    e1cfcb240 build(deps): bump github.com/fsouza/go-dockerclient from 1.9.0 to 1.9.2
    d1c82c29a build(deps): bump github.com/onsi/gomega from 1.24.2 to 1.25.0
    4dec25346 vendor in latests containers/(storage, common, image, ocicyrpt)
    c0f6c6b7a [Itests: change the runtime-flag test for crun
    186b30168 [CI:DOCS] README: drop sudo
    1950ab687 Fix multi-arch manifest-list build timeouts
    d106e425a Cirrus: Update VM Images
    67ab55bbb bud: Consolidate multiple synthetic LABEL instructions
    9fced965e build, secret: allow realtive mountpoints wrt to work dir
    938c03556 fixed squash documentation
    59da1a7f7 build(deps): bump github.com/containerd/containerd from 1.6.14 to 1.6.15
    4952862a2 Correct minor comment
    820fafc88 Vendor in latest containers/(common, image, storage)
    a75b263f7 system tests: remove unhelpful assertions
    356668389 buildah: add prune command and expose CleanCacheMount API
    a5e177586 vendor: bump c/storage to a747b27
    60be7f250 Add support for --group-add to buildah from
    00d8d94cb build(deps): bump actions/stale from 6 to 7
    e33bb8678 Add documentation for buildah build --pull=missing
    5828918bc build(deps): bump github.com/containerd/containerd from 1.6.12 to 1.6.14
    4aa28f6a7 build(deps): bump github.com/docker/docker
    7a4702ae2 parse: default ignorefile must not point to symlink outside context
    67c2e4de5 buildah: wrap network setup errors
    d9578d32c build, mount: allow realtive mountpoints wrt to work dir
    57a77073a Update to F37 CI VM Images, re-enable prior-fedora
    798a250d4 Update vendor or containers/(image, storage, common)
    ca96c3678 build(deps): bump golang.org/x/crypto from 0.3.0 to 0.4.0
    e0054a03d Update contact information
    e5cc78c43 build(deps): bump golang.org/x/term from 0.2.0 to 0.3.0
    46eea3158 Replace io/ioutil calls with os calls
    0183471b9 [skip-ci] GHA/Cirrus-cron: Fix execution order
    8428bc87b Vendor in containers/common
    e60c4d7e5 build(deps): bump golang.org/x/sys from 0.2.0 to 0.3.0
    ffed85036 remote-cache: support multiple sources and destinations
    a1698cde6 Update c/storage after https://github.com/containers/storage/pull/1436
    025a8df51 util.SortMounts(): make the returned order more stable
    5e792e97b version: Bump to 1.29.0-dev
    498b45770 [CI:BUILD] Cirrus: Migrate OSX task to M1
    94560581d Update vendor of containers/(common, storage, image)
    e6eb05f75 mount=type=cache: seperate cache parent on host for each user
    20dd347b9 Fix installation instructions for Gentoo Linux
    e162302df build(deps): bump github.com/containerd/containerd from 1.6.9 to 1.6.10
    1cfb5eafb GHA: Reuse both cirrus rerun and check workflows
    5bd5a4f9d Vendor in latest containers/(common,image,storage)
    8e4979e81 build(deps): bump github.com/onsi/gomega from 1.24.0 to 1.24.1
    3d755b5eb copier.Put(): clear up os/syscall mode bit confusion
    1a18ab341 build(deps): bump golang.org/x/sys from 0.1.0 to 0.2.0
    646c28290 Use TypeBind consistently to name bind/nullfs mounts
    d4c661a77 Add no-new-privileges flag
    1f372c08a Update vendor of containers/(common, image, storage)
    b2054360a imagebuildah:build with --all-platforms must honor args for base images
    a17238891 codespell code
    217b2d524 Expand args and env when using --all-platforms
    c554e5330 build(deps): bump github.com/onsi/gomega from 1.23.0 to 1.24.0
    ed3707765 GHA: Simplify Cirrus-Cron check slightly
    1091222b2 Stop using ubi8
    cec864147 remove unnecessary (hence misleading) rmi
    ffb00243f chroot: fix mounting of ro bind mounts
    a237085fe executor: honor default ARG value while eval base name
    481b3cc95 userns: add arbitrary steps/stage to --userns=auto test
    dc733f1d2 Don't set allow.mount in the vnet jail on Freebsd
    e867db39b copier: Preserve file flags when copying archives on FreeBSD
    bf4420f25 Remove quiet flag, so that it works in podman-remote
    8b1a490bd test: fix preserve rootfs with --mount for podman-remote
    b24449990 test: fix prune logic for cache-from after adding content summary
    4290ab5af vendor in latest containers/(storage, common, image)
    1d0dd78c3 Fix RUN --mount=type=bind,from=<stage> not preserving rootfs of stage
    7aa34b86f Define and use a safe, reliable test image
    87e379d5b Fix word missing in Container Tools Guide
    57f370d9d Makefile: Use $(MAKE) to start sub-makes in install.tools
    3223610ff imagebuildah: pull cache from remote repo after adding content summary
    f9693d0a5 Makefile: Fix install on FreeBSD
    835668715 Ensure the cache volume locks are unlocked on all paths
    0d7414703 Vendor in latest containers/(common,storage)
    60382209e Simplify the interface of GetCacheMount and getCacheMount
    8f955f801 Fix cache locks with multiple mounts
    bdd62ef87 Remove calls to Lockfile.Locked()
    cfa10d16c Maintain cache mount locks as lock objects instead of paths
    ffb2f27a8 test: cleaning cache must not clean lockfiles
    6838cbc81 run: honor lockfiles for multiple --mount instruction
    f2e0af5c4 mount,cache: lockfiles must not be part of users cache content
    6fa774ddc Update vendor containers/(common,image,storage)
    bdb549478 [CI:BUILD] copr: buildah rpm should depend on containers-common-extra
    eb9f3648b pr-should-include-tests: allow specfile, golangci
    da214d6d4 build(deps): bump dawidd6/action-send-mail from 3.7.0 to 3.7.1
    5baed90cd build(deps): bump github.com/docker/docker
    82431441a build(deps): bump github.com/fsouza/go-dockerclient from 1.8.3 to 1.9.0
    9226bd312 Update vendor containers/(common,image,storage)
    26a29674a build(deps): bump actions/upload-artifact from 2 to 3
    cadd801fc build(deps): bump actions/checkout from 2 to 3
    8ec69a9ad build(deps): bump actions/stale from 1 to 6
    356ab96d7 build(deps): bump dawidd6/action-send-mail from 2.2.2 to 3.7.0
    27032ea0f build(deps): bump tim-actions/get-pr-commits from 1.1.0 to 1.2.0
    5038a0dae sshagent: LockOSThread before setting SocketLabel
    4f272ee49 Update tests for error message changes
    788fddb1d Update c/image after https://github.com/containers/image/pull/1299
    f232da006 Fix ident for dependabot gha block
    acc230dc3 build(deps): bump github.com/containers/ocicrypt from 1.1.5 to 1.1.6
    dc81652ff Fix man pages to match latest cobra settings
    7260a4b0d build(deps): bump github.com/spf13/cobra from 1.5.0 to 1.6.0
    fba8daf13 build(deps): bump github.com/onsi/gomega from 1.20.2 to 1.22.1
    df8f0fa88 test: retrofit 'bud with undefined build arg directory'
    9d43eb95e imagebuildah: warnOnUnsetBuildArgs while processing stages from executor
    1a2af6864 Update contrib/buildahimage/Containerfile
    e1c7a5df1 Cirrus CI add flavor parameter
    b5c86a8e0 Correction - `FLAVOR` not `FLAVOUR`
    f5fc96e79 Changed build argument from `RELEASE` to `FLAVOUR`
    36afa3530 Combine buildahimage Containerfiles
    472c46f98 bud.bats refactoring: $TEST_SCRATCH_DIR, part 2 of 2
    ca65736da bud.bats refactoring: $TEST_SCRATCH_DIR, part 1 of 2
    2adbe2a58 System test cleanup: document, clarify, fix
    bf0a6e073 test: removing unneeded/expensive COPY
    94ea37767 test: warning behaviour for unset/set TARGETOS,TARGETARCH,TARGETPLATFORM
    eae3415b1 Bump to v1.28.1-dev

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 5 insertions, 56 deletions

diff --git a/recipes-containers/buildah/buildah/0001-fix-workaround-field-rename-in-btrfs-progs-6.1.patch b/recipes-containers/buildah/buildah/0001-fix-workaround-field-rename-in-btrfs-progs-6.1.patch
deleted file mode 100644
index 9b895c53..00000000
--- a/recipes-containers/buildah/buildah/0001-fix-workaround-field-rename-in-btrfs-progs-6.1.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 246ba3062e8b551026aef2708eee747014ce5c52 Mon Sep 17 00:00:00 2001
-From: Rui Chen <rui@chenrui.dev>
-Date: Wed, 28 Dec 2022 18:26:39 -0500
-Subject: [PATCH] fix: workaround field rename in btrfs-progs 6.1
-
-same as kdave/btrfs-progs@0345143
-
-Upstream-Status: Inappropriate [embedded specific]
-
-Signed-off-by: Rui Chen <rui@chenrui.dev>
----
- drivers/btrfs/btrfs.go | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/btrfs/btrfs.go b/drivers/btrfs/btrfs.go
-index e8b16b858..3d9053297 100644
---- a/drivers/btrfs/btrfs.go
-+++ b/drivers/btrfs/btrfs.go
-@@ -6,6 +6,9 @@ package btrfs
- /*
- #include <stdlib.h>
- #include <dirent.h>
-+
-+// keep struct field name compatible with btrfs-progs < 6.1.
-+#define max_referenced max_rfer
- #include <btrfs/ioctl.h>
- #include <btrfs/ctree.h>
- 
-@@ -382,7 +385,7 @@ func subvolLimitQgroup(path string, size uint64) error {
-        defer closeDir(dir)
- 
-        var args C.struct_btrfs_ioctl_qgroup_limit_args
--       args.lim.max_referenced = C.__u64(size)
-+       args.lim.max_rfer = C.__u64(size)
-        args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER
-        _, _, errno := unix.Syscall(unix.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT,
-                uintptr(unsafe.Pointer(&args)))
--- 
-2.34.1
-
diff --git a/recipes-containers/buildah/buildah_git.bb b/recipes-containers/buildah/buildah_git.bb
index 18985c94..3c17c98c 100644
--- a/recipes-containers/buildah/buildah_git.bb
+++ b/recipes-containers/buildah/buildah_git.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://src/github.com/containers/buildah/LICENSE;md5=e3fc50a
 
 S = "${WORKDIR}/git"
 
-BUILDAH_VERSION = "1.28"
+BUILDAH_VERSION = "1.29"
 
 PV = "${BUILDAH_VERSION}"
 
@@ -22,17 +22,12 @@ GO_WORKDIR = "${GO_INSTALL}"
 GOBUILDFLAGS += "-mod vendor"
 
 SRCREV_FORMAT = "buildah_storage"
-SRCREV_buildah = "cfefbb64ea1fe3639c231f73e7b09bfe300744ac"
+SRCREV_buildah = "7fa17a8428727eb3ecaca088bda1ebec590eeb8c"
 SRCREV_storage = "246ba3062e8b551026aef2708eee747014ce5c52"
 
 SRC_URI = " \
     git://github.com/containers/buildah;branch=release-${BUILDAH_VERSION};name=buildah;protocol=https \
     "
-# Due to some other API changes, we can't directly import containers/storage at
-# the right commit, so we instead extract a patch and apply it to the tree
-# SRC_URI += "git://github.com/containers/storage;protocol=https;name=storage;branch=main;destsuffix=git/src/github.com/containers/buildah/vendor/github.com/containers/storage"
-SRC_URI += "file://0001-fix-workaround-field-rename-in-btrfs-progs-6.1.patch;patchdir=src/github.com/containers/buildah/vendor/github.com/containers/storage"
-
 
 DEPENDS = "libdevmapper btrfs-tools gpgme"
 RDEPENDS:${PN} = "cgroup-lite fuse-overlayfs libdevmapper podman"
@@ -45,15 +40,9 @@ do_compile:prepend() {
 go_do_compile() {
         export TMPDIR="${GOTMPDIR}"
         if [ -n "${GO_INSTALL}" ]; then
-                if [ -n "${GO_LINKSHARED}" ]; then
-                        ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
-                        ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
-                        ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
-                        rm -rf ${B}/bin
-                fi
-                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./cmd/buildah
-                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
-                ${GO} install ${GO_LINKSHARED} ${GOBUILDFLAGS} ./tests/copy/copy.go
+                ${GO} install ${GOBUILDFLAGS} ./cmd/buildah
+                ${GO} install ${GOBUILDFLAGS} ./tests/imgtype/imgtype.go
+                ${GO} install ${GOBUILDFLAGS} ./tests/copy/copy.go
         fi
 }