From patchwork Wed Feb 17 16:09:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zoltan Gyarmati X-Patchwork-Id: 584213 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 2C8FE14010F for ; Thu, 18 Feb 2016 03:10:01 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=FaVBwR7i; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 73DDF33C01; Wed, 17 Feb 2016 16:10:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dFB45LD18yCx; Wed, 17 Feb 2016 16:09:58 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 38DA533B55; Wed, 17 Feb 2016 16:09:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 7A8D51C163A for ; Wed, 17 Feb 2016 16:09:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 75F7D92196 for ; Wed, 17 Feb 2016 16:09:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bpd6SSD8g2cM for ; Wed, 17 Feb 2016 16:09:54 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 39F1492195 for ; Wed, 17 Feb 2016 16:09:54 +0000 (UTC) Received: by mail-wm0-f50.google.com with SMTP id b205so162610926wmb.1 for ; Wed, 17 Feb 2016 08:09:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=jV8YvESTo/i4X2pmkiqY7QVKQqYqe2hJLRor0a3MjLY=; b=FaVBwR7iajourrrqV65Z1+wxcgLxSPFCae4hloNqtZ7SWkg3J5zvFhTKy0AakkKLNB RVeaMPNI7fTJ1eaZuNSe03Dsy/ji4b+vxxStPgTpScuXXFthiLZBzspvExw/MRzbdR13 rfRnJue6c8w5QdcB1f+ZFS0t0X3OGmidaSkxQwnh7M0CwxOSBIR3or2aQ4TGeL12MhhF QrpSArXLUmc5BIR8fWrkGQi13yQFKSR2hZtjqsoedtdZUzfkfVUaH6TgJ5QT3Pb+39bo eRdKyzPFWyr7xeyQ8cYzoVyB94EDTEDQNdzj6UOXdJFRlA7a33RKftH1T7yNOAnDHuDv K7Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=jV8YvESTo/i4X2pmkiqY7QVKQqYqe2hJLRor0a3MjLY=; b=kk3szUtgXeRlh8Ju2XeM4bZ7DWMDTDyux0XPAATm+4B6zIynfbrA2vYsM2+Us3MUWA 7ZoTqa2+y8bJPGpNEtI96XknZw+minpCD4tBSnaPSP921SA2Y8JhxxrLaTRXFXcPZhC5 nq/8PgXhxwyorlxL0zK89vLqIsIednHw4qzMKa9GkOHcSx2KVcSxH+Q7WbPk1Bs9si8W EAsU1j0Fo+N94IqupKv1THBFiyz7b+s+2w+J6fnqg23kVDvrL8UpIrZdE16OUOgx371H 302vwR2tuIFxkcD1hlwQ+iR5jUhMvnEN7QIjHK8W6hzBE3AXD1cTuQAx2B+URJijra7p vLEg== X-Gm-Message-State: AG10YOS/iD7OeAivCkwKag87eWk/wIeyiTW0yCSO9EW1zhH7xsn63+9k6+iMCiPzypJJWQ== X-Received: by 10.28.54.159 with SMTP id y31mr27689904wmh.89.1455725392907; Wed, 17 Feb 2016 08:09:52 -0800 (PST) Received: from zgyarmati-ThinkPad-T510.chello.hu (catv-89-133-72-47.catv.broadband.hu. [89.133.72.47]) by smtp.gmail.com with ESMTPSA id e9sm2184046wja.25.2016.02.17.08.09.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Feb 2016 08:09:51 -0800 (PST) From: Zoltan Gyarmati To: buildroot@busybox.net Date: Wed, 17 Feb 2016 17:09:42 +0100 Message-Id: <1455725382-32751-1-git-send-email-mr.zoltan.gyarmati@gmail.com> X-Mailer: git-send-email 1.9.1 Subject: [Buildroot] [PATCH 1/1] icu: fix build-time segfault by backporting upstream fix X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The icu bug http://bugs.icu-project.org/trac/ticket/11959 also hit me, but oddly enough only when running build build server via Jenkins. This patch adds the upstream fix for the mentioned bug, so the patch most likely can be removed at the next version bump. Signed-off-by: Zoltan Gyarmati --- ...llocating-memory-for-pkgDataFlags.-compil.patch | 34 ++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch diff --git a/package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch b/package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch new file mode 100644 index 0000000..d53a761 --- /dev/null +++ b/package/icu/0006-fix-Error-allocating-memory-for-pkgDataFlags.-compil.patch @@ -0,0 +1,34 @@ +From 212016f27dd581fd7bef1a44a3342c59619a4ec8 Mon Sep 17 00:00:00 2001 +From: Zoltan Gyarmati +Date: Wed, 27 Jan 2016 17:24:25 +0100 +Subject: [PATCH] fix "Error allocating memory for pkgDataFlags." compilation + error + + This is backport of the upstream icu commit 38081 +(http://bugs.icu-project.org/trac/changeset/38081/icu/trunk), which is +a fix to upstream icu bug #11959 +(http://bugs.icu-project.org/trac/ticket/11959) + +Signed-off-by: Zoltan Gyarmati +--- + source/tools/toolutil/flagparser.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/source/tools/toolutil/flagparser.c b/source/tools/toolutil/flagparser.c +index 5543415..57256c3 100644 +--- a/source/tools/toolutil/flagparser.c ++++ b/source/tools/toolutil/flagparser.c +@@ -96,8 +96,8 @@ parseFlagsFile_cleanup: + uprv_free(buffer); + + T_FileStream_close(f); +- +- if (U_FAILURE(*status)) { ++ ++ if (U_FAILURE(*status) && *status != U_BUFFER_OVERFLOW_ERROR) { + return -1; + } + +-- +1.9.1 +