From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-944574-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A218C139694
for <garchives@archives.gentoo.org>; Mon, 17 Apr 2017 23:04:24 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9A3EDE0CC7;
Mon, 17 Apr 2017 23:04:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 7A41DE0CC7
for <gentoo-commits@lists.gentoo.org>; Mon, 17 Apr 2017 23:04:22 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id EE8BB340988
for <gentoo-commits@lists.gentoo.org>; Mon, 17 Apr 2017 23:04:20 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 04A30742C
for <gentoo-commits@lists.gentoo.org>; Mon, 17 Apr 2017 23:04:19 +0000 (UTC)
From: "Michael Weber" <xmw@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" <xmw@gentoo.org>
Message-ID: <1492470212.1ee6a653a978313dae85c8934a94e9f9d5a78426.xmw@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/iksemel/, dev-libs/iksemel/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/iksemel/files/iksemel-1.4-ikstack.patch dev-libs/iksemel/iksemel-1.4.ebuild
X-VCS-Directories: dev-libs/iksemel/files/ dev-libs/iksemel/
X-VCS-Committer: xmw
X-VCS-Committer-Name: Michael Weber
X-VCS-Revision: 1ee6a653a978313dae85c8934a94e9f9d5a78426
X-VCS-Branch: master
Date: Mon, 17 Apr 2017 23:04:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: a585b911-2183-4da4-8769-1dc1ec85b252
X-Archives-Hash: 3adbf796594cb3262df9dc2b667f6d2d
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@gmail.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@gmail.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
}