buildah-1.19.4-1

- Resolves: #1919391, #1926796 - Security fix for CVE-2021-20206
- bump to v1.19.4
- adjust dependencies

(cherry picked from commit d013e460d0)
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

.fmf/version

@@ -1 +0,0 @@
-1

.gitignore

@@ -484,254 +484,16 @@
 /buildah-0ac2a67.tar.gz
 /buildah-f7a3515.tar.gz
 /buildah-2c46b4b.tar.gz
-/buildah-ac0182c.tar.gz
-/buildah-fce9668.tar.gz
-/buildah-58e6b4f.tar.gz
-/buildah-28d7d44.tar.gz
-/buildah-d83657c.tar.gz
-/buildah-49a5768.tar.gz
-/buildah-555eb26.tar.gz
-/buildah-2928303.tar.gz
-/buildah-bfe6da5.tar.gz
-/buildah-efc5ec2.tar.gz
-/buildah-aa3128e.tar.gz
-/buildah-33768fc.tar.gz
-/buildah-1f8bf4d.tar.gz
-/buildah-b47ffb9.tar.gz
-/buildah-d0f43a0.tar.gz
-/buildah-552cbd3.tar.gz
-/buildah-17bb22f.tar.gz
-/buildah-58541a3.tar.gz
-/buildah-678da1d.tar.gz
-/buildah-411a885.tar.gz
-/buildah-d273b9e.tar.gz
-/buildah-0f4a259.tar.gz
-/buildah-f2f857a.tar.gz
-/buildah-0e06e45.tar.gz
-/buildah-b3f6ed8.tar.gz
-/buildah-5955652.tar.gz
-/buildah-7fb1282.tar.gz
-/buildah-dc504d9.tar.gz
-/buildah-73ae001.tar.gz
-/buildah-71a5615.tar.gz
-/buildah-f09e52c.tar.gz
-/buildah-746b5a6.tar.gz
-/buildah-ed75e66.tar.gz
-/buildah-415715a.tar.gz
-/buildah-9913b9f.tar.gz
-/buildah-7389cc7.tar.gz
-/buildah-7699b6e.tar.gz
-/buildah-a970ffb.tar.gz
-/buildah-9229549.tar.gz
-/buildah-d33bb41.tar.gz
-/buildah-7719296.tar.gz
-/buildah-c7ed3ca.tar.gz
-/buildah-1087564.tar.gz
-/buildah-18c0b33.tar.gz
-/buildah-5368ec3.tar.gz
-/buildah-d0c958d.tar.gz
-/buildah-272f241.tar.gz
-/buildah-aa37929.tar.gz
-/buildah-05aa527.tar.gz
-/buildah-e016fa8.tar.gz
-/buildah-570b43f.tar.gz
-/buildah-2e1d92e.tar.gz
-/buildah-af10f8c.tar.gz
-/buildah-587e617.tar.gz
-/buildah-dd26b13.tar.gz
-/buildah-02b3b50.tar.gz
-/buildah-92463b5.tar.gz
-/buildah-acb97f1.tar.gz
-/buildah-75ae8be.tar.gz
-/buildah-c50e236.tar.gz
-/buildah-ac96369.tar.gz
-/buildah-1d67d26.tar.gz
-/buildah-10d622b.tar.gz
-/buildah-1678745.tar.gz
-/buildah-5b867f2.tar.gz
-/buildah-d69f76a.tar.gz
-/buildah-ef8adfd.tar.gz
-/buildah-8c01c17.tar.gz
-/buildah-356fd7e.tar.gz
-/buildah-6747061.tar.gz
-/buildah-6e56bea.tar.gz
-/buildah-bec005d.tar.gz
-/buildah-7734b68.tar.gz
-/buildah-5f1031f.tar.gz
-/buildah-b9fdee0.tar.gz
-/buildah-00aa7f0.tar.gz
-/buildah-ffef8a6.tar.gz
-/buildah-24e0eb7.tar.gz
-/buildah-00b8e9f.tar.gz
-/buildah-d899c7c.tar.gz
-/buildah-f3c5c03.tar.gz
-/buildah-5129d28.tar.gz
-/buildah-02b914b.tar.gz
-/buildah-f01ddd6.tar.gz
-/buildah-6d3b8d3.tar.gz
-/buildah-ddcbb30.tar.gz
-/buildah-10c10ee.tar.gz
-/buildah-1b3dc91.tar.gz
-/buildah-911e6ea.tar.gz
-/buildah-8d89b80.tar.gz
-/buildah-cfb3372.tar.gz
-/buildah-80181e8.tar.gz
-/buildah-2e1bbc2.tar.gz
-/buildah-b595a98.tar.gz
-/buildah-f17ccd0.tar.gz
-/buildah-d10dbf3.tar.gz
-/buildah-6f554d8.tar.gz
-/buildah-3f5ba7e.tar.gz
-/buildah-d460e2e.tar.gz
-/buildah-371e4ca.tar.gz
-/buildah-1a04337.tar.gz
-/buildah-4925e86.tar.gz
-/buildah-2f20868.tar.gz
-/buildah-0c5bfcd.tar.gz
+/buildah-295b825.tar.gz
+/v1.16.1.tar.gz
+/v1.16.2.tar.gz
+/v1.16.4.tar.gz
+/v1.16.5.tar.gz
+/v1.17.0.tar.gz
+/v1.18.0.tar.gz
+/v1.19.0.tar.gz
+/v1.19.1.tar.gz
+/v1.19.2.tar.gz
+/v1.19.3.tar.gz
 /buildah-6002877.tar.gz
-/buildah-0ec651f.tar.gz
-/buildah-7f340f9.tar.gz
-/buildah-d0af90d.tar.gz
-/buildah-e1dfdd3.tar.gz
-/buildah-044ea34.tar.gz
-/buildah-800a3ed.tar.gz
-/buildah-8f63761.tar.gz
-/buildah-885e9c1.tar.gz
-/buildah-9eb048a.tar.gz
-/buildah-0508fba.tar.gz
-/buildah-3679b9f.tar.gz
-/buildah-2e59c37.tar.gz
-/buildah-6421c84.tar.gz
-/buildah-457c75c.tar.gz
-/buildah-0a064b3.tar.gz
-/buildah-013883e.tar.gz
-/buildah-e1c7a5c.tar.gz
-/buildah-d5326ef.tar.gz
-/buildah-de6c0da.tar.gz
-/buildah-a6eeca7.tar.gz
-/buildah-d47032f.tar.gz
-/buildah-1b49e62.tar.gz
-/buildah-72ef182.tar.gz
-/buildah-1296778.tar.gz
-/buildah-a5e80a5.tar.gz
-/buildah-d5c503c.tar.gz
-/buildah-eb42398.tar.gz
-/buildah-b51f63a.tar.gz
-/buildah-06d974b.tar.gz
-/buildah-c15269d.tar.gz
-/buildah-1688944.tar.gz
-/buildah-c0915a5.tar.gz
-/buildah-0ade935.tar.gz
-/buildah-0d8da0a.tar.gz
-/buildah-35300f3.tar.gz
-/buildah-17d8e1b.tar.gz
-/buildah-8614456.tar.gz
-/buildah-d5d782f.tar.gz
-/buildah-e481c9b.tar.gz
-/buildah-5352624.tar.gz
-/buildah-ced3c7b.tar.gz
-/buildah-fd48180.tar.gz
-/buildah-3b8acfb.tar.gz
-/buildah-9cdde41.tar.gz
-/buildah-30ed95a.tar.gz
-/buildah-b2f7e27.tar.gz
-/buildah-0a38651.tar.gz
-/buildah-ecbb651.tar.gz
-/buildah-915de2e.tar.gz
-/buildah-98f7b3d.tar.gz
-/buildah-2e5732b.tar.gz
-/buildah-61f5dff.tar.gz
-/v1.19.6.tar.gz
-/buildah-2f99c2e.tar.gz
-/buildah-9428d03.tar.gz
-/buildah-1065fd2.tar.gz
-/buildah-c4fc67f.tar.gz
-/buildah-d78dfd1.tar.gz
-/buildah-22fc573.tar.gz
-/buildah-135d63d.tar.gz
-/buildah-a0853c3.tar.gz
-/buildah-5119393.tar.gz
-/buildah-162fbaf.tar.gz
-/buildah-2ab877e.tar.gz
-/buildah-f30b420.tar.gz
-/buildah-f629ded.tar.gz
-/buildah-2a83637.tar.gz
-/buildah-19d3065.tar.gz
-/buildah-df14b1c.tar.gz
-/buildah-d677bf0.tar.gz
-/buildah-23e2b79.tar.gz
-/buildah-8a6d840.tar.gz
-/buildah-4fa566e.tar.gz
-/buildah-bbbe10a.tar.gz
-/buildah-d08dbe7.tar.gz
-/buildah-9c7f50b.tar.gz
-/buildah-8d08247.tar.gz
-/buildah-d99221f.tar.gz
-/buildah-30c07b7.tar.gz
-/buildah-814868e.tar.gz
-/buildah-5181b9c.tar.gz
-/buildah-802a904.tar.gz
-/buildah-6d5d1ae.tar.gz
-/buildah-ec35bc4.tar.gz
-/v1.22.0.tar.gz
-/v1.23.0.tar.gz
-/v1.23.1.tar.gz
-/v1.23.2.tar.gz
-/v1.24.0.tar.gz
-/v1.24.1.tar.gz
-/v1.24.2.tar.gz
-/v1.25.0.tar.gz
-/v1.25.1.tar.gz
-/v1.26.0.tar.gz
-/v1.26.1.tar.gz
-/v1.26.2.tar.gz
-/v1.26.3.tar.gz
-/v1.26.4.tar.gz
-/v1.27.0.tar.gz
-/v1.27.1.tar.gz
-/v1.27.2.tar.gz
-/v1.28.0.tar.gz
-/v1.28.2.tar.gz
-/v1.29.0.tar.gz
-/v1.29.1.tar.gz
-/v1.30.0.tar.gz
-/v1.31.0.tar.gz
-/v1.31.1.tar.gz
-/v1.31.2.tar.gz
-/v1.31.3.tar.gz
-/v1.32.0.tar.gz
-/v1.32.1.tar.gz
-/v1.32.2.tar.gz
-/v1.33.2.tar.gz
-/v1.34.0.tar.gz
-/v1.34.1.tar.gz
-/v1.35.0.tar.gz
-/v1.35.1.tar.gz
-/v1.35.2.tar.gz
-/v1.35.3.tar.gz
-/v1.35.4.tar.gz
-/v1.36.0.tar.gz
-/v1.37.0.tar.gz
-/v1.37.1.tar.gz
-/v1.37.2.tar.gz
-/v1.37.3.tar.gz
-/v1.37.4.tar.gz
-/v1.37.5.tar.gz
-/v1.38.0.tar.gz
-/v1.38.1.tar.gz
-/v1.39.0.tar.gz
-/v1.39.1.tar.gz
-/v1.39.2.tar.gz
-/v1.39.3.tar.gz
-/v1.39.4.tar.gz
-/v1.40.0.tar.gz
-/v1.40.1.tar.gz
-/v1.41.0.tar.gz
-/v1.41.1.tar.gz
-/v1.41.2.tar.gz
-/v1.41.3.tar.gz
-/v1.41.4.tar.gz
-/v1.41.5.tar.gz
-/v1.42.0.tar.gz
-/v1.42.1.tar.gz
-/v1.42.2.tar.gz
+/v1.19.4.tar.gz

.packit.yaml

@@ -1,149 +0,0 @@
----
-# See the documentation for more information:
-# https://packit.dev/docs/configuration/
-
-downstream_package_name: buildah
-upstream_tag_template: v{version}
-
-# These files get synced from upstream to downstream (Fedora / CentOS Stream) on every
-# propose-downstream job. This is done so tests maintained upstream can be run
-# downstream in Zuul CI and Bodhi.
-# Ref: https://packit.dev/docs/configuration#files_to_sync
-files_to_sync:
-  - src: rpm/gating.yaml
-    dest: gating.yaml
-    delete: true
-  - src: plans/
-    dest: plans/
-    delete: true
-    mkpath: true
-  - src: tests/tmt/
-    dest: tests/tmt/
-    delete: true
-    mkpath: true
-  - src: .fmf/
-    dest: .fmf/
-    delete: true
-  - .packit.yaml
-
-packages:
-  buildah-fedora:
-    pkg_tool: fedpkg
-    specfile_path: rpm/buildah.spec
-  buildah-centos:
-    pkg_tool: centpkg
-    specfile_path: rpm/buildah.spec
-  buildah-eln:
-    specfile_path: rpm/buildah.spec
-
-srpm_build_deps:
-  - make
-
-jobs:
-  - job: copr_build
-    trigger: pull_request
-    packages: [buildah-fedora]
-    notifications: &copr_build_failure_notification
-      failure_comment:
-        message: "Ephemeral COPR build failed. @containers/packit-build please check."
-    # Fedora aliases documentation: https://packit.dev/docs/configuration#aliases
-    # python3-fedora-distro-aliases provides `resolve-fedora-aliases` command
-    targets: &fedora_copr_targets
-      - fedora-all-x86_64
-      - fedora-all-aarch64
-    enable_net: true
-    # Disable osh diff scan until Go support is available
-    # Ref: https://github.com/openscanhub/known-false-positives/pull/30#issuecomment-2858698495
-    osh_diff_scan_after_copr_build: false
-
-  # Ignore until golang is updated in distro buildroot to 1.23.3+
-  - job: copr_build
-    trigger: ignore
-    packages: [buildah-eln]
-    notifications: *copr_build_failure_notification
-    targets:
-      fedora-eln-x86_64:
-        additional_repos:
-          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/x86_64/"
-      fedora-eln-aarch64:
-        additional_repos:
-          - "https://kojipkgs.fedoraproject.org/repos/eln-build/latest/aarch64/"
-    enable_net: true
-
-  # Ignore until golang is updated in distro buildroot to 1.23.3+
-  - job: copr_build
-    trigger: ignore
-    packages: [buildah-centos]
-    notifications: *copr_build_failure_notification
-    targets: &centos_copr_targets
-      - centos-stream-9-x86_64
-      - centos-stream-9-aarch64
-      - centos-stream-10-x86_64
-      - centos-stream-10-aarch64
-    enable_net: true
-
-  # Run on commit to main branch
-  - job: copr_build
-    trigger: commit
-    packages: [buildah-fedora]
-    notifications:
-      failure_comment:
-        message: "podman-next COPR build failed. @containers/packit-build please check."
-    branch: main
-    owner: rhcontainerbot
-    project: podman-next
-    enable_net: true
-
-  # Tests on Fedora for main branch PRs
-  - job: tests
-    trigger: pull_request
-    packages: [buildah-fedora]
-    targets:
-      - fedora-all-x86_64
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/fedora-$releasever/rhcontainerbot-podman-next-fedora-$releasever.repo
-
-  # Ignore until golang is updated in distro buildroot to 1.23.3+
-  # Tests on CentOS Stream for main branch PRs
-  - job: tests
-    trigger: ignore
-    packages: [buildah-centos]
-    targets:
-      - centos-stream-9-x86_64
-      - centos-stream-10-x86_64
-    tf_extra_params:
-      environments:
-        - artifacts:
-          - type: repository-file
-            id: https://copr.fedorainfracloud.org/coprs/rhcontainerbot/podman-next/repo/centos-stream-$releasever/rhcontainerbot-podman-next-centos-stream-$releasever.repo
-
-  # Sync to Fedora
-  - job: propose_downstream
-    trigger: release
-    packages: [buildah-fedora]
-    update_release: false
-    dist_git_branches: &fedora_targets
-      - fedora-all
-
-  # Sync to CentOS Stream
-  - job: propose_downstream
-    trigger: release
-    packages: [buildah-centos]
-    update_release: false
-    dist_git_branches:
-      - c10s
-
-  # Fedora Koji build
-  - job: koji_build
-    trigger: commit
-    packages: [buildah-fedora]
-    sidetag_group: podman-releases
-    # Dependents are not rpm dependencies, but the package whose bodhi update
-    # should include this package.
-    # Ref: https://packit.dev/docs/fedora-releases-guide/releasing-multiple-packages
-    dependents:
-      - podman
-    dist_git_branches: *fedora_targets

README.packit

@@ -1,3 +0,0 @@
-This repository is maintained by packit.
-https://packit.dev/
-The file was generated using packit 1.12.0.post1.dev20+g7d30dac21.

gating.yaml

@@ -1,16 +1,14 @@
 --- !Policy
 product_versions:
   - fedora-*
-decision_contexts:
-  - bodhi_update_push_stable
-  - bodhi_update_push_testing
+decision_context: bodhi_update_push_stable
 subject_type: koji_build
 rules:
   - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
-
 --- !Policy
 product_versions:
-  - rhel-*
-decision_context: osci_compose_gate
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
 rules:
-  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}

plans/main.fmf

@@ -1,34 +0,0 @@
-discover:
-    how: fmf
-
-execute:
-    how: tmt
-
-prepare:
-    - when: distro == centos-stream or distro == rhel
-      how: shell
-      script: |
-        dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(rpm --eval '%{?rhel}').noarch.rpm
-        dnf -y config-manager --set-enabled epel
-      order: 10
-    - when: initiator == packit
-      how: shell
-      script: |
-        COPR_REPO_FILE="/etc/yum.repos.d/*podman-next*.repo"
-        if compgen -G $COPR_REPO_FILE > /dev/null; then
-            sed -i -n '/^priority=/!p;$apriority=1' $COPR_REPO_FILE
-        fi
-        dnf -y upgrade --allowerasing
-      order: 20
-
-provision:
-    how: artemis
-    hardware:
-        memory: ">= 16 GB"
-        cpu:
-            cores: ">= 4"
-            threads: ">=8"
-        disk:
-            - size: ">= 512 GB"
-
-

sources

@@ -1 +1 @@
-SHA512 (v1.42.2.tar.gz) = adb1de700db9b589639f6fd02cad95d9bedacb9d0363838315f33c978a8c900570d55af95073992ff69cff4f2a9d18776c5d786af294aaa1604144580c957414
+SHA512 (v1.19.4.tar.gz) = 688c96a5f5b4ba821410b6343f879a7d6aaa41ee60821f2ae5b58924c02bf75182d958e6a45995a3fcb61a55b9a7d76b87a9ce40a9461102e0fc9408595a22c2

tests/test_buildah.sh

@@ -0,0 +1,65 @@
+#!/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
+
+###############################################################################
+# BEGIN setup/teardown
+
+# Start a registry
+pre_bats_setup() {
+    REGISTRY_FQIN=quay.io/libpod/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

tests/test_buildah.yml

@@ -0,0 +1,17 @@
+---
+- 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

tests/tests.yml

@@ -0,0 +1 @@
+- import_playbook: test_buildah.yml

tests/tmt/system.fmf

@@ -1,24 +0,0 @@
-require:
-    - buildah-tests
-    - git-daemon
-    - slirp4netns
-
-environment:
-    BUILDAH_BINARY: /usr/bin/buildah
-    IMGTYPE_BINARY: /usr/bin/buildah-imgtype
-    INET_BINARY: /usr/bin/buildah-inet
-    COPY_BINARY: /usr/bin/buildah-copy
-    TUTORIAL_BINARY: /usr/bin/buildah-tutorial
-    DUMPSPEC_BINARY: /usr/bin/buildah-dumpspec
-    PASSWD_BINARY: /usr/bin/buildah-passwd
-    TMPDIR: /var/tmp
-
-adjust:
-    - when: initiator != "packit"
-      environment+:
-        RELEASE_TESTING: true
-
-/local/root:
-    summary: System test
-    test: bash ./system.sh
-    duration: 60m

tests/tmt/system.sh

@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-set -exo pipefail
-
-uname -r
-
-rpm -q \
-    aardvark-dns \
-    buildah \
-    buildah-tests \
-    conmon \
-    container-selinux \
-    containers-common \
-    crun \
-    netavark \
-    systemd
-
-bats /usr/share/buildah/test/system