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

[Michael Weber]

commit:     1ee6a653a978313dae85c8934a94e9f9d5a78426
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 23:03:32 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 23:03:32 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee6a653

dev-libs/iksemel: Add iksemel-1.4-ikstack.patch (thanks Alon Bar-Lev, bug 391463).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 dev-libs/iksemel/files/iksemel-1.4-ikstack.patch | 35 ++++++++++++++++++++++++
 dev-libs/iksemel/iksemel-1.4.ebuild              |  1 +
 2 files changed, 36 insertions(+)

diff --git a/dev-libs/iksemel/files/iksemel-1.4-ikstack.patch b/dev-libs/iksemel/files/iksemel-1.4-ikstack.patch
new file mode 100644
index 00000000000..0dff76b409d
--- /dev/null
+++ b/dev-libs/iksemel/files/iksemel-1.4-ikstack.patch
@@ -0,0 +1,35 @@
+From 3095fe8c9686de79509fd49db5e8f39fe6c52f43 Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@×××××.com>
+Date: Wed, 22 Mar 2017 12:14:33 +0200
+Subject: [PATCH] fix alignment issue in ikstack
+
+tst-ikstack
+=================
+
+ikstack bug, addr 0x100357b4 should be a multiply of 8
+FAIL tst-ikstack (exit status: 1)
+
+Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
+---
+ src/ikstack.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/ikstack.c b/src/ikstack.c
+index bed4656..814a91c 100644
+--- a/src/ikstack.c
++++ b/src/ikstack.c
+@@ -88,9 +88,11 @@ iks_stack_alloc (ikstack *s, size_t size)
+ 	if (size < MIN_ALLOC_SIZE) size = MIN_ALLOC_SIZE;
+ 	if (size & ALIGN_MASK) size = ALIGN (size);
+ 
++	size += DEFAULT_ALIGNMENT; /* to enable alignment of space */
+ 	c = find_space (s, s->meta, size);
+ 	if (!c) return NULL;
+ 	mem = c->data + c->used;
++	mem = (void *)ALIGN((char *)mem - (char *)0);
+ 	c->used += size;
+ 	return mem;
+ }
+-- 
+2.10.2
+

diff --git a/dev-libs/iksemel/iksemel-1.4.ebuild b/dev-libs/iksemel/iksemel-1.4.ebuild
index 14efea0451b..7457f386281 100644
--- a/dev-libs/iksemel/iksemel-1.4.ebuild
+++ b/dev-libs/iksemel/iksemel-1.4.ebuild
@@ -21,6 +21,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch"
 	epatch "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch"
+	epatch "${FILESDIR}/${PN}-1.4-ikstack.patch"
 	eautoreconf
 }