mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
sys-apps/minijail: drop 17
Signed-off-by: Patrick McLean <chutzpah@gentoo.org>
This commit is contained in:
parent
2dd5290ede
commit
5b3da21293
@ -1,3 +1,2 @@
|
||||
DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf
|
||||
DIST minijail-18.tar.gz 223537 BLAKE2B 894cca4bd31b12e74a309a99d98eefe24f57e4dae186e79b5800b9857ef6b87c2094ead9a1788d00557d68b0d174bdf1e22f247ffb4fbb2d44a952a8df2c953d SHA512 685f744b4783600b4c91ec678ae87dd9ae0138638e1e754520f406c203f4d92f6b510b1bcf1a921b9e93965026c461d6fe8e5efb5f90393a54ca27db7c8033e5
|
||||
DIST minijail-2025.07.02.tar.gz 241105 BLAKE2B 651bb53bcd1119a1a1ae6188af9140f1d258bec4664a5eb72b2991d8aa7e8bba0bfe2f7c165197cd5d28aae4d7b660ba67ce3b34591b0a19fe7984c61f656ed9 SHA512 322f76c60dace90243f5b8d7c13afad5526c138e1789c9b6377fcbde45fc773fa55c8d39402fe1710a456f9258eb1714dc5bd0dff8bdebcd5a72e5a652935e6a
|
||||
|
||||
@ -1,41 +0,0 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -46,9 +46,9 @@ ifeq ($(USE_SYSTEM_GTEST),no)
|
||||
GTEST_CXXFLAGS := -std=gnu++14
|
||||
GTEST_LIBS := gtest.a
|
||||
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
|
||||
|
||||
@@ -73,6 +73,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)
|
||||
|
||||
@@ -91,6 +92,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
|
||||
@ -1,78 +0,0 @@
|
||||
# Copyright 1999-2022 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"
|
||||
"${FILESDIR}/minijail-17-no-werror.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
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user