Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=50badc46552a58d9ccbe8a3e9eb0b57ba01f9caa
commit 50badc46552a58d9ccbe8a3e9eb0b57ba01f9caa Author: crazy <[email protected]> Date: Fri Dec 4 18:44:00 2015 +0100 sox-14.4.2-1-x86_64 * Version bump diff --git a/source/multimedia/sox/CVE-2014-8145-1.patch b/source/multimedia/sox/CVE-2014-8145-1.patch deleted file mode 100644 index 7cb8042..0000000 --- a/source/multimedia/sox/CVE-2014-8145-1.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/sphere.c.old -+++ src/sphere.c -@@ -47,6 +47,11 @@ static int start_read(sox_format_t * ft) - - /* Determine header size, and allocate a buffer large enough to hold it. */ - sscanf(fldsval, "%lu", &header_size_ul); -+ if (header_size_ul < 16) { -+ lsx_fail_errno(ft, SOX_EHDR, "Error reading Sphere header"); -+ return (SOX_EOF); -+ } -+ - buf = lsx_malloc(header_size = header_size_ul); - - /* Skip what we have read so far */ diff --git a/source/multimedia/sox/CVE-2014-8145-2.patch b/source/multimedia/sox/CVE-2014-8145-2.patch deleted file mode 100644 index 23c931c..0000000 --- a/source/multimedia/sox/CVE-2014-8145-2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/wav.c.old -+++ src/wav.c -@@ -166,7 +166,7 @@ static unsigned short AdpcmReadBlock(sox_format_t * ft) - /* work with partial blocks. Specs say it should be null */ - /* padded but I guess this is better than trailing quiet. */ - samplesThisBlock = lsx_ms_adpcm_samples_in((size_t)0, (size_t)ft->signal.channels, bytesRead, (size_t)0); -- if (samplesThisBlock == 0) -+ if (samplesThisBlock == 0 || samplesThisBlock > wav->samplesPerBlock) - { - lsx_warn("Premature EOF on .wav input file"); - return 0; diff --git a/source/multimedia/sox/FrugalBuild b/source/multimedia/sox/FrugalBuild index ef06cdd..703133e 100644 --- a/source/multimedia/sox/FrugalBuild +++ b/source/multimedia/sox/FrugalBuild @@ -1,29 +1,15 @@ # Compiling Time: 0.94 SBU -# Maintainer: CSÉCSY László <[email protected]> +# Maintainer: crazy <[email protected]> pkgname=sox -pkgver=14.3.2 -pkgrel=2 +pkgver=14.4.2 +pkgrel=1 pkgdesc="A universal sound converter, player, and recorder" -depends=('libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib') +depends=('libvorbis' 'lame' 'libmad' 'bash' 'alsa-lib>=1.1.0') groups=('multimedia') archs=('i686' 'x86_64') Finclude sourceforge -sha1sums=('ad462114ff47b094078f18148bc9e29e31b42b92') - - -# FSA fix *** -source=(${source[@]} CVE-2014-8145-1.patch CVE-2014-8145-2.patch) -sha1sums=(${sha1sums[@]} '76be8eeb31a524ba10c19a122d22c78626c0e068' \ - 'a6716be4204247edec1416a685bdc4e2d219ba0b') -# *********** - - -build() -{ - Fmake - Fmakeinstall install -} - +sha1sums=('f69f38f8a7ad6a88ecab3862d74db4edcd796695') +Fconfopts+=" --with-distro=Frugalware" # optimization OK
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
