From 970539d04917596145fcad824b18ba0170a13abbcab6e546d560ab28d80230c3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Feb 2012 13:14:19 +0000 Subject: [PATCH] Accepting request 107161 from home:tiwai:branches:multimedia:apps - updated to version 5.16.6, including a fix for VUL-0: CVE-2012-0270: csound: two buffer overflow flaws in getnum() (bnc#749073) - drop obsoleted patches OBS-URL: https://build.opensuse.org/request/show/107161 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=11 --- Csound5.15.0.tar.gz | 3 --- Csound5.16.6.tar.gz | 3 +++ csound-alsa-fix.patch | 14 -------------- csound-gcc-warning-fix.patch | 16 ---------------- csound-memset-fix.patch | 13 ------------- csound.changes | 8 ++++++++ csound.spec | 12 +++--------- 7 files changed, 14 insertions(+), 55 deletions(-) delete mode 100644 Csound5.15.0.tar.gz create mode 100644 Csound5.16.6.tar.gz delete mode 100644 csound-alsa-fix.patch delete mode 100644 csound-gcc-warning-fix.patch delete mode 100644 csound-memset-fix.patch diff --git a/Csound5.15.0.tar.gz b/Csound5.15.0.tar.gz deleted file mode 100644 index 068eb59..0000000 --- a/Csound5.15.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:86d3c2a880f1ab9b923912da60f71265253b68b4c8626ba62555a627908aafeb -size 8721762 diff --git a/Csound5.16.6.tar.gz b/Csound5.16.6.tar.gz new file mode 100644 index 0000000..acc792c --- /dev/null +++ b/Csound5.16.6.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ba912850152aeddb7eb757a33c185e3d50b4807548db6d7ba6cf85de15e7ffb +size 8735038 diff --git a/csound-alsa-fix.patch b/csound-alsa-fix.patch deleted file mode 100644 index edf32dc..0000000 --- a/csound-alsa-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: InOut/rtalsa.c -=================================================================== ---- InOut/rtalsa.c.orig -+++ InOut/rtalsa.c -@@ -28,6 +28,9 @@ - #ifndef _POSIX_SOURCE - #define _POSIX_SOURCE 1 - #endif -+#ifndef _POSIX_C_SOURCE -+#define _POSIX_C_SOURCE 1 -+#endif - #ifndef _BSD_SOURCE - #define _BSD_SOURCE 1 - #endif diff --git a/csound-gcc-warning-fix.patch b/csound-gcc-warning-fix.patch deleted file mode 100644 index d58a89f..0000000 --- a/csound-gcc-warning-fix.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: Opcodes/gab/sliderTable.c -=================================================================== ---- Opcodes/gab/sliderTable.c.orig -+++ Opcodes/gab/sliderTable.c -@@ -368,9 +368,9 @@ static int sliderTable64(CSOUND *csound, - break; \ - } \ - *outTable++ = \ -- *yt1++ = *c1++ * value + *c2++ * *yt1; /* filters the output */ \ -+ *yt1 = *c1++ * value + *c2++ * *yt1; /* filters the output */ \ - \ -- min++; max++; j++; ftp++; \ -+ yt1++; min++; max++; j++; ftp++; \ - } \ - } \ - return OK; diff --git a/csound-memset-fix.patch b/csound-memset-fix.patch deleted file mode 100644 index af4f163..0000000 --- a/csound-memset-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Opcodes/pvsbasic.c -=================================================================== ---- Opcodes/pvsbasic.c.orig -+++ Opcodes/pvsbasic.c -@@ -2183,7 +2183,7 @@ int tab2pvs_init(CSOUND *csound, TAB2PVS - csound->AuxAlloc(csound, (N + 2) * sizeof(float), &p->fout->frame); - } - -- memset(p->fout->frame.auxp, sizeof(float)*(N+2), 0); -+ memset(p->fout->frame.auxp, 0, sizeof(float)*(N+2)); - return OK; - } - else return csound->InitError(csound, Str("t-variable not initialised")); diff --git a/csound.changes b/csound.changes index 876153e..34076e8 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 27 12:04:56 CET 2012 - tiwai@suse.de + +- updated to version 5.16.6, including a fix for + VUL-0: CVE-2012-0270: csound: two buffer overflow flaws in + getnum() (bnc#749073) +- drop obsoleted patches + ------------------------------------------------------------------- Sun Jan 8 15:04:23 UTC 2012 - prusnak@opensuse.org diff --git a/csound.spec b/csound.spec index f3a5b1c..9607f8e 100644 --- a/csound.spec +++ b/csound.spec @@ -38,17 +38,14 @@ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: xorg-x11-devel %endif -Version: 5.15.0 +Version: 5.16.6 Release: 0 -License: GFDL-1.2 ; LGPL-2.1+ ; MIT Summary: Computer Sound Synthesis and Composition Program -Url: http://www.csounds.com +License: GFDL-1.2 ; LGPL-2.1+ ; MIT Group: Productivity/Multimedia/Sound/Utilities +Url: http://www.csounds.com Source: Csound%{version}.tar.gz Source1: README.SuSE -Patch0: %{name}-alsa-fix.patch -Patch1: %{name}-gcc-warning-fix.patch -Patch2: %{name}-memset-fix.patch Patch3: %{name}-strncat-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,9 +66,6 @@ Development files for Csound. %prep %setup -q -n Csound%{version} -%patch0 -%patch1 -%patch2 %patch3 # remove __DATE__ from source files, causes unnecessary rebuilds sed -i 's:__DATE__:"":' Engine/musmon.c frontends/CsoundVST/CsoundVstFltk.cpp Top/main.c