commit: e7f4fe21ae8bea2ddc3f7eb8947fd9ec35373d64 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu Jun 29 11:47:45 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu Jun 29 11:50:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f4fe21
sys-apps/minijail: EAPI 8, rebase patches Signed-off-by: Sam James <sam <AT> gentoo.org> sys-apps/minijail/files/minijail-18-makefile.patch | 41 ++++++++++++++++++++++ sys-apps/minijail/minijail-18.ebuild | 18 +++++----- 2 files changed, 50 insertions(+), 9 deletions(-) diff --git a/sys-apps/minijail/files/minijail-18-makefile.patch b/sys-apps/minijail/files/minijail-18-makefile.patch new file mode 100644 index 000000000000..c1a2509dff5a --- /dev/null +++ b/sys-apps/minijail/files/minijail-18-makefile.patch @@ -0,0 +1,41 @@ +--- a/Makefile ++++ b/Makefile +@@ -72,9 +72,9 @@ GTEST_CXXFLAGS := -std=gnu++14 + GTEST_LIBS := gtest.a + UNITTEST_DEPS += $(GTEST_LIBS) + else +-GTEST_CXXFLAGS := $(shell gtest-config --cxxflags 2>/dev/null || \ ++GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags 2>/dev/null || \ + echo "-pthread") +-GTEST_LIBS := $(shell gtest-config --libs 2>/dev/null || \ ++GTEST_LIBS ?= $(shell gtest-config --libs 2>/dev/null || \ + echo "-lgtest -pthread -lpthread") + endif + UNITTEST_LIBS += $(GTEST_LIBS) +@@ -104,6 +104,7 @@ clean: CLEAN(minijail0) + + + CC_LIBRARY(libminijail.so): LDLIBS += -lcap ++CC_LIBRARY(libminijail.so): LDFLAGS += -Wl,-soname,libminijail.so + CC_LIBRARY(libminijail.so): $(CORE_OBJECT_FILES) + clean: CLEAN(libminijail.so) + +@@ -125,6 +126,7 @@ TEST(CXX_BINARY(libminijail_unittest)): CC_LIBRARY(libminijailpreload.so) + + + CC_LIBRARY(libminijailpreload.so): LDLIBS += -lcap -ldl ++CC_LIBRARY(libminijailpreload.so): LDFLAGS += -Wl,-soname,libminijail.so + CC_LIBRARY(libminijailpreload.so): libminijailpreload.o $(CORE_OBJECT_FILES) + clean: CLEAN(libminijailpreload.so) + +--- a/common.mk ++++ b/common.mk +@@ -323,7 +323,7 @@ COMMON_CFLAGS := -Wall -Wunused -Wno-unused-parameter -Werror -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 +-CPPFLAGS += -D_FORTIFY_SOURCE=2 ++CPPFLAGS += + + # Enable large file support. + CPPFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE diff --git a/sys-apps/minijail/minijail-18.ebuild b/sys-apps/minijail/minijail-18.ebuild index ed7487be73ac..237a6aa5dafb 100644 --- a/sys-apps/minijail/minijail-18.ebuild +++ b/sys-apps/minijail/minijail-18.ebuild @@ -1,15 +1,15 @@ # Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 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" +S="${WORKDIR}/${PN}-linux-v${PV}" LICENSE="BSD" SLOT="0" @@ -18,17 +18,17 @@ IUSE="+seccomp test" RESTRICT="!test? ( test )" RDEPEND="sys-libs/libcap-ng:=" -DEPEND="${RDEPEND} +DEPEND=" + ${RDEPEND} test? ( - virtual/pkgconfig >=dev-cpp/gtest-1.8.0:= - )" - -S="${WORKDIR}/${PN}-linux-v${PV}" + ) +" +BDEPEND="test? ( virtual/pkgconfig )" PATCHES=( - "${FILESDIR}/minijail-12-makefile.patch" - "${FILESDIR}/minijail-17-no-werror.patch" + "${FILESDIR}/${PN}-18-makefile.patch" + "${FILESDIR}/${PN}-17-no-werror.patch" ) pkg_pretend() {
