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

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86d3c2a880f1ab9b923912da60f71265253b68b4c8626ba62555a627908aafeb
-size 8721762

Csound5.16.6.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ba912850152aeddb7eb757a33c185e3d50b4807548db6d7ba6cf85de15e7ffb
+size 8735038

csound-alsa-fix.patch

@@ -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

csound-gcc-warning-fix.patch

@@ -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;

csound-memset-fix.patch

@@ -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"));

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
 

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