Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=00e21e0410b11ddf61d7234470a3bf076f63b1a2
commit 00e21e0410b11ddf61d7234470a3bf076f63b1a2 Author: crazy <[email protected]> Date: Fri Dec 4 16:44:50 2015 +0100 flac-1.3.1-1-x86_64 * Version bump * ( we used old sf.net release ) * fixed source/url/up2date * removed old patches * ( so name is same ) diff --git a/source/multimedia/flac/CVE-2014-8962.patch b/source/multimedia/flac/CVE-2014-8962.patch deleted file mode 100644 index ce21357..0000000 --- a/source/multimedia/flac/CVE-2014-8962.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5b3033a2b355068c11fe637e14ac742d273f076e Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo <[email protected]> -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 <[email protected]> ---- - src/libFLAC/stream_decoder.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -94,7 +94,7 @@ - * - ***********************************************************************/ - --static FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; -+static const FLAC__byte ID3V2_TAG_[3] = { 'I', 'D', '3' }; - - /*********************************************************************** - * -@@ -1386,6 +1386,10 @@ - id = 0; - continue; - } -+ -+ if(id >= 3) -+ return false; -+ - if(x == ID3V2_TAG_[id]) { - id++; - i = 0; diff --git a/source/multimedia/flac/CVE-2014-9028-1.patch b/source/multimedia/flac/CVE-2014-9028-1.patch deleted file mode 100644 index 0401ce3..0000000 --- a/source/multimedia/flac/CVE-2014-9028-1.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fcf0ba06ae12ccd7c67cee3c8d948df15f946b85 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo <[email protected]> -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 <[email protected]> ---- - src/libFLAC/stream_decoder.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -2730,7 +2730,8 @@ - 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 { diff --git a/source/multimedia/flac/CVE-2014-9028-2.patch b/source/multimedia/flac/CVE-2014-9028-2.patch deleted file mode 100644 index eeaf412..0000000 --- a/source/multimedia/flac/CVE-2014-9028-2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5a365996d739bdf4711af51d9c2c71c8a5e14660 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo <[email protected]> -Date: Thu, 27 Nov 2014 11:55:11 +1100 -Subject: [PATCH] src/libFLAC/stream_decoder.c : Fail safely to avoid a heap overflow. - -This fix is closely related to the fix for CVE-2014-9028. When that -fix went public Miroslav Lichvar noticed a similar potential problem -spot in the same function and was able to craft a file to trigger a -heap write overflow. - -Reported-by : Miroslav Lichvar <[email protected]> ---- - src/libFLAC/stream_decoder.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - ---- a/src/libFLAC/stream_decoder.c -+++ b/src/libFLAC/stream_decoder.c -@@ -2738,7 +2738,8 @@ - if(partition_samples < 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 bit stream. All we can do is error out to avoid a heap overflow. */ -+ return false; - } - } - diff --git a/source/multimedia/flac/FrugalBuild b/source/multimedia/flac/FrugalBuild index 7cd8d6f..87063b0 100644 --- a/source/multimedia/flac/FrugalBuild +++ b/source/multimedia/flac/FrugalBuild @@ -1,30 +1,30 @@ # Compiling Time: 0.01 SBU # Maintainer: Miklos Vajna <[email protected]> -options+=('asneeded') - pkgname=flac -pkgver=1.2.1 -pkgrel=4 +pkgver=1.3.1 +pkgrel=1 +url="https://xiph.org/flac/"; pkgdesc="Free Lossless Audio Coder" depends=('libogg') groups=('multimedia') archs=('i686' 'x86_64') -_F_archive_grepv="linux" -Finclude sourceforge -source=($source gcc43.patch) -sha1sums=('bd54354900181b59db3089347cc84ad81e410b38' \ - 'a7f3ffa1293f5733b8f339ac92fb2daa7fab2d24') -if [ "$CARCH" == "x86_64" ]; then - Fconfopts+=" --enable-sse" -fi +up2date="Flasttar http://downloads.xiph.org/releases/$pkgname"; +source=(http://downloads.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.xz) +sha1sums=('38e17439d11be26207e4af0ff50973815694b26f') + + +build() +{ -# FSA fix *** -source=(${source[@]} CVE-2014-8962.patch CVE-2014-9028-1.patch CVE-2014-9028-2.patch) -sha1sums=(${sha1sums[@]} '6d8154b600dd52ed547090ce4f5287a2f1bbf60a' \ - '76a9b39ca1c6b52c25a449f7dffd0b41c8d9c406' \ - '73fefe3f041d6ed050a63adc7ee0d208b599b6da') -# *********** + if [ "$CARCH" == "x86_64" ]; then + Fconfopts+=" --enable-sse" + fi + Fcd + Fsed '-O3' '-O2' configure.ac + Fexec ./autogen.sh || Fdie + Fbuild --disable-silent-rules +} # optimization OK diff --git a/source/multimedia/flac/gcc43.patch b/source/multimedia/flac/gcc43.patch deleted file mode 100644 index 7fdbf80..0000000 --- a/source/multimedia/flac/gcc43.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 flac-1.2.1/examples/cpp/encode/file/main.cpp ---- flac-1.2.1/examples/cpp/encode/file/main.cpp.gcc43 2007-09-13 17:58:03.000000000 +0200 -+++ flac-1.2.1/examples/cpp/encode/file/main.cpp 2008-01-08 10:27:39.000000000 +0100 -@@ -29,6 +29,7 @@ - #endif - - #include <stdio.h> -+#include <string.h> - #include <stdlib.h> - #include "FLAC++/metadata.h" - #include "FLAC++/encoder.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
