gentoo resync : 08.01.2021

3 files changed, 36 insertions, 2 deletions

diff --git a/dev-libs/raft/Manifest b/dev-libs/raft/Manifest
index 8f42336062da..4c412d62e57c 100644
--- a/dev-libs/raft/Manifest
+++ b/dev-libs/raft/Manifest
@@ -1,3 +1,4 @@
+AUX raft-0.9.25-Always-skip-init-oom-test.patch 1140 BLAKE2B 03ee957f5fa7a1ef3c9a5223a5e67df07176110c601f790c905751cfcba7aeb4a160ac2a5547ff6440cd7c292a3e7d1913b3334f24151a288fd2c95e19865b86 SHA512 e138f113fef280fd8bbf8055be6410b81a163ee7813ac13f539e38923062306c6bf37831a298f56530a954d68f3975069af6e31f73679b4924274c5091ae7679
 DIST raft-0.9.25.tar.gz 313444 BLAKE2B a2a15287cef28b03b012ea372d83e7d0b70bc561f5996eb36fb5ef898261188ee8dfef1aa1619333ada2c8f20a37aa1af3f68a1d97c11919d521544c89629e55 SHA512 8709a909c527b7062072165356dcc012cf7af6cf85e3a3be515220ea4a863637dd06e7c4376af4284006bce65034002d1639ca52ac1ce108be2efa0725a82b70
-EBUILD raft-0.9.25.ebuild 954 BLAKE2B b02d06ecf7031b072996e31f9b75f8d5ecbbc3acbce9b2d54bd568bcd6258a60acba1c939cb82d9d7a210d10f8cb5e81860d34ae420bfe5b0ce442c59c22307c SHA512 7be6bad61e6519e89f30ebd994868781eafcb685b6d299716d8f62718d59434ed37543933756cb35465955ba36c22487b21036979378368d2c6e9e5019ce6302
+EBUILD raft-0.9.25.ebuild 1030 BLAKE2B 39e3e289802fde309d41d0a5ecf5484d58610db877e276bf3bc601c33f3060f9d8d968345f56868d3c653ab6192789761a972f2df2a16f00f4d4fa1e69b49658 SHA512 ae0f3446717543f20a52a54e143d16351758fe2377d6b38319a1d288a45dab0b1c2e78d5813a6a97c060ef9d1b04fc864a6c8fdabf6f525677018b8c9795118f
 MISC metadata.xml 755 BLAKE2B df2f0d028fa7b8e27b29facf058e32cfcd3352415ed4a682499a8a9bfccab115b174d30750a66d9a811da90fe5deb68ab9c2344f7c691d158d48c36d76da9db4 SHA512 95093f3a838955c8a109dfea975d73698bc5aade34bd54fc5dbbe9ec6e5ec9f092cdb939c4f91290babacdd6ae5ef72027201bd731955f8337ec21e49713a3c7
diff --git a/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
new file mode 100644
index 000000000000..7a22682c2e03
--- /dev/null
+++ b/dev-libs/raft/files/raft-0.9.25-Always-skip-init-oom-test.patch
@@ -0,0 +1,31 @@
+commit e0948518f6eedad85c7705fb3963cfdda3627d8f
+Author: Reto Gantenbein <reto.gantenbein@linuxmonk.ch>
+Date:   Thu Oct 22 00:19:31 2020 +0200
+
+    Always skip init/oom test
+    
+    The RPM package build in COPR is being executed on a tmpfs which
+    always results in a failure of this test:
+    
+    init/oom
+      heap-fault-delay=1, heap-fault-repeat=1                   [ ERROR ]
+    Error: test/integration/test_uv_init.c:156: assertion failed: _rv == 1 (0 == 1)
+    
+    Instead only for certain architectures we always skip this test.
+    For more informations see https://github.com/ganto/copr-lxc4/issues/8
+
+diff --git a/test/integration/test_uv_init.c b/test/integration/test_uv_init.c
+index 8c9b5f7..57db7f3 100644
+--- a/test/integration/test_uv_init.c
++++ b/test/integration/test_uv_init.c
+@@ -144,10 +144,8 @@ static MunitParameterEnum oomParams[] = {
+ TEST(init, oom, setUp, tearDown, 0, oomParams)
+ {
+     struct fixture *f = data;
+-#if defined(__i686__)
+     /* XXX: tmpfs seems to not support O_DIRECT */
+     return MUNIT_SKIP;
+-#endif
+ #if defined(__powerpc64__)
+     /* XXX: fails on ppc64el */
+     return MUNIT_SKIP;
diff --git a/dev-libs/raft/raft-0.9.25.ebuild b/dev-libs/raft/raft-0.9.25.ebuild
index b1d2d3822b20..b5f0f01804eb 100644
--- a/dev-libs/raft/raft-0.9.25.ebuild
+++ b/dev-libs/raft/raft-0.9.25.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,6 +18,8 @@ RESTRICT="!test? ( test )"
 DEPEND="dev-libs/libuv"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}"/raft-0.9.25-Always-skip-init-oom-test.patch )
+
 src_prepare() {
 	default