[rpms/buildah] update-buildah-cve-2026-46597: buildah-1.24.0-0.42.el9

[Jindrich Novy <jnovy@redhat.com>]

            A new commit has been pushed.

            Repo   : rpms/buildah
            Branch : update-buildah-cve-2026-46597
            Commit : 2a5e3bc54bb78eeb5897cab369c2ba6a665aa139
            Author : Jindrich Novy <jnovy@redhat.com>
            Date   : 2022-01-06T09:43:08+01:00
            Stats  : +22/-85 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/buildah/c/2a5e3bc54bb78eeb5897cab369c2ba6a665aa139?branch=update-buildah-cve-2026-46597

            Log:
            buildah-1.24.0-0.42.el9

- basically, bring in from RHEL8 container-tools module,
  remove podman & skopeo, and bang at it until it works. (Ed Santiago)
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

---
diff --git a/buildah.spec b/buildah.spec
index 46aa2ff..08c0c4e 100644
--- a/buildah.spec
+++ b/buildah.spec
@@ -21,7 +21,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl 
 Epoch: 1
 Name: buildah
 Version: 1.24.0
-Release: 0.41%{?dist}
+Release: 0.42%{?dist}
 Summary: A command line tool used for creating OCI Images
 License: ASL 2.0
 URL: https://%{name}.io
@@ -131,6 +131,11 @@ make DESTDIR=%{buildroot} PREFIX=%{_prefix} -C docs install
 %{_datadir}/%{name}/test
 
 %changelog
+* Thu Jan 06 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.0-0.42
+- basically, bring in from RHEL8 container-tools module,
+  remove podman & skopeo, and bang at it until it works. (Ed Santiago)
+- Related: #2000051
+
 * Mon Jan 03 2022 Jindrich Novy <jnovy@redhat.com> - 1:1.24.0-0.41
 - update to the latest content of https://github.com/containers/buildah/tree/main
   (https://github.com/containers/buildah/commit/9591a8d)

diff --git a/tests/test_buildah.sh b/tests/test_buildah.sh
deleted file mode 100755
index 948e84c..0000000
--- a/tests/test_buildah.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash -e
-
-# Log program and kernel versions
-echo "Important package versions:"
-(
-    uname -r
-    rpm -qa | egrep 'buildah|podman|conmon|crun|runc|iptable|slirp|systemd' | sort
-) | sed -e 's/^/  /'
-
-# Log environment; or at least the useful bits
-echo "Environment:"
-env | grep -v LS_COLORS= | sort | sed -e 's/^/  /'
-
-export BUILDAH_BINARY=/usr/bin/buildah
-export IMGTYPE_BINARY=/usr/bin/buildah-imgtype
-export COPY_BINARY=/usr/bin/buildah-copy
-
-###############################################################################
-# BEGIN setup/teardown
-
-# Start a registry
-pre_bats_setup() {
-    REGISTRY_FQIN=docker.io/library/registry:2
-
-    AUTHDIR=/tmp/buildah-tests-auth.$$
-    mkdir -p $AUTHDIR
-
-    CERT=$AUTHDIR/domain.crt
-    if [ ! -e $CERT ]; then
-        openssl req -newkey rsa:4096 -nodes -sha256 \
-                -keyout $AUTHDIR/domain.key -x509 -days 2 \
-                -out $AUTHDIR/domain.crt \
-                -subj "/C=US/ST=Foo/L=Bar/O=Red Hat, Inc./CN=registry host certificate" \
-                -addext subjectAltName=DNS:localhost
-    fi
-
-    if [ ! -e $AUTHDIR/htpasswd ]; then
-        htpasswd -Bbn testuser testpassword > $AUTHDIR/htpasswd
-    fi
-
-    podman rm -f registry || true
-    podman run -d -p 5000:5000 \
-           --name registry \
-           -v $AUTHDIR:/auth:Z \
-           -e "REGISTRY_AUTH=htpasswd" \
-           -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-           -e REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd \
-           -e REGISTRY_HTTP_TLS_CERTIFICATE=/auth/domain.crt \
-           -e REGISTRY_HTTP_TLS_KEY=/auth/domain.key \
-           $REGISTRY_FQIN
-}
-
-post_bats_teardown() {
-    podman rm -f registry
-}
-
-# END   setup/teardown
-###############################################################################
-# BEGIN actual test
-
-pre_bats_setup
-bats /usr/share/buildah/test/system
-rc=$?
-post_bats_teardown
-
-exit $rc

diff --git a/tests/test_buildah.yml b/tests/test_buildah.yml
deleted file mode 100644
index 4820a9f..0000000
--- a/tests/test_buildah.yml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-- hosts: localhost
-  environment:
-    TMPDIR: /var/tmp
-  roles:
-    - role: standard-test-basic
-      tags:
-        - classic
-        - container
-      required_packages:
-        - buildah
-        - buildah-tests
-      tests:
-        - root-test:
-            dir: ./
-            run: ./test_buildah.sh
-            timeout: 60m

diff --git a/tests/tests.yml b/tests/tests.yml
index 596f735..52afad9 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -1 +1,16 @@
-- import_playbook: test_buildah.yml
+---
+- hosts: localhost
+  tags:  classic
+  vars:
+  - artifacts: ./artifacts
+  roles:
+  - role: bats_installed
+  - role: run_bats_tests
+    tests:
+    - name:    buildah root
+      package: buildah
+      environment:
+        TMPDIR: /var/tmp
+        BUILDAH_BINARY: /usr/bin/buildah
+        IMGTYPE_BINARY: /usr/bin/buildah-imgtype
+        COPY_BINARY: /usr/bin/buildah-copy