gentoo resync : 12.05.2022

4 files changed, 96 insertions, 1 deletions

diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 33e7bd9766c6..fc0aa681a2cb 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,5 +1,8 @@
+AUX bubblewrap-0.6.1-clang-printf.patch 849 BLAKE2B 6bbe5259c1e6e80ca8547dda8df92ebc63a9807a4bafcbce02601afe1e625661a7f2f95222be72853e53d57c6e7704084641acf4644731a04fd791753cd4de6a SHA512 8c2a26a5a0814b8d1d69aa0d0790c99bde2b170dc72751b6edf6515b6457a5b7b9fa25e7f5d6fa35340f094ee125eaeec2ea0ae5273ed0d267cedc9623c17023
 DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a87f8df9900c0c603c7ee870cf84c617a0c2ad99a5979cc1dd22740d652155fa6049e717eb210c9a83afe516daa107 SHA512 b1f5bde9562bf3176c51fdc22304b901e00e1de5189d9b5479aed7b651b84bed5539fc5bb3b1db58a05da4a57d69c9f41c40e15aa5a575746630e015674a02b7
 DIST bubblewrap-0.6.1.tar.xz 145500 BLAKE2B 8f8f69c5314843be1ac8c52d462ce2b17fc88760274b71837793a3e8dbf87623b80b7ae094131cee896644b53f4761388638d21b1575d1887eb755880bb05845 SHA512 68e07812ff5e01de2b7a0ce66e8386ca3662fd071d4e9b4c4afa611c1589c0ed116e0ebb4c03eae3f707f908d86945e157f8b26ff872c2814889dde92df9c60b
+DIST bubblewrap-0.6.2.tar.xz 146312 BLAKE2B bf02e9095cd1e80b84e0439d14ce57fc9bb08f9f0d3596a19eb34a55bd03b9d371368eda75f2b2106d47db29d1c2d9845fe2a12f5d0c554bbb532c9e0e53d368 SHA512 235da019cb370ea6d9328352acb38e6ff368f02f71db1ae85f2dd37655757975bd5b57bbe15f7b419b53a26b8ec3edd81b55893b420d5f42d6a9dab3471d0096
 EBUILD bubblewrap-0.5.0.ebuild 1062 BLAKE2B 9ba535294ccb822020fbf22e435ca43cc5634e3da93e7075d243a6cc5d9635d4a153a45bddfb222a43b225cc2d1f8371882e5fb69002a0155836ded53122b87f SHA512 80325583f448ead83579c1c76daa25532066c6596ca0b3b75636e30323093aa751fe12e682c440c71d0521ef68a6ed0365a9123b0bc0b721eb59cff43c04f550
-EBUILD bubblewrap-0.6.1.ebuild 1169 BLAKE2B 940bb12e461f7701c6300b634ea505d5a31f5ed9f8e8615cdc01d4df2b0ae231c92272d7f41b0ca784b8fd9bdc2b34c8eb75bc2ca28c074acd767b8aea74064d SHA512 17abf8ba4a3c6bc2faa6e4c5dbc9e31184b9f2b493b151b304986b69638c80614dea413487ebbd1431bf789211a66e5271d91961501b22c3549f977bdc152647
+EBUILD bubblewrap-0.6.1.ebuild 1221 BLAKE2B 5e8c71cb6940903495fab06e9aaf0695bac8d90a2d6faf502f1579fe826c9b1f6fa1bf713fc4889e3adcff5867ec3b8f50fea23a02dbc8c30f92e1736e14ae70 SHA512 fb0ce3dc2d2f2f6f659f4c2daf337bd052de4dfa3885063783da97b985a17bf3b9e024b72c207fc2cba6f9b996bd5a5d7a51995c581a7d2f865e4843a6615400
+EBUILD bubblewrap-0.6.2.ebuild 1158 BLAKE2B a9be2f08496b1260d304dac11fb2a066ec7dc6cddaf8b3f4383c6794440e9c5a4b6b3e0c3b6e0e5f3cc4f73e8d2223dfdaca2002b03efc2cdbde37f25510afbf SHA512 30576d630d9b62e0a19590721bbdf3c84696a59bedd571e15da7121dd8371ebbd06c308c0687cb0ef00b3b0959aa62983c68f61599ad3c588421834c9ea54d2c
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
index cc06208a257a..388a422db4d4 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.1.ebuild
@@ -30,6 +30,10 @@ BDEPEND="
 # tests require root priviledge
 RESTRICT="test"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-clang-printf.patch
+)
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		CONFIG_CHECK="~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS"
diff --git a/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
new file mode 100644
index 000000000000..a7941bb7f15f
--- /dev/null
+++ b/sys-apps/bubblewrap/bubblewrap-0.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit 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 ~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"
+
+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
+		-Dman=enabled
+		-Dtests=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
+}
diff --git a/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch b/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch
new file mode 100644
index 000000000000..7c7e0ff29988
--- /dev/null
+++ b/sys-apps/bubblewrap/files/bubblewrap-0.6.1-clang-printf.patch
@@ -0,0 +1,30 @@
+https://github.com/containers/bubblewrap/commit/08dc2bb54658e003724f570224541a674645d87f.patch
+https://bugs.gentoo.org/834912
+
+From 08dc2bb54658e003724f570224541a674645d87f Mon Sep 17 00:00:00 2001
+From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+Date: Fri, 18 Mar 2022 10:25:51 +0100
+Subject: [PATCH] tests: properly tag ok as being printf-like
+
+Avoids breaking warning with clang
+
+Fixes #478
+
+Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
+---
+ tests/test-utils.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/test-utils.c b/tests/test-utils.c
+index c9b859d2..41874a15 100644
+--- a/tests/test-utils.c
++++ b/tests/test-utils.c
+@@ -25,6 +25,8 @@
+ 
+ /* A small implementation of TAP */
+ static unsigned int test_number = 0;
++
++__attribute__((format(printf, 1, 2)))
+ static void
+ ok (const char *format, ...)
+ {