From 2771f79232c273bc2a57d23bf335dd81ccf6af28 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 5 Dec 2021 02:47:11 +0000 Subject: gentoo resync : 05.12.2021 --- app-benchmarks/Manifest.gz | Bin 4523 -> 4527 bytes app-benchmarks/stress-ng/Manifest | 6 +-- app-benchmarks/stress-ng/metadata.xml | 3 ++ app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild | 42 ---------------- app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild | 56 ++++++++++++++++++++++ 5 files changed, 62 insertions(+), 45 deletions(-) delete mode 100644 app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild create mode 100644 app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild (limited to 'app-benchmarks') diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz index fc853617eafb..47411aea4d81 100644 Binary files a/app-benchmarks/Manifest.gz and b/app-benchmarks/Manifest.gz differ diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest index 4e3c9effa60b..d80034ae09d5 100644 --- a/app-benchmarks/stress-ng/Manifest +++ b/app-benchmarks/stress-ng/Manifest @@ -1,3 +1,3 @@ -DIST stress-ng-0.13.06.tar.gz 1014981 BLAKE2B a93ff571919707568cd0162479e47c6241b4081713cfa88b30594227d01f9af2a6e3ad759ba62f5f5485322d68768ba1ea19087d07281fa1c2b949bcac99f70e SHA512 7aefc794edaa5799f96dd4afe099b747d532e4367bd372b9ed29db03f8276322113509fdd4885500864d292beeb9f407dc3f2ef2a04f92b65f240ee73eb174bb -EBUILD stress-ng-0.13.06.ebuild 887 BLAKE2B 79e1a5abfefd3a3aae4aa62926d5ba7f8ed37936178a7918088271d55d3b25a74bd5d174c2d08db015d3294fd8f45ce868c1c132b041d8da9b048ac54ab196c4 SHA512 cc51cb4c9b0a623103b7f1a4b6ff0ddef61ba87d3ec28a81bbc21a3c3e6d7bfddbe09f5963d1c126e804c4cd9b84f4163dde6a03ccd80c0d37b23f52481468c0 -MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99 +DIST stress-ng-0.13.07.tar.gz 1020232 BLAKE2B 54d2e01877420f0a9b03f1d2ffc3665b3d06def29f5d1370ca312a0c3a1453cebd5254e00aa0c0bbda1146785c26047d459e1e844bf3d47348f92529e93c029d SHA512 ec8f483c34c35ee9171f65e24614a3d4855d90cdfdc6c2d075ff86a2919e1c774ee5da0601e9e30d1c1f7fa7b146bf877de13e3deb88c892b703eb1b4c41e960 +EBUILD stress-ng-0.13.07.ebuild 1103 BLAKE2B 7215bbf65e925831b51960299b3ab885aa66f132690b3ae5a52e7f510f62672826187861986f0e8ed21af3b0046029de9ddd1fb6adcfd40c341f8d9c85d1db1f SHA512 c3c4b58e363f09c5f625e24d229bbcb807f83c392656259c9440f68ddf6f7e58ee2fadf524d53f7952c5c6fbdff9699daabc2d945dbf5907cde769edc507acae +MISC metadata.xml 907 BLAKE2B a9669ec80f735f02c77ac78ceba8b49634346d92c1d10a1288559e2440241d8e75d6de970ae232f2d6b42f12258ffa826de513ba862eaba581faf5f44737d4e6 SHA512 12c241b1df81be6527cc5faa80cb177941dd25cfe3bd29ce8b9ba5a90457834a50c11a8d66b7bd6ad27a3959038d4eded4822ed85df924aa2f71bb9b9b667e13 diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml index cf330e398b38..70cc32340938 100644 --- a/app-benchmarks/stress-ng/metadata.xml +++ b/app-benchmarks/stress-ng/metadata.xml @@ -13,6 +13,9 @@ that exercise floating point, integer, bit manipulation and control flow and over 20 virtual memory stress tests. + + Add support for AppArmor. + https://github.com/ColinIanKing/stress-ng/issues ColinIanKing/stress-ng diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild deleted file mode 100644 index a91c3da6c136..000000000000 --- a/app-benchmarks/stress-ng/stress-ng-0.13.06.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit optfeature toolchain-funcs - -DESCRIPTION="Stress test for a computer system with various selectable ways" -HOMEPAGE="https://github.com/ColinIanKing/stress-ng" -SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" - -DEPEND=" - dev-libs/libaio - dev-libs/libbsd - dev-libs/libgcrypt:0= - sys-apps/attr - sys-apps/keyutils:= - sys-libs/libcap - sys-libs/zlib - virtual/libcrypt:= -" - -RDEPEND="${DEPEND}" - -DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" ) - -src_compile() { - export MAN_COMPRESS=0 - export VERBOSE=1 - tc-export CC - - default -} - -pkg_postinst() { - optfeature "AppArmor support" sys-libs/libapparmor - optfeature "SCTP support" net-misc/lksctp-tools -} diff --git a/app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild b/app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild new file mode 100644 index 000000000000..9dc84c767ecd --- /dev/null +++ b/app-benchmarks/stress-ng/stress-ng-0.13.07.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit linux-info toolchain-funcs + +DESCRIPTION="Stress test for a computer system with various selectable ways" +HOMEPAGE="https://github.com/ColinIanKing/stress-ng" +SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="apparmor sctp" + +DEPEND=" + dev-libs/libaio + dev-libs/libbsd + dev-libs/libgcrypt:0= + sys-apps/attr + sys-apps/keyutils:= + sys-libs/libcap + sys-libs/zlib + virtual/libcrypt:= + apparmor? ( + sys-apps/apparmor-utils + sys-libs/libapparmor + ) + sctp? ( net-misc/lksctp-tools ) +" + +RDEPEND="${DEPEND}" + +DOCS=( "README.md" "README.Android" "TODO" "syscalls.txt" ) + +pkg_pretend() { + if use apparmor; then + CONFIG_CHECK="SECURITY_APPARMOR" + check_extra_config + fi +} + +src_compile() { + tc-export CC + + export MAN_COMPRESS="0" + + local myemakeopts=( + HAVE_APPARMOR="$(usex apparmor 1 0)" + HAVE_LIB_SCTP="$(usex sctp 1 0)" + VERBOSE="1" + ) + + emake "${myemakeopts[@]}" +} -- cgit v1.2.3