gentoo auto-resync : 05:01:2024 - 20:03:55

5 files changed, 69 insertions, 4 deletions

diff --git a/app-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index ae79961852cb..a6efc555d102 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
index 260f2ac1a773..90fbc1642856 100644
--- a/app-benchmarks/stress-ng/Manifest
+++ b/app-benchmarks/stress-ng/Manifest
@@ -1,3 +1,5 @@
+DIST stress-ng-0.15.06.tar.gz 3813785 BLAKE2B ebed2b6b087afc615e3a94ae239df32a7847f1ddc5db83a733ce8415d76818000bb742604643ebdd06d13e584a66c6814feb660752738f3fe7e714670e4ad396 SHA512 a999ecb813504cdcd56cb3f9ac6633c91ee3df2c203866d29fb04b61c41ee5e7738ca84cdbdb2cb8c6fe969f29a64d21a8df17419901266efc7f1170eb18013a
 DIST stress-ng-0.17.04.tar.gz 6205049 BLAKE2B a5247c33d9c0266f31784469561088675f5e987fde441ce1d3bbb4e2fda150c2b277e4bc4cdf9ec2fee0276f1f63a30d3d19af96afa9685eb01940cf34fb715e SHA512 df143add8400f2bd6e7ade9f05ca4616f9d713e38676f179da123fb1865789a62ed878e6fb536dc3975bff1151020424053348c43b8f9b6818fbe95f517fffcd
-EBUILD stress-ng-0.17.04.ebuild 1214 BLAKE2B cfba85e42ec7efd8134eeb57d2af88223b349190058e806da9c2005ba93c95f8d667d94b8746226580d7e472db9c7f3a1b1a7d906cbe1a5895bc7337472545b1 SHA512 a50a93da85ff65088f59768c4d256dc7e2a2cc6051a02ad9d7dbc8e1fa36edf0809696e6b0d1feffa43891a814af65b142ce725eee189cae42a7d7fd998d0882
-MISC metadata.xml 835 BLAKE2B 88b503bcc225861dfd5a5e016bc0c6df87d13e758f9eb8d73103deb5f1d88163f260f24efcb4988a245b1ea2888e18da86d031d52c9dcdc702dbd9a7c510b691 SHA512 dfc8c9cb83e0960fd0881affc5cd12fe843743faa92e3af0edf0ba86ad8107de60669cd32e156be9ea645a817f38f7091be2b9c870902e7109f937e584feac99
+EBUILD stress-ng-0.15.06-r2.ebuild 1278 BLAKE2B 97ab1f7eb1e225c685a4454148e570dd35f69d3f7879b3d65a8bae2864fba71b07a70e0f6f4dcd436cf699f08dfb65ddf2307337349b96cd1a852d37fe42b96d SHA512 77c7a9dafdf971c8e53278aad4ae3448af730dc30f8ceac99828d3df429f772db059f3291f00e6ca751eeb2500ed3409b2308aa314b2f8d0b1215a810e3474c5
+EBUILD stress-ng-0.17.04-r1.ebuild 1278 BLAKE2B 97ab1f7eb1e225c685a4454148e570dd35f69d3f7879b3d65a8bae2864fba71b07a70e0f6f4dcd436cf699f08dfb65ddf2307337349b96cd1a852d37fe42b96d SHA512 77c7a9dafdf971c8e53278aad4ae3448af730dc30f8ceac99828d3df429f772db059f3291f00e6ca751eeb2500ed3409b2308aa314b2f8d0b1215a810e3474c5
+MISC metadata.xml 965 BLAKE2B bc3ca07d204693d8e4efa2bd547af2e57e672c312cf2e8feafecc9fbaad8d7119b61483684c16ce89ffd0224bb42a4ca1a7df277909364f77439091e02b0d153 SHA512 963755da68b098fc10b296a15b866fafc0ec6ea0d232a2d2eae9aa478801b282818b3b124303f92ad77b7bbd258acfb54e56317012cd2bd7a1274a1f81c419d5
diff --git a/app-benchmarks/stress-ng/metadata.xml b/app-benchmarks/stress-ng/metadata.xml
index cf330e398b38..8a4dc8829191 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.
 	</longdescription>
+	<use>
+		<flag name="keyutils">Stress test the kernel's key generation facilities via <pkg>sys-apps/keyutils</pkg></flag>
+	</use>
 	<upstream>
 		<bugs-to>https://github.com/ColinIanKing/stress-ng/issues</bugs-to>
 		<remote-id type="github">ColinIanKing/stress-ng</remote-id>
diff --git a/app-benchmarks/stress-ng/stress-ng-0.17.04.ebuild b/app-benchmarks/stress-ng/stress-ng-0.15.06-r2.ebuild
index 5b514143db21..5eab59d89bc9 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.17.04.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.15.06-r2.ebuild
@@ -12,14 +12,13 @@ SRC_URI="https://github.com/ColinIanKing/${PN}/archive/refs/tags/V${PV}.tar.gz -
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
-IUSE="apparmor jpeg sctp"
+IUSE="apparmor keyutils jpeg 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:=
@@ -28,6 +27,7 @@ DEPEND="
 		sys-libs/libapparmor
 	)
 	jpeg? ( media-libs/libjpeg-turbo:= )
+	keyutils? ( sys-apps/keyutils:= )
 	sctp? ( net-misc/lksctp-tools )
 "
 
@@ -50,6 +50,7 @@ src_compile() {
 	local myemakeopts=(
 		HAVE_APPARMOR="$(usex apparmor 1 0)"
 		HAVE_LIB_JPEG="$(usex jpeg 1 0)"
+		HAVE_KEYUTILS_H="$(usex keyutils 1 0)"
 		HAVE_LIB_SCTP="$(usex sctp 1 0)"
 		VERBOSE="1"
 	)
diff --git a/app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild b/app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild
new file mode 100644
index 000000000000..5eab59d89bc9
--- /dev/null
+++ b/app-benchmarks/stress-ng/stress-ng-0.17.04-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2024 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 ~hppa ~ia64 ~loong ~ppc64 ~riscv ~sparc ~x86"
+IUSE="apparmor keyutils jpeg sctp"
+
+DEPEND="
+	dev-libs/libaio
+	dev-libs/libbsd
+	dev-libs/libgcrypt:0=
+	sys-apps/attr
+	sys-libs/libcap
+	sys-libs/zlib
+	virtual/libcrypt:=
+	apparmor? (
+		sys-apps/apparmor-utils
+		sys-libs/libapparmor
+	)
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	keyutils? ( sys-apps/keyutils:= )
+	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_JPEG="$(usex jpeg 1 0)"
+		HAVE_KEYUTILS_H="$(usex keyutils 1 0)"
+		HAVE_LIB_SCTP="$(usex sctp 1 0)"
+		VERBOSE="1"
+	)
+
+	emake "${myemakeopts[@]}"
+}