Update to 1.40.0 upstream release

Upstream tag: v1.40.0
Upstream commit: ff62e3e8

Commit authored by Packit automation (https://packit.dev/)

.gitignore

@@ -713,7 +713,6 @@
 /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
@@ -722,16 +721,4 @@
 /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

.packit.yaml

@@ -46,19 +46,17 @@ jobs:
     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
+    # f40 ships go 1.22 and we require go 1.23 now. This should be revert to fedora-all
+    # once either f40 is rebased to go 1.23 or f42 is released and f40 EOL.
+      - fedora-latest-stable-x86_64
+      - fedora-latest-stable-aarch64
+      - fedora-development-x86_64
+      - fedora-development-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
+    trigger: pull_request
     packages: [buildah-eln]
     notifications: *copr_build_failure_notification
     targets:
@@ -70,9 +68,8 @@ jobs:
           - "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
+    trigger: pull_request
     packages: [buildah-centos]
     notifications: *copr_build_failure_notification
     targets: &centos_copr_targets
@@ -98,20 +95,21 @@ jobs:
   - job: tests
     trigger: pull_request
     packages: [buildah-fedora]
-    targets:
-      - fedora-all-x86_64
+    targets: &fedora_copr_test_targets
+    # See the other comment above, this should be reverted to fedora-all when possible.
+      - fedora-latest-stable-x86_64
+      - fedora-development-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
+    trigger: pull_request
     packages: [buildah-centos]
-    targets:
+    targets: &centos_copr_test_targets
       - centos-stream-9-x86_64
       - centos-stream-10-x86_64
     tf_extra_params:

README.packit

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

buildah.spec

@@ -11,9 +11,6 @@
 
 %if %{defined fedora}
 %define build_with_btrfs 1
-%if 0%{?fedora} >= 43
-%define sequoia 1
-%endif
 %endif
 
 %if %{defined rhel}
@@ -35,7 +32,7 @@ Epoch: 2
 # If that's what you're reading, Version must be 0, and will be updated by Packit for
 # copr and koji builds.
 # If you're reading this on dist-git, the version is automatically filled in by Packit.
-Version: 1.42.2
+Version: 1.40.0
 # The `AND` needs to be uppercase in the License for SPDX compatibility
 License: Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT AND MPL-2.0
 Release: %autorelease
@@ -59,11 +56,11 @@ BuildRequires: go-rpm-macros
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: make
+BuildRequires: ostree-devel
 %if %{defined build_with_btrfs}
 BuildRequires: btrfs-progs-devel
 %endif
 BuildRequires: shadow-utils-subid-devel
-BuildRequires: sqlite-devel
 Requires: containers-common-extra
 %if %{defined fedora}
 BuildRequires: libseccomp-static
@@ -72,9 +69,6 @@ BuildRequires: libseccomp-devel
 %endif
 Requires: libseccomp >= 2.4.1-0
 Suggests: cpp
-%if %{defined sequoia}
-Requires: podman-sequoia
-%endif
 
 %description
 The %{name} package provides a command line tool which can be used to
@@ -129,28 +123,20 @@ export CGO_CFLAGS+=" -m64 -mtune=generic -fcf-protection=full"
 export CNI_VERSION=`grep '^# github.com/containernetworking/cni ' src/modules.txt | sed 's,.* ,,'`
 export LDFLAGS="-X main.buildInfo=`date +%s` -X main.cniVersion=${CNI_VERSION}"
 
-export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh) libsqlite3"
+export BUILDTAGS="seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)"
 %if !%{defined build_with_btrfs}
-export BUILDTAGS+=" exclude_graphdriver_btrfs"
+export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs"
 %endif
 
 %if %{defined fips}
 export BUILDTAGS+=" libtrust_openssl"
 %endif
 
-%if %{defined sequoia}
-export BUILDTAGS+=" containers_image_sequoia"
-%endif
-
 %gobuild -o bin/%{name} ./cmd/%{name}
 %gobuild -o bin/imgtype ./tests/imgtype
 %gobuild -o bin/copy ./tests/copy
 %gobuild -o bin/tutorial ./tests/tutorial
 %gobuild -o bin/inet ./tests/inet
-%gobuild -o bin/dumpspec ./tests/dumpspec
-%gobuild -o bin/passwd ./tests/passwd
-%gobuild -o bin/crash ./tests/crash
-%gobuild -o bin/wait ./tests/wait
 %{__make} docs
 
 %install
@@ -162,10 +148,6 @@ cp bin/imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 cp bin/copy    %{buildroot}/%{_bindir}/%{name}-copy
 cp bin/tutorial %{buildroot}/%{_bindir}/%{name}-tutorial
 cp bin/inet     %{buildroot}/%{_bindir}/%{name}-inet
-cp bin/dumpspec %{buildroot}/%{_bindir}/%{name}-dumpspec
-cp bin/passwd %{buildroot}/%{_bindir}/%{name}-passwd
-cp bin/crash %{buildroot}/%{_bindir}/%{name}-crash
-cp bin/wait %{buildroot}/%{_bindir}/%{name}-wait
 
 rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 
@@ -190,11 +172,15 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
 %{_bindir}/%{name}-copy
 %{_bindir}/%{name}-tutorial
 %{_bindir}/%{name}-inet
-%{_bindir}/%{name}-dumpspec
-%{_bindir}/%{name}-passwd
-%{_bindir}/%{name}-crash
-%{_bindir}/%{name}-wait
 %{_datadir}/%{name}/test
 
 %changelog
+%if %{defined autochangelog}
 %autochangelog
+%else
+# NOTE: This changelog will be visible on CentOS 8 Stream builds
+# Other envs are capable of handling autochangelog
+* Fri Jun 16 2023 RH Container Bot <rhcontainerbot@fedoraproject.org>
+- Placeholder changelog for envs that are not autochangelog-ready.
+- Contact upstream if you need to report an issue with the build.
+%endif

sources

@@ -1 +1 @@
-SHA512 (v1.42.2.tar.gz) = adb1de700db9b589639f6fd02cad95d9bedacb9d0363838315f33c978a8c900570d55af95073992ff69cff4f2a9d18776c5d786af294aaa1604144580c957414
+SHA512 (v1.40.0.tar.gz) = bb96d04a17ab5a77e5d984dca369e3890131044c505ae3b030d95ffd66378df22da33315a50c9e500e783345ded23ebacdfa0965002a18e1d929c5fa3ce39311

tests/tmt/system.fmf

@@ -9,15 +9,8 @@ environment:
     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