diff --git a/hydrogen-format-security.patch b/hydrogen-format-security.patch new file mode 100644 index 0000000..e5f17bf --- /dev/null +++ b/hydrogen-format-security.patch @@ -0,0 +1,15 @@ +diff -Nurp hydrogen-0.9.5.1/libs/hydrogen/src/object.cpp hydrogen-0.9.5.1.mod/libs/hydrogen/src/object.cpp +--- hydrogen-0.9.5.1/libs/hydrogen/src/object.cpp 2009-09-20 04:04:23.000000000 +0200 ++++ hydrogen-0.9.5.1.mod/libs/hydrogen/src/object.cpp 2013-12-10 07:18:00.506872464 +0100 +@@ -239,9 +239,9 @@ void* loggerThread_func( void* param ) + QString tmpString; + for( it = last = queue.begin() ; it != queue.end() ; ++it ) { + last = it; +- printf( it->toLocal8Bit() ); ++ printf("%s", qPrintable(it->toLocal8Bit())); + if( pLogFile ) { +- fprintf( pLogFile, it->toLocal8Bit() ); ++ fprintf( pLogFile, "%s", qPrintable(it->toLocal8Bit())); + fflush( pLogFile ); + } + } diff --git a/hydrogen-gcc47.patch b/hydrogen-gcc47.patch deleted file mode 100644 index e9c9f59..0000000 --- a/hydrogen-gcc47.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -rupN hydrogen-0.9.5.old/gui/src/MainForm.cpp hydrogen-0.9.5/gui/src/MainForm.cpp ---- hydrogen-0.9.5.old/gui/src/MainForm.cpp 2011-02-08 04:15:04.000000000 -0500 -+++ hydrogen-0.9.5/gui/src/MainForm.cpp 2012-01-16 15:44:14.137527313 -0500 -@@ -70,6 +70,7 @@ using namespace H2Core; - - #include - #include -+#include - - using namespace std; - using namespace H2Core; -diff -rupN hydrogen-0.9.5.old/gui/src/SongEditor/SongEditor.cpp hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp ---- hydrogen-0.9.5.old/gui/src/SongEditor/SongEditor.cpp 2010-03-28 06:06:05.000000000 -0400 -+++ hydrogen-0.9.5/gui/src/SongEditor/SongEditor.cpp 2012-01-16 15:26:17.172588849 -0500 -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - #include -diff -rupN hydrogen-0.9.5.old/libs/hydrogen/src/IO/portmidi_driver.cpp hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp ---- hydrogen-0.9.5.old/libs/hydrogen/src/IO/portmidi_driver.cpp 2010-02-01 16:06:17.000000000 -0500 -+++ hydrogen-0.9.5/libs/hydrogen/src/IO/portmidi_driver.cpp 2012-01-16 15:58:07.592740458 -0500 -@@ -30,6 +30,8 @@ - - #ifdef WIN32 - #include -+#else -+#include - #endif - - #ifdef PORTMIDI_SUPPORT diff --git a/hydrogen.spec b/hydrogen.spec index a16478b..e51cabc 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -1,7 +1,7 @@ Summary: Advanced drum machine for GNU/Linux Name: hydrogen Version: 0.9.5.1 -Release: 7%{?dist} +Release: 8%{?dist} URL: http://www.hydrogen-music.org/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz # Remove the "you are using the development version" warning @@ -11,6 +11,7 @@ Patch1: hydrogen-devel-warning.patch # We need to use pkgconfig to detect lrdf to get the right cflags # Temporary patch since upstream already switched from scons to cmake in trunk Patch2: hydrogen-lrdf-pkg.patch +Patch3: hydrogen-format-security.patch License: GPLv2+ @@ -61,6 +62,7 @@ sed -i '/porttime/d' Sconstruct %endif %patch1 -p1 -b .nodevver %patch2 -p1 -b .cflags +%patch3 -p1 -b .fmt-security # Workaround due to change in scons behavior. Just a temporary fix since upstream # switched to cmake in trunk @@ -133,6 +135,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Wed Dec 11 2013 Brendan Jones 0.9.5.1-8 +- format-security patch + * Sat Aug 03 2013 Fedora Release Engineering - 0.9.5.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild