sys-apps/bubblewrap: Sync with Gentoo

It's from Gentoo commit 4263dece079372ae7c07d3902d5293afabf2e66c.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2026-05-11 08:18:22 +00:00
parent f0b8a361cc
commit 31a32f9908
3 changed files with 137 additions and 0 deletions

View File

@ -1 +1,2 @@
DIST bubblewrap-0.11.0.tar.xz 115228 BLAKE2B 753ae172ccceb9de08422f03702922966cb6e6d2da262ffb61e3e207ff616166f4047a1cc47801e091cf9e85d6d179450704b3e99743c81d8f77e9c37094d816 SHA512 4b083ac42410dacfa75ad8764bbb300048ce8f28543ece393b9b7180b152108ee4b337f82539d63196b6f8f5bf194d9e10f49207e3b8417ee2cb4bde88a63eee
DIST bubblewrap-0.11.2.tar.xz 116336 BLAKE2B ae47e5672f79ed59cb84fe2ddd2fc1765c242e75659bbd397203b3c499292942633a6a9526f243df14abb3d932b8e0deb2ac239d61f7ec5b246ff68173f685ba SHA512 7c5a8d0670e8b2737328ab24fb3e3982544c716d2527e97f6e9dfa3ee767b0161681b4fd60e94ed17259ba52406a12968769ee1408648ba08239755858437edc

View File

@ -0,0 +1,65 @@
# Copyright 1999-2026 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit bash-completion-r1 linux-info meson
DESCRIPTION="Unprivileged sandboxing tool, namespaces-powered chroot-like solution"
HOMEPAGE="https://github.com/containers/bubblewrap/"
SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
IUSE="selinux suid"
RDEPEND="
sys-libs/libseccomp
sys-libs/libcap
selinux? ( >=sys-libs/libselinux-2.1.9 )
"
DEPEND="${RDEPEND}"
BDEPEND="
app-text/docbook-xml-dtd:4.3
app-text/docbook-xsl-stylesheets
dev-libs/libxslt
virtual/pkgconfig
"
# tests require root privileges
RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-0.11.2-no-werror.patch
)
pkg_setup() {
if [[ ${MERGE_TYPE} != buildonly ]]; then
CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
linux-info_pkg_setup
fi
}
src_configure() {
local emesonargs=(
-Dbash_completion=enabled
-Dbash_completion_dir="$(get_bashcompdir)"
-Dman=enabled
-Dtests=false
# whether bwrap will run under suid mode
-Dsupport_setuid=$(usex suid true false)
-Dzsh_completion=enabled
$(meson_feature selinux)
)
meson_src_configure
}
src_install() {
meson_src_install
if use suid; then
chmod u+s "${ED}"/usr/bin/bwrap
fi
}

View File

@ -0,0 +1,71 @@
https://bugs.gentoo.org/973225
--- a/meson.build
+++ b/meson.build
@@ -13,28 +13,28 @@ add_project_arguments('-D_GNU_SOURCE', language : 'c')
common_include_directories = include_directories('.')
# Keep this in sync with ostree, except remove -Wall (part of Meson
-# warning_level 2) and -Werror=declaration-after-statement
+# warning_level 2) and -Wdeclaration-after-statement
add_project_arguments(
cc.get_supported_arguments([
- '-Werror=shadow',
- '-Werror=empty-body',
- '-Werror=strict-prototypes',
- '-Werror=missing-prototypes',
- '-Werror=implicit-function-declaration',
- '-Werror=pointer-arith',
- '-Werror=init-self',
- '-Werror=missing-declarations',
- '-Werror=return-type',
- '-Werror=overflow',
- '-Werror=int-conversion',
- '-Werror=parenthesis',
- '-Werror=incompatible-pointer-types',
- '-Werror=misleading-indentation',
- '-Werror=missing-include-dirs',
- '-Werror=aggregate-return',
+ '-Wshadow',
+ '-Wempty-body',
+ '-Wstrict-prototypes',
+ '-Wmissing-prototypes',
+ '-Wimplicit-function-declaration',
+ '-Wpointer-arith',
+ '-Winit-self',
+ '-Wmissing-declarations',
+ '-Wreturn-type',
+ '-Woverflow',
+ '-Wint-conversion',
+ '-Wparenthesis',
+ '-Wincompatible-pointer-types',
+ '-Wmisleading-indentation',
+ '-Wmissing-include-dirs',
+ '-Waggregate-return',
# Extra warnings specific to bubblewrap
- '-Werror=switch-default',
+ '-Wswitch-default',
'-Wswitch-enum',
# Deliberately not warning about these, ability to zero-initialize
@@ -46,14 +46,14 @@ add_project_arguments(
)
if (
- cc.has_argument('-Werror=format=2')
- and cc.has_argument('-Werror=format-security')
- and cc.has_argument('-Werror=format-nonliteral')
+ cc.has_argument('-Wformat=2')
+ and cc.has_argument('-Wformat-security')
+ and cc.has_argument('-Wformat-nonliteral')
)
add_project_arguments([
- '-Werror=format=2',
- '-Werror=format-security',
- '-Werror=format-nonliteral',
+ '-Wformat=2',
+ '-Wformat-security',
+ '-Wformat-nonliteral',
], language : 'c')
endif