From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 09328138206 for ; Sat, 30 Apr 2016 03:55:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6758621C013; Sat, 30 Apr 2016 03:55:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 EA6E721C013 for ; Sat, 30 Apr 2016 03:55:38 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6593B340D67 for ; Sat, 30 Apr 2016 03:55:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97A6032C for ; Sat, 30 Apr 2016 03:55:31 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1461988427.251e0d08bf9303fbbd2ccb66b550def65f609db5.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/jq/files/, app-misc/jq/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch app-misc/jq/jq-1.5-r2.ebuild X-VCS-Directories: app-misc/jq/ app-misc/jq/files/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: 251e0d08bf9303fbbd2ccb66b550def65f609db5 X-VCS-Branch: master Date: Sat, 30 Apr 2016 03:55:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 88396715-a540-48e6-b5ab-2c1e23e0a6fd X-Archives-Hash: 44d0f0e14fa4966e159c817058b207bc commit: 251e0d08bf9303fbbd2ccb66b550def65f609db5 Author: Jan Chren gmail com> AuthorDate: Thu Apr 28 13:03:45 2016 +0000 Commit: Tim Harder gentoo org> CommitDate: Sat Apr 30 03:53:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=251e0d08 app-misc/jq: fix buffer overflow (bug #580606) and other updates - add upstream metadata - add arm architecture - refactor econf args to an array - move DOCS and PATCHES to their appropriate functions - replace custom find with prune_libtool_files() Gentoo-Bug: 580606 .../jq-1.5-heap_buffer_overflow_in_tokenadd.patch | 34 ++++++++++++ app-misc/jq/jq-1.5-r2.ebuild | 60 ++++++++++++++++++++++ 2 files changed, 94 insertions(+) diff --git a/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch new file mode 100644 index 0000000..edb07d8 --- /dev/null +++ b/app-misc/jq/files/jq-1.5-heap_buffer_overflow_in_tokenadd.patch @@ -0,0 +1,34 @@ +From 8eb1367ca44e772963e704a700ef72ae2e12babd Mon Sep 17 00:00:00 2001 +From: Nicolas Williams +Date: Sat, 24 Oct 2015 17:24:57 -0500 +Subject: [PATCH] Heap buffer overflow in tokenadd() (fix #105) + +This was an off-by one: the NUL terminator byte was not allocated on +resize. This was triggered by JSON-encoded numbers longer than 256 +bytes. +--- + src/jv_parse.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/jv_parse.c b/src/jv_parse.c +index 3102ed4..84245b8 100644 +--- a/jv_parse.c ++++ b/jv_parse.c +@@ -383,7 +383,7 @@ static pfunc stream_token(struct jv_parser* p, char ch) { + + static void tokenadd(struct jv_parser* p, char c) { + assert(p->tokenpos <= p->tokenlen); +- if (p->tokenpos == p->tokenlen) { ++ if (p->tokenpos >= (p->tokenlen - 1)) { + p->tokenlen = p->tokenlen*2 + 256; + p->tokenbuf = jv_mem_realloc(p->tokenbuf, p->tokenlen); + } +@@ -485,7 +485,7 @@ static pfunc check_literal(struct jv_parser* p) { + TRY(value(p, v)); + } else { + // FIXME: better parser +- p->tokenbuf[p->tokenpos] = 0; // FIXME: invalid ++ p->tokenbuf[p->tokenpos] = 0; + char* end = 0; + double d = jvp_strtod(&p->dtoa, p->tokenbuf, &end); + if (end == 0 || *end != 0) diff --git a/app-misc/jq/jq-1.5-r2.ebuild b/app-misc/jq/jq-1.5-r2.ebuild new file mode 100644 index 0000000..df58a52 --- /dev/null +++ b/app-misc/jq/jq-1.5-r2.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools eutils + +DESCRIPTION="A lightweight and flexible command-line JSON processor" +HOMEPAGE="https://stedolan.github.com/jq/" +SRC_URI="https://github.com/stedolan/jq/releases/download/${P}/${P}.tar.gz" + +LICENSE="MIT CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~x64-macos" +IUSE="oniguruma static-libs test" + +DEPEND=" + >=sys-devel/bison-3.0 + sys-devel/flex + oniguruma? ( dev-libs/oniguruma[static-libs?] ) + test? ( dev-util/valgrind ) +" +RDEPEND=" + !static-libs? ( + oniguruma? ( dev-libs/oniguruma[static-libs?] ) + ) +" + +src_prepare() { + local PATCHES=( + "${FILESDIR}"/${PN}-1.5-dynamic-link.patch + "${FILESDIR}"/${PN}-1.5-remove-automagic-dep-on-oniguruma.patch + "${FILESDIR}"/${PN}-1.5-heap_buffer_overflow_in_tokenadd.patch + ) + + sed -i '/^dist_doc_DATA/d' Makefile.am || die + sed -i -r "s:(m4_define\(\[jq_version\],) .+\):\1 \[${PV}\]):" \ + configure.ac || die + + default + eautoreconf +} + +src_configure() { + local econfargs=( + # don't try to rebuild docs + --disable-docs + $(use_enable static-libs static) + $(use_with oniguruma) + ) + econf "${econfargs[@]}" +} + +src_install() { + local DOCS=( AUTHORS README ) + default + + use static-libs || prune_libtool_files +}