From a53b19828daeed47189fe8c9f179ded7a1db0081c34524621ba9b05132469afd Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Sun, 8 Jan 2012 16:13:41 +0000 Subject: [PATCH 1/5] - updated to version 5.15.0 - drop unused patches - fix wrong memset and strncat usage ({memset,strncat}-fix.patch) OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=7 --- Csound5.06.0.tar.bz2 | 3 - Csound5.15.0.tar.gz | 3 + csound-alsa-fix.diff => csound-alsa-fix.patch | 8 +- ...g-fix.diff => csound-gcc-warning-fix.patch | 8 +- csound-memset-fix.patch | 13 ++ csound-python-2.6-fix.diff | 145 ------------------ csound-sanitize-sys.patch | 22 --- csound-strncat-fix.patch | 28 ++++ csound-tmpnam-fix.diff | 24 --- csound.changes | 7 + csound.spec | 91 ++++++----- 11 files changed, 111 insertions(+), 241 deletions(-) delete mode 100644 Csound5.06.0.tar.bz2 create mode 100644 Csound5.15.0.tar.gz rename csound-alsa-fix.diff => csound-alsa-fix.patch (52%) rename csound-gcc-warning-fix.diff => csound-gcc-warning-fix.patch (78%) create mode 100644 csound-memset-fix.patch delete mode 100644 csound-python-2.6-fix.diff delete mode 100644 csound-sanitize-sys.patch create mode 100644 csound-strncat-fix.patch delete mode 100644 csound-tmpnam-fix.diff diff --git a/Csound5.06.0.tar.bz2 b/Csound5.06.0.tar.bz2 deleted file mode 100644 index 3c193f8..0000000 --- a/Csound5.06.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:85557740bfc321bfd553ba082b18055ce76fd7b2d9eccd706ffb60801f423c32 -size 11105246 diff --git a/Csound5.15.0.tar.gz b/Csound5.15.0.tar.gz new file mode 100644 index 0000000..068eb59 --- /dev/null +++ b/Csound5.15.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:86d3c2a880f1ab9b923912da60f71265253b68b4c8626ba62555a627908aafeb +size 8721762 diff --git a/csound-alsa-fix.diff b/csound-alsa-fix.patch similarity index 52% rename from csound-alsa-fix.diff rename to csound-alsa-fix.patch index b1e2bad..edf32dc 100644 --- a/csound-alsa-fix.diff +++ b/csound-alsa-fix.patch @@ -1,6 +1,8 @@ ---- InOut/rtalsa.c-dist 2007-01-22 11:31:00.000000000 +0100 -+++ InOut/rtalsa.c 2007-01-22 11:31:28.000000000 +0100 -@@ -27,6 +27,9 @@ +Index: InOut/rtalsa.c +=================================================================== +--- InOut/rtalsa.c.orig ++++ InOut/rtalsa.c +@@ -28,6 +28,9 @@ #ifndef _POSIX_SOURCE #define _POSIX_SOURCE 1 #endif diff --git a/csound-gcc-warning-fix.diff b/csound-gcc-warning-fix.patch similarity index 78% rename from csound-gcc-warning-fix.diff rename to csound-gcc-warning-fix.patch index 50fbef0..d58a89f 100644 --- a/csound-gcc-warning-fix.diff +++ b/csound-gcc-warning-fix.patch @@ -1,6 +1,8 @@ ---- Opcodes/gab/sliderTable.c-dist 2007-06-11 18:20:22.000000000 +0200 -+++ Opcodes/gab/sliderTable.c 2007-06-11 18:29:35.000000000 +0200 -@@ -364,9 +364,9 @@ static int sliderTable64(CSOUND *csound, +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++ = \ diff --git a/csound-memset-fix.patch b/csound-memset-fix.patch new file mode 100644 index 0000000..af4f163 --- /dev/null +++ b/csound-memset-fix.patch @@ -0,0 +1,13 @@ +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-python-2.6-fix.diff b/csound-python-2.6-fix.diff deleted file mode 100644 index ba8db24..0000000 --- a/csound-python-2.6-fix.diff +++ /dev/null @@ -1,145 +0,0 @@ ---- SConstruct-dist 2008-10-01 14:46:05.000000000 +0200 -+++ SConstruct 2008-10-01 15:25:35.000000000 +0200 -@@ -266,19 +266,19 @@ - Tool('mingw')(commonEnvironment) - - customCPPPATH = commonEnvironment['customCPPPATH'] --commonEnvironment.Prepend(CPPPATH = customCPPPATH) -+commonEnvironment.Prepend(CPPPATH = Split(customCPPPATH)) - customCCFLAGS = commonEnvironment['customCCFLAGS'] --commonEnvironment.Prepend(CCFLAGS = customCCFLAGS) -+commonEnvironment.Prepend(CCFLAGS = Split(customCCFLAGS)) - customCXXFLAGS = commonEnvironment['customCXXFLAGS'] --commonEnvironment.Prepend(CXXFLAGS = customCXXFLAGS) -+commonEnvironment.Prepend(CXXFLAGS = Split(customCXXFLAGS)) - customLIBS = commonEnvironment['customLIBS'] --commonEnvironment.Prepend(LIBS = customLIBS) -+commonEnvironment.Prepend(LIBS = Split(customLIBS)) - customLIBPATH = commonEnvironment['customLIBPATH'] --commonEnvironment.Prepend(LIBPATH = customLIBPATH) -+commonEnvironment.Prepend(LIBPATH = Split(customLIBPATH)) - customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS'] --commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS) -+commonEnvironment.Prepend(SHLINKFLAGS = Split(customSHLINKFLAGS)) - customSWIGFLAGS = commonEnvironment['customSWIGFLAGS'] --commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS) -+commonEnvironment.Prepend(SWIGFLAGS = Split(customSWIGFLAGS)) - - # Define options for different platforms. - if getPlatform() != 'win32': -@@ -339,15 +339,15 @@ - # Define different build environments for different types of targets. - - if not withMSVC(): -- commonEnvironment.Prepend(CCFLAGS = "-Wall") -+ commonEnvironment.Prepend(CCFLAGS = ["-Wall"]) - - if getPlatform() == 'linux': -- commonEnvironment.Append(CCFLAGS = "-DLINUX") -- commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS') -- commonEnvironment.Append(CPPPATH = '/usr/local/include') -- commonEnvironment.Append(CPPPATH = '/usr/include') -- commonEnvironment.Append(CPPPATH = '/usr/X11R6/include') -- commonEnvironment.Append(CCFLAGS = "-DPIPES") -+ commonEnvironment.Append(CCFLAGS = ["-DLINUX"]) -+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS']) -+ commonEnvironment.Append(CPPPATH = ['/usr/local/include']) -+ commonEnvironment.Append(CPPPATH = ['/usr/include']) -+ commonEnvironment.Append(CPPPATH = ['/usr/X11R6/include']) -+ commonEnvironment.Append(CCFLAGS = ["-DPIPES"]) - commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic']) - elif getPlatform() == 'darwin': - commonEnvironment.Append(CCFLAGS = "-DMACOSX") -@@ -519,9 +519,9 @@ - - if getPlatform() == 'win32': - if configure.CheckHeader("winsock.h", language = "C"): -- commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS') -+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS']) - elif configure.CheckHeader("sys/socket.h", language = "C"): -- commonEnvironment.Append(CPPFLAGS = '-DHAVE_SOCKETS') -+ commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS']) - - if getPlatform() == 'darwin': - commonEnvironment.Append(CPPFLAGS = '-DHAVE_DIRENT_H') -@@ -954,7 +954,7 @@ - pyModule_ = env.Program('_%s.so' % targetName, srcs) - else: - if getPlatform() == 'linux': -- pyModule_ = env.SharedLibrary('%s' % targetName, srcs, SHLIBPREFIX="_", SHLIBSUFFIX = '.so') -+ pyModule_ = env.SharedLibrary('%s' % targetName, srcs, SHLIBPREFIX="_", SHLIBSUFFIX = ['.so']) - else: - pyModule_ = env.SharedLibrary('_%s' % targetName, srcs, SHLIBSUFFIX = '.pyd') - if getPlatform() == 'win32' and pythonLibs[0] < 'python24': -@@ -992,7 +992,7 @@ - ''')) - csoundWrapperEnvironment = csoundInterfacesEnvironment.Copy() - fixCFlagsForSwig(csoundWrapperEnvironment) -- csoundWrapperEnvironment.Append(CPPFLAGS = '-D__BUILDING_CSOUND_INTERFACES') -+ csoundWrapperEnvironment.Append(CPPFLAGS = ['-D__BUILDING_CSOUND_INTERFACES']) - for option in csoundWrapperEnvironment['CCFLAGS']: - if string.find(option, '-D') == 0: - csoundWrapperEnvironment.Append(SWIGFLAGS = [option]) -@@ -1407,11 +1407,11 @@ - # distribution into the csound5/Opcodes/Loris directory, e.g. - # csound5/Opcodes/Loris/src/*, etc. - lorisEnvironment = pluginEnvironment.Copy() -- lorisEnvironment.Append(CCFLAGS = '-DHAVE_FFTW3_H') -+ lorisEnvironment.Append(CCFLAGS = ['-DHAVE_FFTW3_H']) - if commonEnvironment['buildRelease'] == '0': -- lorisEnvironment.Append(CCFLAGS = '-DDEBUG_LORISGENS') -+ lorisEnvironment.Append(CCFLAGS = ['-DDEBUG_LORISGENS']) - if getPlatform() == 'win32': -- lorisEnvironment.Append(CCFLAGS = '-D_MSC_VER') -+ lorisEnvironment.Append(CCFLAGS = ['-D_MSC_VER']) - if not withMSVC(): - lorisEnvironment.Append(CCFLAGS = Split(''' - -Wno-comment -Wno-unknown-pragmas -Wno-sign-compare -@@ -1474,15 +1474,15 @@ - ''') - stkEnvironment = pluginEnvironment.Copy() - if getPlatform() == 'win32': -- stkEnvironment.Append(CCFLAGS = '-D__OS_WINDOWS__') -+ stkEnvironment.Append(CCFLAGS = ['-D__OS_WINDOWS__']) - elif getPlatform() == 'linux': -- stkEnvironment.Append(CCFLAGS = '-D__OS_LINUX__') -+ stkEnvironment.Append(CCFLAGS = ['-D__OS_LINUX__']) - elif getPlatform() == 'darwin': -- stkEnvironment.Append(CCFLAGS = '-D__OS_MACOSX__') -+ stkEnvironment.Append(CCFLAGS = ['-D__OS_MACOSX__']) - if sys.byteorder == 'big': -- stkEnvironment.Append(CCFLAGS = '-D__BIG_ENDIAN__') -+ stkEnvironment.Append(CCFLAGS = ['-D__BIG_ENDIAN__']) - else: -- stkEnvironment.Append(CCFLAGS = '-D__LITTLE_ENDIAN__') -+ stkEnvironment.Append(CCFLAGS = ['-D__LITTLE_ENDIAN__']) - stkEnvironment.Prepend(CPPPATH = Split(''' - Opcodes/stk/include Opcodes/stk/src ./ ./../include - ''')) -@@ -1523,7 +1523,7 @@ - pyEnvironment.Append(LIBS = ['dl', 'm']) - elif getPlatform() == 'win32': - pyEnvironment['ENV']['PATH'] = os.environ['PATH'] -- pyEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols') -+ pyEnvironment.Append(SHLINKFLAGS = ['--no-export-all-symbols']) - pythonOpcodes = makePlugin(pyEnvironment, 'py', - ['Opcodes/py/pythonopcodes.c']) - if getPlatform() == 'win32' and pythonLibs[0] < 'python24': -@@ -1713,7 +1713,7 @@ - vstEnvironment.Append(SWIGFLAGS = Split('-c++ -includeall -verbose -outdir .')) - if getPlatform() == 'linux': - vstEnvironment.Append(LIBS = ['util', 'dl', 'm']) -- vstEnvironment.Append(SHLINKFLAGS = '--no-export-all-symbols') -+ vstEnvironment.Append(SHLINKFLAGS = ['--no-export-all-symbols']) - vstEnvironment.Append(LINKFLAGS = ['-Wl,-rpath-link,.']) - guiProgramEnvironment.Prepend(LINKFLAGS = ['-Wl,-rpath-link,.']) - os.spawnvp(os.P_WAIT, 'rm', ['rm', '-f', '_CsoundVST.so']) -@@ -2029,7 +2029,7 @@ - print "...Building csLadspa" - csLadspaEnv = commonEnvironment.Copy() - csLadspaEnv.Append(LIBS=libCsoundLibs) --csLadspaEnv.Append(CCFLAGS='-I./frontends/csladspa') -+csLadspaEnv.Append(CCFLAGS=['-I./frontends/csladspa']) - csladspa = csLadspaEnv.SharedLibrary('frontends/csladspa/csladspa.cpp', PREFIX="") - Depends(csladspa, csoundLibrary) - libs.append(csladspa) diff --git a/csound-sanitize-sys.patch b/csound-sanitize-sys.patch deleted file mode 100644 index 6ee1e98..0000000 --- a/csound-sanitize-sys.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/frontends/CsoundVST/Shell.cpp -+++ b/frontends/CsoundVST/Shell.cpp -@@ -211,6 +211,8 @@ namespace csound - void Shell::main(int argc, char **argv) - { - PySys_SetArgv_(argc, argv); -+ /* Sanitize sys.path */ -+ PyRun_SimpleString_("import sys; sys.path = filter(None, sys.path)"); - } - - void Shell::initialize() ---- a/frontends/CsoundVST/ScoreGeneratorVst.cpp -+++ b/frontends/CsoundVST/ScoreGeneratorVst.cpp -@@ -427,6 +427,8 @@ - Shell::open(); - char *argv[] = {"",""}; - PySys_SetArgv(1, argv); -+ /* Sanitize sys.path */ -+ PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)"); - PyObject *mainModule = PyImport_ImportModule("__main__"); - result = runScript("import sys\n"); - if(result) diff --git a/csound-strncat-fix.patch b/csound-strncat-fix.patch new file mode 100644 index 0000000..52651ac --- /dev/null +++ b/csound-strncat-fix.patch @@ -0,0 +1,28 @@ +Index: OOps/dumpf.c +=================================================================== +--- OOps/dumpf.c.orig ++++ OOps/dumpf.c +@@ -175,19 +175,19 @@ static void nkdump(CSOUND *csound, MYFLT + outbuf[0] = '\0'; + while (--nk) { + sprintf(buf1, "%ld\t", (long) *kp++); +- strncat(outbuf, buf1, 256); ++ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); + } + sprintf(buf1, "%ld\n", (long) *kp); +- strncat(outbuf, buf1, 256); ++ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); + len = strlen(outbuf); + break; + case 8: *outbuf = '\0'; + while (--nk) { + sprintf(buf1, "%6.4f\t", *kp++); +- strncat(outbuf, buf1, 256); ++ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); + } + sprintf(buf1, "%6.4f\n", *kp); +- strncat(outbuf, buf1, 256); ++ strncat(outbuf, buf1, sizeof(outbuf)-strlen(buf1)-1); + len = strlen(outbuf); + break; + default: csound->Die(csound, Str("unknown kdump format")); diff --git a/csound-tmpnam-fix.diff b/csound-tmpnam-fix.diff deleted file mode 100644 index 46cf9a9..0000000 --- a/csound-tmpnam-fix.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- Top/one_file.c-dist 2006-10-13 12:31:47.000000000 +0200 -+++ Top/one_file.c 2007-01-22 12:06:54.000000000 +0100 -@@ -24,6 +24,7 @@ - #include "csoundCore.h" - #include - #include -+#include - #if defined(LINUX) || defined(__MACH__) || defined(WIN32) - # include - # include -@@ -74,8 +75,11 @@ CS_NOINLINE char *csoundTmpFileName(CSOU - do { - #endif - #ifndef WIN32 -- if (tmpnam(buf) == NULL) -- csound->Die(csound, Str(" *** cannot create temporary file")); -+ int fd; -+ strcpy(buf, "/tmp/csoundXXXXXX"); -+ if ((fd = mkstemp(buf)) < 0) -+ csound->Die(csound, Str(" *** cannot create temporary file")); -+ close(fd); - #else - { - char *s = (char*) csoundGetEnv(csound, "SFDIR"); diff --git a/csound.changes b/csound.changes index 6162749..d01295f 100644 --- a/csound.changes +++ b/csound.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Jan 8 15:04:23 UTC 2012 - prusnak@opensuse.org + +- updated to version 5.15.0 +- drop unused patches +- fix wrong memset and strncat usage ({memset,strncat}-fix.patch) + ------------------------------------------------------------------- Sun Sep 18 00:04:38 UTC 2011 - jengelh@medozas.de diff --git a/csound.spec b/csound.spec index d39017c..7072a8b 100644 --- a/csound.spec +++ b/csound.spec @@ -1,7 +1,7 @@ # # spec file for package csound # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,28 +16,40 @@ # +%define support_fltk 0 Name: csound -%define support_fltk 0 -BuildRequires: alsa-devel fdupes fluidsynth-devel gcc-c++ jack-devel liblo-devel libsndfile-devel portaudio-devel python-devel scons swig +BuildRequires: alsa-devel +BuildRequires: bison +BuildRequires: fdupes +BuildRequires: flex +BuildRequires: fluidsynth-devel +BuildRequires: gcc-c++ +BuildRequires: jack-devel +BuildRequires: liblo-devel +BuildRequires: libsndfile-devel +BuildRequires: portaudio-devel +BuildRequires: python-devel +BuildRequires: scons +BuildRequires: swig %if %support_fltk -BuildRequires: fltk-devel libjpeg-devel libpng-devel xorg-x11-devel +BuildRequires: fltk-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: xorg-x11-devel %endif -Summary: Computer Sound Synthesis and Composition Program -Version: 5.06.0 -Release: 130 +Version: 5.15.0 +Release: 0 License: GFDL-1.2 ; LGPL-2.1+ ; MIT -Group: Productivity/Multimedia/Sound/Utilities -Source: Csound%{version}.tar.bz2 -Source1: README.SuSE -Patch: csound-alsa-fix.diff -Patch1: csound-tmpnam-fix.diff -Patch2: csound-gcc-warning-fix.diff -Patch3: csound-python-2.6-fix.diff -Patch4: csound-sanitize-sys.patch +Summary: Computer Sound Synthesis and Composition Program Url: http://www.csounds.com -AutoReq: on -Autoprov: off +Group: Productivity/Multimedia/Sound/Utilities +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 %description @@ -46,59 +58,56 @@ supports an unlimited amount of oscillators and filters. For detailed information, refer to http://www.csounds.com. - - %prep %setup -q -n Csound%{version} -%patch +%patch0 %patch1 %patch2 %patch3 -%patch4 -p1 +# remove __DATE__ from source files, causes unnecessary rebuilds +sed -i 's:__DATE__:"":' Engine/musmon.c frontends/CsoundVST/CsoundVstFltk.cpp Top/main.c +# copy readme cp %{SOURCE1} . # fix encoding -iconv -f latin1 -t utf8 readme-csound5.txt > readme-csound5.txt.utf8 -mv readme-csound5.txt.utf8 readme-csound5.txt +iconv -f latin1 -t utf8 readme-csound5.txt > README test -f custom.py || cp custom.py.mkg custom.py %build -%if %_lib == "lib64" +%if %{_lib} == "lib64" args="Word64=1" %else args="" %endif scons prefix=%{_prefix} buildRelease=1 $args \ - customCCFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - customCXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" + customCCFLAGS="%{optflags} -fno-strict-aliasing" \ + customCXXFLAGS="%{optflags} -fno-strict-aliasing" %install -%if %_lib == "lib64" +%if %{_lib} == "lib64" args="--word64" %else args="" %endif -./install.py --prefix=%{_prefix} --instdir="$RPM_BUILD_ROOT" $args -rm -f $RPM_BUILD_ROOT%{_prefix}/csound5-*.md5sums -rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/csound +./install.py --prefix=%{_prefix} --instdir=%{buildroot} $args +rm -f %{buildroot}%{_prefix}/csound5-*.md5sums +rm -rf %{buildroot}%{_datadir}/doc/csound # rename conflicting binary names -mv $RPM_BUILD_ROOT%{_bindir}/sndinfo $RPM_BUILD_ROOT%{_bindir}/csndinfo -mv $RPM_BUILD_ROOT%{_bindir}/extract $RPM_BUILD_ROOT%{_bindir}/csound-extract +mv %{buildroot}%{_bindir}/sndinfo %{buildroot}%{_bindir}/csndinfo +mv %{buildroot}%{_bindir}/extract %{buildroot}%{_bindir}/csound-extract # remove devel files -rm -f $RPM_BUILD_ROOT%{_libdir}/*.a -rm -rf $RPM_BUILD_ROOT%{_includedir} -%fdupes -s $RPM_BUILD_ROOT +rm -f %{buildroot}%{_libdir}/*.a +rm -rf %{buildroot}%{_includedir} +%fdupes -s %{buildroot} +%find_lang %{name}5 %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f %{name}5.lang %defattr(-,root,root) -%doc COPYING ChangeLog INSTALL readme-csound5.txt README.SuSE +%doc AUTHORS COPYING ChangeLog README README.SuSE %{_bindir}/* -%{_libdir}/csound -%{_datadir}/csound -# %{_includedir}/* -# %{_libdir}/lib* +%{_libdir}/csound/ %changelog From 4aa79fd7097fef28578e574b79a4c6589b62647c5345b7c9a0a0062250c747e0 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 9 Jan 2012 01:01:55 +0000 Subject: [PATCH 2/5] create devel subpackage OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=8 --- csound.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/csound.spec b/csound.spec index 7072a8b..f53f3fa 100644 --- a/csound.spec +++ b/csound.spec @@ -58,6 +58,14 @@ supports an unlimited amount of oscillators and filters. For detailed information, refer to http://www.csounds.com. +%package devel +Summary: Development files for Csound +Group: System/Libraries +Requires: %{name} = %{version} + +%description devel +Development files for Csound. + %prep %setup -q -n Csound%{version} %patch0 @@ -94,9 +102,6 @@ rm -rf %{buildroot}%{_datadir}/doc/csound # rename conflicting binary names mv %{buildroot}%{_bindir}/sndinfo %{buildroot}%{_bindir}/csndinfo mv %{buildroot}%{_bindir}/extract %{buildroot}%{_bindir}/csound-extract -# remove devel files -rm -f %{buildroot}%{_libdir}/*.a -rm -rf %{buildroot}%{_includedir} %fdupes -s %{buildroot} %find_lang %{name}5 @@ -110,4 +115,9 @@ rm -rf %{buildroot}%{_includedir} %{_bindir}/* %{_libdir}/csound/ +%files devel +%defattr(-,root,root) +%{_includedir}/csound/ +%{_libdir}/libcsound.a + %changelog From 6c05465afdf272c1a219fcf1da320dbd2c07a19c5efef6cd27067a863228d06d Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 9 Jan 2012 01:02:34 +0000 Subject: [PATCH 3/5] provide devel-static subpackage as well OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=9 --- csound.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/csound.spec b/csound.spec index f53f3fa..f3a5b1c 100644 --- a/csound.spec +++ b/csound.spec @@ -62,6 +62,7 @@ For detailed information, refer to http://www.csounds.com. Summary: Development files for Csound Group: System/Libraries Requires: %{name} = %{version} +Provides: %{name}-devel-static = %{version} %description devel Development files for Csound. From c47a535ceccc39531bd637aae500cfc65590d1452243bd05dc7d813f685a9b59 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Mon, 9 Jan 2012 01:02:53 +0000 Subject: [PATCH 4/5] - create -devel subpackage OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/csound?expand=0&rev=10 --- csound.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/csound.changes b/csound.changes index d01295f..876153e 100644 --- a/csound.changes +++ b/csound.changes @@ -4,6 +4,7 @@ Sun Jan 8 15:04:23 UTC 2012 - prusnak@opensuse.org - updated to version 5.15.0 - drop unused patches - fix wrong memset and strncat usage ({memset,strncat}-fix.patch) +- create -devel subpackage ------------------------------------------------------------------- Sun Sep 18 00:04:38 UTC 2011 - jengelh@medozas.de From 970539d04917596145fcad824b18ba0170a13abbcab6e546d560ab28d80230c3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 27 Feb 2012 13:14:19 +0000 Subject: [PATCH 5/5] 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