[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/, sys-apps/minijail/files/
commit: e7f4fe21ae8bea2ddc3f7eb8947fd9ec35373d64 Author: Sam James gentoo org> AuthorDate: Thu Jun 29 11:47:45 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jun 29 11:50:39 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f4fe21 sys-apps/minijail: EAPI 8, rebase patches Signed-off-by: Sam James 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 ..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() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/
commit: ae5a6bbf007f04d6fd7606dd2b29da2632743ecc Author: Sam James gentoo org> AuthorDate: Thu Jun 29 11:51:01 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jun 29 11:51:01 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5a6bbf sys-apps/minijail: add github upstream metadata Signed-off-by: Sam James gentoo.org> sys-apps/minijail/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys-apps/minijail/metadata.xml b/sys-apps/minijail/metadata.xml index 7b5b4ce46bdf..b60ec207b068 100644 --- a/sys-apps/minijail/metadata.xml +++ b/sys-apps/minijail/metadata.xml @@ -7,4 +7,7 @@ chutz...@gentoo.org + + google/minijail +
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/
commit: 185d6bf7e799347eb83dac97e676619f4f62084a Author: krishjainx u rochester edu> AuthorDate: Thu Jun 29 01:39:29 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jun 29 11:46:57 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=185d6bf7 sys-apps/minijail: add v18 Signed-off-by: Krish Jain u.rochester.edu> Closes: https://github.com/gentoo/gentoo/pull/31663 Signed-off-by: Sam James gentoo.org> sys-apps/minijail/Manifest | 1 + sys-apps/minijail/minijail-18.ebuild | 78 2 files changed, 79 insertions(+) diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index 042269d56f7a..068c3a1c0570 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1 +1,2 @@ DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf +DIST minijail-18.tar.gz 223537 BLAKE2B 894cca4bd31b12e74a309a99d98eefe24f57e4dae186e79b5800b9857ef6b87c2094ead9a1788d00557d68b0d174bdf1e22f247ffb4fbb2d44a952a8df2c953d SHA512 685f744b4783600b4c91ec678ae87dd9ae0138638e1e754520f406c203f4d92f6b510b1bcf1a921b9e93965026c461d6fe8e5efb5f90393a54ca27db7c8033e5 diff --git a/sys-apps/minijail/minijail-18.ebuild b/sys-apps/minijail/minijail-18.ebuild new file mode 100644 index ..ed7487be73ac --- /dev/null +++ b/sys-apps/minijail/minijail-18.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/
commit: 938d4ab4c924cceb259cced0c8d3dffe81c654d2 Author: Sam James gentoo org> AuthorDate: Sat Jun 11 05:26:47 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jun 11 05:36:02 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=938d4ab4 sys-apps/minijail: drop 12 Closes: https://bugs.gentoo.org/732014 Closes: https://bugs.gentoo.org/770940 Signed-off-by: Sam James gentoo.org> sys-apps/minijail/Manifest | 1 - sys-apps/minijail/minijail-12.ebuild | 77 2 files changed, 78 deletions(-) diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index 1c7ceaf74b06..042269d56f7a 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1,2 +1 @@ -DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf diff --git a/sys-apps/minijail/minijail-12.ebuild b/sys-apps/minijail/minijail-12.ebuild deleted file mode 100644 index 9f0c093fd994.. --- 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 -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/, sys-apps/minijail/files/
commit: 2bbf7e85f8cb017c7324afd4c49e5b10b814980c Author: Sam James gentoo org> AuthorDate: Sat Jun 11 05:26:30 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jun 11 05:36:01 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbf7e85 sys-apps/minijail: drop Werror Closes: https://bugs.gentoo.org/732014 Closes: https://bugs.gentoo.org/770940 Signed-off-by: Sam James gentoo.org> sys-apps/minijail/files/minijail-17-no-werror.patch | 13 + sys-apps/minijail/minijail-17.ebuild| 3 ++- 2 files changed, 15 insertions(+), 1 deletion(-) 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 ..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-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() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/files/
commit: d90adc3f699c3a53acbc72aab4e0cc5830fcb1b4 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Sep 26 10:29:14 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Sep 26 11:26:51 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d90adc3f sys-apps/minijail: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/22411 Package-Manager: Portage-3.0.23, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> sys-apps/minijail/files/minijail-9-makefile.patch | 44 --- 1 file changed, 44 deletions(-) diff --git a/sys-apps/minijail/files/minijail-9-makefile.patch b/sys-apps/minijail/files/minijail-9-makefile.patch deleted file mode 100644 index 6ec44a8079a..000 --- a/sys-apps/minijail/files/minijail-9-makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/Makefile b/Makefile -index 54ee978..a50ee9a 100644 a/Makefile -+++ b/Makefile -@@ -46,8 +46,8 @@ ifeq ($(USE_SYSTEM_GTEST),no) - GTEST_CXXFLAGS := -std=gnu++14 - GTEST_LIBS := gtest.a - else --GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) --GTEST_LIBS := $(shell gtest-config --libs) -+GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags) -+GTEST_LIBS ?= $(shell gtest-config --libs) - endif - - CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \ -@@ -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) - -diff --git a/common.mk b/common.mk -index 77879d8..1cd815b 100644 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
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/
commit: 854a0ebfae3b4afa7dd8eb9577ac3fa15a2dd8d9 Author: Mike Frysinger gentoo org> AuthorDate: Fri Sep 24 14:20:21 2021 + Commit: Mike Frysinger gentoo org> CommitDate: Fri Sep 24 14:36:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=854a0ebf sys-apps/minijail: drop old version 9 Signed-off-by: Mike Frysinger gentoo.org> sys-apps/minijail/Manifest | 1 - sys-apps/minijail/minijail-9.ebuild | 72 - 2 files changed, 73 deletions(-) diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index b48d120cca4..4de10bcb332 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1,2 +1 @@ DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 -DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717 diff --git a/sys-apps/minijail/minijail-9.ebuild b/sys-apps/minijail/minijail-9.ebuild deleted file mode 100644 index bca6a443264..000 --- a/sys-apps/minijail/minijail-9.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 2019-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 ~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-9-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 - export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)" - export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)" -} - -src_compile() { - tc-env_build emake VERBOSE=1 all parse_seccomp_policy -} - -src_test() { - GTEST_FILTER="-NamespaceTest.test_tmpfs_userns:NamespaceTest.test_namespaces" \ - tc-env_build emake VERBOSE=1 tests -} - -src_install() { - dosbin minijail0 - dolib.so libminijail{,preload}.so - dobin parse_seccomp_policy - - doman minijail0.[15] - - 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 - doins scoped_minijail.h -}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/
commit: b49c70025769eb840e0df421d4b1a17870ae9d38 Author: Mike Frysinger gentoo org> AuthorDate: Fri Sep 24 14:21:14 2021 + Commit: Mike Frysinger gentoo org> CommitDate: Fri Sep 24 14:36:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b49c7002 sys-apps/minijail: version bump to 17 Signed-off-by: Mike Frysinger gentoo.org> sys-apps/minijail/Manifest | 1 + sys-apps/minijail/minijail-17.ebuild | 77 2 files changed, 78 insertions(+) diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index 4de10bcb332..1c7ceaf74b0 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1 +1,2 @@ DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 +DIST minijail-17.tar.gz 212425 BLAKE2B 411a0e2f1af21dd689fa669f9658e78c3c3c6439fdbea01b41b1d0cb3cbc1dc017634177350a3d5392783201f80874ec2a1604ed2577dbf5d7dbdf584a087267 SHA512 4b9aa29a78f7525ffeedfb927f6b567044ff7c9d32ef0e6771ed2b5c2d47c7a14ccbe000efc988ce6bb4173c5a9ae734b222aac1a00fb0e60777d7dccc149acf diff --git a/sys-apps/minijail/minijail-17.ebuild b/sys-apps/minijail/minijail-17.ebuild new file mode 100644 index 000..9f0c093fd99 --- /dev/null +++ b/sys-apps/minijail/minijail-17.ebuild @@ -0,0 +1,77 @@ +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/
commit: 7e98e8c28891a994738be4734f468d9bb1fb1d0b Author: Sam James gentoo org> AuthorDate: Wed Apr 7 05:14:25 2021 + Commit: Sam James gentoo org> CommitDate: Tue Apr 13 00:26:28 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e98e8c2 sys-apps/minijail: call pkg-config via toolchain-funcs.eclass helper This ensures we call the correct pkg-config in e.g. cross. Package-Manager: Portage-3.0.14-prefix, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> sys-apps/minijail/minijail-9.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys-apps/minijail/minijail-9.ebuild b/sys-apps/minijail/minijail-9.ebuild index a11b63da62a..bca6a443264 100644 --- a/sys-apps/minijail/minijail-9.ebuild +++ b/sys-apps/minijail/minijail-9.ebuild @@ -1,4 +1,4 @@ -# Copyright 2019 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -40,8 +40,8 @@ src_configure() { export LIBDIR="/usr/$(get_libdir)" export USE_seccomp="$(usex seccomp)" export USE_SYSTEM_GTEST=yes - export GTEST_CXXFLAGS="$(pkg-config --cflags gtest_main)" - export GTEST_LIBS="$(pkg-config --libs gtest_main)" + export GTEST_CXXFLAGS="$($(tc-getPKG_CONFIG) --cflags gtest_main)" + export GTEST_LIBS="$($(tc-getPKG_CONFIG) --libs gtest_main)" } src_compile() {
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/files/, sys-apps/minijail/
commit: 62cb6701ed08aaa7afcc397577bb4734293ebdc2 Author: Mike Frysinger chromium org> AuthorDate: Sat Jan 25 08:58:32 2020 + Commit: Mike Frysinger gentoo org> CommitDate: Sat Jan 25 08:58:58 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62cb6701 sys-apps/minijail: version bump to 12 Signed-off-by: Mike Frysinger gentoo.org> sys-apps/minijail/Manifest | 1 + sys-apps/minijail/files/minijail-12-makefile.patch | 41 sys-apps/minijail/minijail-12.ebuild | 77 ++ 3 files changed, 119 insertions(+) diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest index 96fa50c32ca..b48d120cca4 100644 --- a/sys-apps/minijail/Manifest +++ b/sys-apps/minijail/Manifest @@ -1 +1,2 @@ +DIST minijail-12.tar.gz 157030 BLAKE2B 55a1bb2aeb31290c211da8b8322672abadab7a2729b0afd6eafce9854a51320a2515bedc54864debc7ede6e437607dad8532ae76c14828d6c4f4265fec404dbe SHA512 feb829fc113f0041b9ab25e845560af47408f3d5f0704cdf756d0b8162ae7aae331c350908c3b17a4a5593ffa7326044f222a35e6794471cd5ed60173b2befa2 DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717 diff --git a/sys-apps/minijail/files/minijail-12-makefile.patch b/sys-apps/minijail/files/minijail-12-makefile.patch new file mode 100644 index 000..10d97197bb0 --- /dev/null +++ b/sys-apps/minijail/files/minijail-12-makefile.patch @@ -0,0 +1,41 @@ +--- 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 diff --git a/sys-apps/minijail/minijail-12.ebuild b/sys-apps/minijail/minijail-12.ebuild new file mode 100644 index 000..bf20c5f832a --- /dev/null +++ b/sys-apps/minijail/minijail-12.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2020 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 ~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()
[gentoo-commits] repo/gentoo:master commit in: sys-apps/minijail/, sys-apps/minijail/files/
commit: 9981dc903cb650313d13401a99c193be7a8cb4ee Author: David Coles gmail com> AuthorDate: Wed Jun 19 21:19:50 2019 + Commit: Patrick McLean gentoo org> CommitDate: Wed Jun 19 21:20:19 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9981dc90 sys-apps/minijail: New package Copyright: Sony Interactive Entertainment Inc. Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Patrick McLean gentoo.org> sys-apps/minijail/Manifest| 1 + sys-apps/minijail/files/minijail-9-makefile.patch | 44 ++ sys-apps/minijail/metadata.xml| 10 sys-apps/minijail/minijail-9.ebuild | 71 +++ 4 files changed, 126 insertions(+) diff --git a/sys-apps/minijail/Manifest b/sys-apps/minijail/Manifest new file mode 100644 index 000..96fa50c32ca --- /dev/null +++ b/sys-apps/minijail/Manifest @@ -0,0 +1 @@ +DIST minijail-9.tar.gz 118700 BLAKE2B 7d2959d5dd71bd9d8d8a0b7c278dab66771740f73acec20f19502da33990ca858796b4734676ffedc404cef72eee8c419c669ba7092ac00cbafa2e410564aba2 SHA512 6d05fbe8615f410e8314045d11f7a3638f563f3311f7d52b5a0c47cad8692d11b0a7db4fbb45141b56453a9beb0de7683d58e5298f0a27029aa017539bb48717 diff --git a/sys-apps/minijail/files/minijail-9-makefile.patch b/sys-apps/minijail/files/minijail-9-makefile.patch new file mode 100644 index 000..6ec44a8079a --- /dev/null +++ b/sys-apps/minijail/files/minijail-9-makefile.patch @@ -0,0 +1,44 @@ +diff --git a/Makefile b/Makefile +index 54ee978..a50ee9a 100644 +--- a/Makefile b/Makefile +@@ -46,8 +46,8 @@ ifeq ($(USE_SYSTEM_GTEST),no) + GTEST_CXXFLAGS := -std=gnu++14 + GTEST_LIBS := gtest.a + else +-GTEST_CXXFLAGS := $(shell gtest-config --cxxflags) +-GTEST_LIBS := $(shell gtest-config --libs) ++GTEST_CXXFLAGS ?= $(shell gtest-config --cxxflags) ++GTEST_LIBS ?= $(shell gtest-config --libs) + endif + + CORE_OBJECT_FILES := libminijail.o syscall_filter.o signal_handler.o \ +@@ -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) + +diff --git a/common.mk b/common.mk +index 77879d8..1cd815b 100644 +--- 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/metadata.xml b/sys-apps/minijail/metadata.xml new file mode 100644 index 000..aa105de6900 --- /dev/null +++ b/sys-apps/minijail/metadata.xml @@ -0,0 +1,10 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + + coles.da...@gmail.com + + + chutz...@gentoo.org + + diff --git a/sys-apps/minijail/minijail-9.ebuild b/sys-apps/minijail/minijail-9.ebuild new file mode 100644 index 000..3daec8d2d3b --- /dev/null +++ b/sys-apps/minijail/minijail-9.ebuild @@ -0,0 +1,71 @@ +# Copyright 2019 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 ~x86" +IUSE="+seccomp 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-9-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 + export GTEST_CXXFLAGS="$(pkg-config --cflags gtest_main)" + export GTEST_LIBS="$(pkg-config --libs gtest_main)" +} + +src_compile() { +