[gentoo-commits] repo/gentoo:master commit in: dev-libs/libgit2/files/, dev-libs/libgit2/

[Michał Górny]

commit:     99914da67e748f4eceec5a02e9ce603917d50004
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 28 21:40:28 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Oct 28 21:44:11 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99914da6

dev-libs/libgit2: Skip OOM tests on 32-bit systems

Closes: https://bugs.gentoo.org/669892
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 ...libgit2-0.26.8-disable-oom-tests-on-32bit.patch | 64 ++++++++++++++++++++++
 dev-libs/libgit2/libgit2-0.26.8.ebuild             |  7 +++
 dev-libs/libgit2/libgit2-0.27.7.ebuild             |  7 +++
 3 files changed, 78 insertions(+)

diff --git a/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
new file mode 100644
index 00000000000..40be2aee8fd
--- /dev/null
+++ b/dev-libs/libgit2/files/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
@@ -0,0 +1,64 @@
+From 16b5a7baf67169ff12a9a2de9c2853c6f921317c Mon Sep 17 00:00:00 2001
+From: Edward Thomson <ethomson@×××××××××××××.com>
+Date: Thu, 13 Sep 2018 13:27:07 +0100
+Subject: [PATCH] tests: don't run buf::oom on 32-bit systems
+
+On a 32-bit Linux systems, the value large enough to make malloc
+guarantee a failure is also large enough that valgrind considers it
+"fishy".  Skip this test on those systems entirely.
+
+[rebased for v0.26.8]
+---
+ tests/buf/oom.c | 14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/tests/buf/oom.c b/tests/buf/oom.c
+index 16a03cc1a..86f5e7239 100644
+--- a/tests/buf/oom.c
++++ b/tests/buf/oom.c
+@@ -11,12 +11,8 @@
+  */
+ #if defined(GIT_ARCH_64) && defined(__linux__)
+ # define TOOBIG 0x0fffffffffffffff
+-#elif defined(__linux__)
+-# define TOOBIG 0x0fffffff
+ #elif defined(GIT_ARCH_64)
+ # define TOOBIG 0xffffffffffffff00
+-#else
+-# define TOOBIG 0xffffff00
+ #endif
+ 
+ /**
+@@ -25,13 +21,18 @@
+  * will fail.  And because the git_buf_grow() wrapper always
+  * sets mark_oom, the code in git_buf_try_grow() will free
+  * the internal buffer and set it to git_buf__oom.
+- * 
++ *
+  * We initialized the internal buffer to (the static variable)
+  * git_buf__initbuf.  The purpose of this test is to make sure
+  * that we don't try to free the static buffer.
++ *
++ * Skip this test entirely on 32-bit platforms; a buffer large enough
++ * to guarantee malloc failures is so large that valgrind considers
++ * it likely to be an error.
+  */
+ void test_buf_oom__grow(void)
+ {
++#ifdef GIT_ARCH_64
+ 	git_buf buf = GIT_BUF_INIT;
+ 
+ 	git_buf_clear(&buf);
+@@ -40,6 +41,9 @@ void test_buf_oom__grow(void)
+ 	cl_assert(git_buf_oom(&buf));
+ 
+ 	git_buf_free(&buf);
++#else
++    cl_skip();
++#endif
+ }
+ 
+ void test_buf_oom__grow_by(void)
+-- 
+2.19.1
+

diff --git a/dev-libs/libgit2/libgit2-0.26.8.ebuild b/dev-libs/libgit2/libgit2-0.26.8.ebuild
index 3a86d17be96..825f2293602 100644
--- a/dev-libs/libgit2/libgit2-0.26.8.ebuild
+++ b/dev-libs/libgit2/libgit2-0.26.8.ebuild
@@ -40,6 +40,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
+PATCHES=(
+	# skip OOM tests on 32-bit systems
+	# https://bugs.gentoo.org/669892
+	# https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d
+	"${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"

diff --git a/dev-libs/libgit2/libgit2-0.27.7.ebuild b/dev-libs/libgit2/libgit2-0.27.7.ebuild
index d39c0a7a026..3815701da06 100644
--- a/dev-libs/libgit2/libgit2-0.27.7.ebuild
+++ b/dev-libs/libgit2/libgit2-0.27.7.ebuild
@@ -40,6 +40,13 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS CONTRIBUTING.md CONVENTIONS.md README.md )
 
+PATCHES=(
+	# skip OOM tests on 32-bit systems
+	# https://bugs.gentoo.org/669892
+	# https://github.com/libgit2/libgit2/commit/415a8ae9c9b6ac18f0524b6af8e58408b426457d
+	"${FILESDIR}"/libgit2-0.26.8-disable-oom-tests-on-32bit.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"