gentoo resync : 29.12.2022

4 files changed, 17 insertions, 81 deletions

diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest
index 213cfe26a682..b6618aa26139 100644
--- a/sys-apps/minijail/Manifest
+++ b/sys-apps/minijail/Manifest
@@ -1,6 +1,5 @@
 AUX minijail-12-makefile.patch 1511 BLAKE2B 74b620f44ffa3a3f82771d10dfff5999f223613ee734a38be770ac91e128c3e4f26cbbdff197a0636cb8c3b094c70fbed08443560bea095407736327f9d485ac SHA512 c727ff4752345f08d89dab5bc7489793763bf459bc169f132a285bc40c1d8e1e40d366bc8336e35c5362f4e4b999ec9d07db2b3bcd5f394954dae54cb533515a
-DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2
+AUX minijail-17-no-werror.patch 594 BLAKE2B 7afa3b6179ce975d8dac6496532222057db0f27c134b0fa6f783f1f18e7166d310ccfbaa387482fb27f91e7f9cf5b478267e6a4db2ced380efbcd77bfa1b7b6e SHA512 27f7e2c4ca046e86c81ec419fe745bc25547ff5217340af772b331448c19cbcb228835c3ddd1d2879e3b13bf59f85724dcf3cc455c22e0fd27ac81a28efd135d
 DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf
-EBUILD minijail-12.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6
-EBUILD minijail-17.ebuild 1804 BLAKE2B 7065e7c2dc8bdec18ab687e8b2cbc5ca8ca14adfbba4c1ebf2064d9da0f274823d35e1b79e30975824363373a59affdb795585376019ebd362562d5b59350f8a SHA512 bd180ef8ddfd13e061cac2e8cebf0f200817fd0f9b7894fa7e082461e910a773f670634ad4b889fe406a1dfdccb1f33ef7cdcb1bad5f81f149459eb127df8da6
+EBUILD minijail-17.ebuild 1847 BLAKE2B 4a29b4c111a215a627fca5349a3b00271e71985113dd4e820b48f27a230a886b440bc01101ff07de6b7ceab02c1381afaabe22adea07bba6f027b284679df606 SHA512 2a437e1cb4a841ee7898516f12ed688c7130ae0d8dd54617a8aeddfc185c83465910c6308eeaa50a26b53624f2e8cc43e7bfd04b5facf488282cd2840b7c5bfe
 MISC metadata.xml 316 BLAKE2B 1c0d0d8d3d56290e6c416abd016b8e9884d281b4c8700d5e229bbd820946c9b962c148f4d838b3206f091c9340d93febf69c8dab0af58101c5c5128fceea888e SHA512 f31d33694241be5dc691ca273d0712a062b84eaccb44adc3a50a1085a451543ff1c2d20960444474c2d32121a52c2b15c2510c802a59983534c6176906fbaaee
diff --git a/sys-apps/minijail/files/minijail-17-no-werror.patch b/sys-apps/minijail/files/minijail-17-no-werror.patch
new file mode 100644
index 000000000000..01d655f2bd55
--- /dev/null
+++ b/sys-apps/minijail/files/minijail-17-no-werror.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/770940
+https://bugs.gentoo.org/732014
+--- a/common.mk
++++ b/common.mk
+@@ -319,7 +319,7 @@ endif
+ # The same goes for CFLAGS.
+ COMMON_CFLAGS-gcc := -fvisibility=internal -ggdb3 -Wa,--noexecstack
+ COMMON_CFLAGS-clang := -fvisibility=hidden -ggdb
+-COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -Wformat=2 \
++COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Wformat=2 \
+   -fno-strict-aliasing $(SSP_CFLAGS) -O1
+ CXXFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CXXDRIVER)) -std=gnu++14
+ CFLAGS += $(COMMON_CFLAGS) $(COMMON_CFLAGS-$(CDRIVER)) -std=gnu11
diff --git a/sys-apps/minijail/minijail-12.ebuild b/sys-apps/minijail/minijail-12.ebuild
deleted file mode 100644
index 9f0c093fd994..000000000000
--- a/sys-apps/minijail/minijail-12.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="helper binary and library for sandboxing & restricting privs of service"
-HOMEPAGE="https://android.googlesource.com/platform/external/minijail"
-
-# Use GitHub mirror as Gitiles doesn't generate stable tarballs.
-SRC_URI="https://github.com/google/${PN}/archive/linux-v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="+seccomp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/libcap-ng:="
-DEPEND="${RDEPEND}
-	test? (
-		virtual/pkgconfig
-		>=dev-cpp/gtest-1.8.0:=
-	)"
-
-S="${WORKDIR}/${PN}-linux-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/minijail-12-makefile.patch"
-)
-
-pkg_pretend() {
-	local CONFIG_CHECK="~NAMESPACES ~UTS_NS ~IPC_NS ~USER_NS ~PID_NS ~NET_NS
-		~SECCOMP ~SECCOMP_FILTER ~CGROUPS"
-	check_extra_config
-}
-
-src_configure() {
-	export LIBDIR="/usr/$(get_libdir)"
-	export USE_seccomp="$(usex seccomp)"
-	export USE_SYSTEM_GTEST=yes
-	if use test; then
-		export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)"
-		export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)"
-	else
-		export GTEST_CXXFLAGS='' GTEST_LIBS=''
-	fi
-	export VERBOSE=1
-}
-
-src_compile() {
-	tc-env_build emake all parse_seccomp_policy
-}
-
-src_test() {
-	GTEST_FILTER="-NamespaceTest.test_tmpfs_userns:NamespaceTest.test_namespaces" \
-		tc-env_build emake tests
-}
-
-src_install() {
-	dosbin minijail0
-	dolib.so libminijail{,preload}.so
-	dobin parse_seccomp_policy
-
-	doman minijail0.[15]
-	dodoc README.md
-
-	local include_dir="/usr/include"
-
-	"${S}"/platform2_preinstall.sh "${PV}" "${include_dir}"
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins libminijail.pc
-
-	insinto "${include_dir}"
-	doins libminijail.h scoped_minijail.h
-}
diff --git a/sys-apps/minijail/minijail-17.ebuild b/sys-apps/minijail/minijail-17.ebuild
index 9f0c093fd994..f9192fecbd38 100644
--- a/sys-apps/minijail/minijail-17.ebuild
+++ b/sys-apps/minijail/minijail-17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -28,6 +28,7 @@ S="${WORKDIR}/${PN}-linux-v${PV}"
 
 PATCHES=(
 	"${FILESDIR}/minijail-12-makefile.patch"
+	"${FILESDIR}/minijail-17-no-werror.patch"
 )
 
 pkg_pretend() {