diff --git a/.bubblewrap.metadata b/.bubblewrap.metadata new file mode 100644 index 0000000..fa6c7a6 --- /dev/null +++ b/.bubblewrap.metadata @@ -0,0 +1 @@ +00e121950ea494fcd9cfbe23971c0938d6be6755 bubblewrap-0.4.1.tar.xz diff --git a/0001-Accept-EROFS-for-access-check-of-proc-entries.patch b/0001-Accept-EROFS-for-access-check-of-proc-entries.patch new file mode 100644 index 0000000..871ffdf --- /dev/null +++ b/0001-Accept-EROFS-for-access-check-of-proc-entries.patch @@ -0,0 +1,26 @@ +From 4c35d7a5f92499d6ed646d4a5ffad9acc10cb432 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=C3=BCrg=20Billeter?= +Date: Tue, 18 Aug 2020 17:33:49 +0200 +Subject: [PATCH] Accept EROFS for access() check of /proc entries + +This is required to work in a Docker container. +--- + bubblewrap.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/bubblewrap.c b/bubblewrap.c +index e1a4629..d65ffef 100644 +--- a/bubblewrap.c ++++ b/bubblewrap.c +@@ -1148,7 +1148,7 @@ setup_newroot (bool unshare_pid, + if (access (subdir, W_OK) < 0) + { + /* The file is already read-only or doesn't exist. */ +- if (errno == EACCES || errno == ENOENT) ++ if (errno == EACCES || errno == ENOENT || errno == EROFS) + continue; + + die_with_error ("Can't access %s", subdir); +-- +2.44.0 + diff --git a/bubblewrap.spec b/bubblewrap.spec index d8d7f65..38b741b 100644 --- a/bubblewrap.spec +++ b/bubblewrap.spec @@ -1,6 +1,6 @@ Name: bubblewrap Version: 0.4.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Core execution tool for unprivileged containers License: LGPLv2+ @@ -8,6 +8,7 @@ License: LGPLv2+ URL: https://github.com/projectatomic/bubblewrap Source0: https://github.com/projectatomic/bubblewrap/releases/download/v%{version}/bubblewrap-%{version}.tar.xz Patch0: 0001-Avoid-memory-leak-if-args-is-specified-multiple-time.patch +Patch1: 0001-Accept-EROFS-for-access-check-of-proc-entries.patch BuildRequires: autoconf automake libtool BuildRequires: gcc @@ -47,6 +48,9 @@ find %{buildroot} -name '*.la' -delete -print %{_mandir}/man1/* %changelog +* Fri Mar 15 2024 Daan De Meyer - 0.4.1-7 +- Backport https://github.com/containers/bubblewrap/commit/4c35d7a5f92499d6ed646d4a5ffad9acc10cb432 + * Mon Aug 09 2021 Mohan Boddu - 0.4.1-6 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688