diff --git a/.buildah.metadata b/.buildah.metadata index c78307d..decfec6 100644 --- a/.buildah.metadata +++ b/.buildah.metadata @@ -1 +1 @@ -2fbea7306e31c98ff45ced2197848d5af664ba8d SOURCES/v1.39.0.tar.gz +821dbe584ebaf5c8bef585991e18124dd532f013 SOURCES/v1.41.3.tar.gz diff --git a/.gitignore b/.gitignore index aa68064..ee3ab54 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.39.0.tar.gz +SOURCES/v1.41.3.tar.gz diff --git a/SPECS/buildah.spec b/SPECS/buildah.spec index d345256..dc4dcb1 100644 --- a/SPECS/buildah.spec +++ b/SPECS/buildah.spec @@ -32,10 +32,10 @@ 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.39.0 +Version: 1.41.3 # 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: 3%{?dist} +Release: 1%{?dist} %if %{defined golang_arches_future} ExclusiveArch: %{golang_arches_future} %else @@ -56,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 @@ -79,12 +79,16 @@ or * save container's root file system layer to create a new image * delete a working container or an image +# This subpackage is only intended for CI testing. +# Not meant for end user/customer usage. %package tests Summary: Tests for %{name} Requires: %{name} = %{epoch}:%{version}-%{release} -%if %{defined fedora} +%if %{defined bats_epel} Requires: bats +%else +Recommends: bats %endif Requires: bzip2 Requires: podman @@ -119,9 +123,9 @@ 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="cni seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh)" +export BUILDTAGS="cni seccomp $(hack/systemd_tag.sh) $(hack/libsubid_tag.sh) libsqlite3" %if !%{defined build_with_btrfs} -export BUILDTAGS+=" btrfs_noversion exclude_graphdriver_btrfs" +export BUILDTAGS+=" exclude_graphdriver_btrfs" %endif %if %{defined fips} @@ -133,6 +137,8 @@ export BUILDTAGS+=" libtrust_openssl" %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 %{__make} docs %install @@ -144,6 +150,8 @@ 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 rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* @@ -168,9 +176,43 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/* %{_bindir}/%{name}-copy %{_bindir}/%{name}-tutorial %{_bindir}/%{name}-inet +%{_bindir}/%{name}-dumpspec +%{_bindir}/%{name}-passwd %{_datadir}/%{name}/test %changelog +* Mon Aug 18 2025 Jindrich Novy - 2:1.41.3-1 +- update to https://github.com/containers/buildah/releases/tag/v1.41.3 +- Related: RHEL-80816 + +* Mon Aug 11 2025 Jindrich Novy - 2:1.41.1-1 +- update to https://github.com/containers/buildah/releases/tag/v1.41.1 +- Related: RHEL-80816 + +* Thu Jul 24 2025 Jindrich Novy - 2:1.41.0-1 +- update to https://github.com/containers/buildah/releases/tag/v1.41.0 +- Related: RHEL-80816 + +* Tue Jun 10 2025 Jindrich Novy - 2:1.40.1-1 +- update to https://github.com/containers/buildah/releases/tag/v1.40.1 +- Related: RHEL-80816 + +* Wed Apr 02 2025 Jindrich Novy - 2:1.39.4-1 +- update to https://github.com/containers/buildah/releases/tag/v1.39.4 +- Related: RHEL-80816 + +* Tue Mar 18 2025 Jindrich Novy - 2:1.39.3-1 +- update to https://github.com/containers/buildah/releases/tag/v1.39.3 +- Related: RHEL-80816 + +* Wed Mar 05 2025 Jindrich Novy - 2:1.39.2-1 +- update to https://github.com/containers/buildah/releases/tag/v1.39.2 +- Related: RHEL-80816 + +* Thu Feb 27 2025 Jindrich Novy - 2:1.39.1-1 +- update to https://github.com/containers/buildah/releases/tag/v1.39.1 +- Resolves: RHEL-80612 + * Mon Feb 24 2025 Jindrich Novy - 2:1.39.0-3 - Add CNI explicitly in BUILDTAGS - Resolves: RHEL-80396