From patchwork Thu Nov 27 16:33:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 415587 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id AFD1F140283 for ; Fri, 28 Nov 2014 03:35:42 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AC58592672; Thu, 27 Nov 2014 16:35:41 +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 05a+baOQwoQI; Thu, 27 Nov 2014 16:35:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B7A189264E; Thu, 27 Nov 2014 16:35:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F41E01C2D67 for ; Thu, 27 Nov 2014 16:35:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EEC789264E for ; Thu, 27 Nov 2014 16:35:34 +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 CtkFDqC9x8js for ; Thu, 27 Nov 2014 16:35:31 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from www.zacarias.com.ar (www.zacarias.com.ar [62.210.192.172]) by whitealder.osuosl.org (Postfix) with ESMTPS id EFC1591A21 for ; Thu, 27 Nov 2014 16:35:30 +0000 (UTC) Received: from asgard (cpe-181-46-99-160.telecentro-reversos.com.ar [181.46.99.160] (may be forged)) (authenticated bits=0) by www.zacarias.com.ar (8.14.9/8.14.9) with ESMTP id sARGZNvc028370 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 27 Nov 2014 16:35:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1417106128; bh=okqJiXvGJQmOE1PyqpruqIqnfb3dSSngBBqpPac/rAQ=; h=From:To:Cc:Subject:Date; b=JH13omzoCJ4dSt2mzX2L6f0ENfCComrgkJr/QLQHGkvtlq3LkPPNUYStgogxEVZdU iTx9wqxmTu6GhK9cqHRTvvpMdpEtQ2qFbNMZM8qoitF9ijxMSwfSBpZVRE8mkv15VY r712iOqKF7joqEpnAjxBiu2JARHmehisMtlz1XQY= Received: by asgard (sSMTP sendmail emulation); Thu, 27 Nov 2014 13:33:25 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Thu, 27 Nov 2014 13:33:25 -0300 Message-Id: <1417106005-14032-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 2.0.4 X-Virus-Scanned: clamav-milter 0.98.4 at www X-Virus-Status: Clean Subject: [Buildroot] [PATCH] flac: bump to version 1.3.1 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" All patches upstream and add hash file. Signed-off-by: Gustavo Zacarias --- package/flac/0001-fix-altivec-logic.patch | 32 ------------------------- package/flac/0002-fix-CVE-2014-9028.patch | 34 -------------------------- package/flac/0003-fix-CVE-2014-8962.patch | 40 ------------------------------- package/flac/flac.hash | 2 ++ package/flac/flac.mk | 2 +- 5 files changed, 3 insertions(+), 107 deletions(-) delete mode 100644 package/flac/0001-fix-altivec-logic.patch delete mode 100644 package/flac/0002-fix-CVE-2014-9028.patch delete mode 100644 package/flac/0003-fix-CVE-2014-8962.patch create mode 100644 package/flac/flac.hash diff --git a/package/flac/0001-fix-altivec-logic.patch b/package/flac/0001-fix-altivec-logic.patch deleted file mode 100644 index a1ac8a1..0000000 --- a/package/flac/0001-fix-altivec-logic.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d65ede3e874c79348efc85cf3a185c170046c4c8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 4 Dec 2013 13:31:28 -0300 -Subject: [PATCH] Fix Makefile.am altivec logic - -Besides SPE (FSL e500v? cores) there are other powerpc processors -that don't support altivec instructions so only enable them when it's -100% sure that the target has it. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Erik de Castro Lopo ---- - src/libFLAC/Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/libFLAC/Makefile.am b/src/libFLAC/Makefile.am -index 247e33c..258de40 100644 ---- a/src/libFLAC/Makefile.am -+++ b/src/libFLAC/Makefile.am -@@ -47,8 +47,7 @@ CPUCFLAGS = -faltivec -force_cpusubtype_ALL -DFLAC__NO_ASM - else - # Linux-gcc for PPC does not have -force_cpusubtype_ALL, it is Darwin-specific - CPUCFLAGS = --if FLaC__CPU_PPC_SPE --else -+if FLaC__USE_ALTIVEC - CPUCFLAGS += -maltivec -mabi=altivec - endif - #@@@ PPC optimizations temporarily disabled --- -1.8.3.2 - diff --git a/package/flac/0002-fix-CVE-2014-9028.patch b/package/flac/0002-fix-CVE-2014-9028.patch deleted file mode 100644 index 5a25ecf..0000000 --- a/package/flac/0002-fix-CVE-2014-9028.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fcf0ba06ae12ccd7c67cee3c8d948df15f946b85 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Wed, 19 Nov 2014 19:35:59 -0800 -Subject: [PATCH] src/libFACL/stream_decoder.c : Fail safely to avoid a heap overflow. - -A file provided by the reporters caused the stream decoder to write to -un-allocated heap space resulting in a segfault. The solution is to -error out (by returning false from read_residual_partitioned_rice_()) -instead of trying to continue to decode. - -Fixes: CVE-2014-9028 -Reported-by: Michele Spagnuolo, - Google Security Team ---- - src/libFLAC/stream_decoder.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index 88a656d..54e84d4 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -2736,7 +2736,8 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne - if(decoder->private_->frame.header.blocksize < predictor_order) { - send_error_to_client_(decoder, FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC); - decoder->protected_->state = FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC; -- return true; -+ /* We have received a potentially malicious bt stream. All we can do is error out to avoid a heap overflow. */ -+ return false; - } - } - else { --- -1.7.2.5 - diff --git a/package/flac/0003-fix-CVE-2014-8962.patch b/package/flac/0003-fix-CVE-2014-8962.patch deleted file mode 100644 index 563100e..0000000 --- a/package/flac/0003-fix-CVE-2014-8962.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5b3033a2b355068c11fe637e14ac742d273f076e Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Tue, 18 Nov 2014 07:20:25 -0800 -Subject: [PATCH] src/libFLAC/stream_decoder.c : Fix buffer read overflow. - -This is CVE-2014-8962. - -Reported-by: Michele Spagnuolo, - Google Security Team ---- - src/libFLAC/stream_decoder.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c -index cb66fe2..88a656d 100644 ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -71,7 +71,7 @@ FLAC_API int FLAC_API_SUPPORTS_OGG_FLAC = - * - ***********************************************************************/ - --static FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; -+static const FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; - - /*********************************************************************** - * -@@ -1361,6 +1361,10 @@ FLAC__bool find_metadata_(FLAC__StreamDecoder *decoder) - id = 0; - continue; - } -+ -+ if(id >= 3) -+ return false; -+ - if(x == ID3V2_TAG_[id]) { - id++; - i = 0; --- -1.7.2.5 - diff --git a/package/flac/flac.hash b/package/flac/flac.hash new file mode 100644 index 0000000..6a0da11 --- /dev/null +++ b/package/flac/flac.hash @@ -0,0 +1,2 @@ +# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt +sha256 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c flac-1.3.1.tar.xz diff --git a/package/flac/flac.mk b/package/flac/flac.mk index daedd47..2f8c9c3 100644 --- a/package/flac/flac.mk +++ b/package/flac/flac.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLAC_VERSION = 1.3.0 +FLAC_VERSION = 1.3.1 FLAC_SITE = http://downloads.xiph.org/releases/flac FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz FLAC_INSTALL_STAGING = YES