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

import Oracle_OSS buildah-1.41.8-3.0.1.el9_7

Browse Source
This commit is contained in:
AlmaLinux RelEng Bot 2026-04-27 02:50:49 -04:00
parent 4cbd953073
commit a54e45c89c
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
SOURCES/buildah-tests-skip-ignore-socket-case.patch Normal file
View File

@ -0,0 +1,18 @@
Signed-off-by: Darren Archibald <darren.archibald@oracle.com>
Drop nmap-ncat requirement and skip ignore-socket test case
Orabug: 34117178
----
diff -Nur buildah-19159983d3ecdb16df97eb4c887902363066b474.orig/tests/copy.bats buildah-19159983d3ecdb16df97eb4c887902363066b474/tests/copy.bats
--- buildah-19159983d3ecdb16df97eb4c887902363066b474.orig/tests/copy.bats 2022-07-05 09:10:11.000000000 -0700
+++ buildah-19159983d3ecdb16df97eb4c887902363066b474/tests/copy.bats 2022-08-09 07:30:15.052734677 -0700
@@ -260,6 +260,9 @@
}
@test "ignore-socket" {
+ if [[ ! -e /usr/bin/nc ]]; then
+ skip "skip ignore-socket test, this test needs nc"
+ fi
createrandom ${TEST_SCRATCH_DIR}/randomfile
# This seems to be the least-worst way to create a socket: run and kill nc
nc -lkU ${TEST_SCRATCH_DIR}/test.socket &

11
SPECS/buildah.spec
View File

@ -40,7 +40,7 @@ Epoch: 2
Version: 1.41.8
# 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.0.1%{?dist}
%if %{defined golang_arches_future}
ExclusiveArch: %{golang_arches_future}
%else
@ -53,6 +53,7 @@ Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar
%else
Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz
%endif
Patch1000: buildah-tests-skip-ignore-socket-case.patch
BuildRequires: device-mapper-devel
BuildRequires: git-core
BuildRequires: golang >= 1.16.6
@ -104,7 +105,6 @@ Requires: golang
Requires: jq
Requires: httpd-tools
Requires: openssl
Requires: nmap-ncat
Requires: git-daemon
%description tests
@ -193,6 +193,13 @@ rm %{buildroot}%{_datadir}/%{name}/test/system/tools/build/*
%{_datadir}/%{name}/test
%changelog
* Fri Apr 24 2026 EL Errata <el-errata_ww@oracle.com> - 1.41.8-3.0.1
- Drop nmap-ncat requirement and skip ignore-socket test case [Orabug: 34117178]
* Mon Apr 20 2026 Jindrich Novy <jnovy@redhat.com> - 2:1.41.8-3
- rebuild for CVE-2026-34986
- Resolves: RHEL-165027
* Thu Feb 19 2026 Jindrich Novy <jnovy@redhat.com> - 2:1.41.8-2
- Rebuild with golang 1.25.7 to fix CVE-2025-68121
- Resolves: RHEL-149617