rpms/buildah
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import UBI buildah-1.41.4-3.el9_7

Browse Source
This commit is contained in:
eabdullin 2025-11-11 16:11:07 +00:00
parent 133c109f9f
commit e43a8ac8b3
3 changed files with 75 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.buildah.metadata
View File

@ -1 +1 @@
fd02b65d517b3fc334a3d1d1a5cff158ab7711b2 SOURCES/v1.39.4.tar.gz
de524682d204c7adee42f1354a29590d491103b6 SOURCES/release-1.41-ee5b574.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/v1.39.4.tar.gz
SOURCES/release-1.41-ee5b574.tar.gz

90
SPECS/buildah.spec
View File

@ -9,6 +9,11 @@
%global gomodulesmode GO111MODULE=on
%global import_path github.com/containers/buildah
%global branch release-1.41
%global commit0 ee5b5742b0c5f8c879b140146b93971bb6a0d385
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%if %{defined fedora}
%define build_with_btrfs 1
%endif
@ -32,10 +37,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.4
Version: 1.41.4
# 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: 2%{?dist}
Release: 3%{?dist}
%if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future}
%else
@ -43,8 +48,11 @@ ExclusiveArch: aarch64 ppc64le s390x x86_64
%endif
Summary: A command line tool used for creating OCI Images
URL: https://%{name}.io
# Tarball fetched from upstream
Source: %{git0}/archive/v%{version}.tar.gz
%if 0%{?branch:1}
Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
%else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
%endif
BuildRequires: device-mapper-devel
BuildRequires: git-core
BuildRequires: golang >= 1.16.6
@ -56,11 +64,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 +87,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
@ -101,7 +113,11 @@ Requires: git-daemon
This package contains system tests for %{name}
%prep
%autosetup -Sgit -n %{name}-%{version}
%if 0%{?branch:1}
%autosetup -Sgit -n containers-%{name}-%{shortcommit0}
%else
%autosetup -Sgit -n %{name}-%{commit0}
%endif
%build
%set_build_flags
@ -119,9 +135,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 +149,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 +162,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,24 +188,60 @@ 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
* Wed Jun 04 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.4-2
- rebuild to fix CVE-2025-22871 buildah: Request smuggling due to acceptance of invalid chunked data in net/http
- Resolves: RHEL-89294
* Fri Oct 24 2025 Jan Kaluza <jkaluza@redhat.com> - 2:1.41.4-3
- fix the TMT tests
- Related: RHEL-115166
* Fri Mar 28 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.4-1
* Thu Oct 02 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.41.4-2
- rebuild as last build was built in the wrong tag
- Related: RHEL-115166
* Mon Sep 22 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.41.4-1
- update to the latest content of https://github.com/containers/buildah/tree/release-1.41
(https://github.com/containers/buildah/commit/ee5b574)
- fixes "buildah: create parent directories of mount targets with mode 0755 - [RHEL-9.7] 0day"
- Resolves: RHEL-115166
* Mon Aug 18 2025 Jindrich Novy <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 2:1.39.4-1
- update to https://github.com/containers/buildah/releases/tag/v1.39.4
- Resolves: RHEL-85114
- Related: RHEL-80816
* Thu Mar 27 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.3-1
* Tue Mar 18 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.3-1
- update to https://github.com/containers/buildah/releases/tag/v1.39.3
- Resolves: RHEL-85114
- Related: RHEL-80816
* Wed Mar 05 2025 Jindrich Novy <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 2:1.39.1-1
- update to https://github.com/containers/buildah/releases/tag/v1.39.1
- Resolves: RHEL-80999
- Resolves: RHEL-80612
* Mon Feb 24 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.0-3
- Add CNI explicitly in BUILDTAGS
- Resolves: RHEL-80396
* Thu Feb 13 2025 Jindrich Novy <jnovy@redhat.com> - 2:1.39.0-2
- sync spec with upstream