From b56387602a8bb8a6a722685c72a0664fb5851fa8 Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Jun 20 2014 13:30:16 +0000 Subject: Fix FTBFS (rhbz#1037375) --- diff --git a/vavoom-1.33-format-security.patch b/vavoom-1.33-format-security.patch new file mode 100644 index 0000000..28d04c2 --- /dev/null +++ b/vavoom-1.33-format-security.patch @@ -0,0 +1,51 @@ +diff -up vavoom-1.33/utils/vcc/vcc.cpp~ vavoom-1.33/utils/vcc/vcc.cpp +--- vavoom-1.33/utils/vcc/vcc.cpp~ 2010-04-21 15:15:40.000000000 +0200 ++++ vavoom-1.33/utils/vcc/vcc.cpp 2014-06-20 15:15:47.297819212 +0200 +@@ -122,7 +122,7 @@ int main(int argc, char **argv) + } + catch (VException& e) + { +- FatalError(e.What()); ++ FatalError("%s", e.What()); + } + return 0; + } +diff -up vavoom-1.33/source/misc.cpp~ vavoom-1.33/source/misc.cpp +--- vavoom-1.33/source/misc.cpp~ 2010-09-01 20:26:05.000000000 +0200 ++++ vavoom-1.33/source/misc.cpp 2014-06-20 15:23:18.803404958 +0200 +@@ -119,7 +119,7 @@ void FOutputDevice::Logf(EName Type, con + + void VLogSysError::Serialise(const char* V, EName) + { +- Sys_Error(V); ++ Sys_Error("%s", V); + } + + //========================================================================== +@@ -130,7 +130,7 @@ void VLogSysError::Serialise(const char* + + void VLogHostError::Serialise(const char* V, EName) + { +- Host_Error(V); ++ Host_Error("%s", V); + } + + //========================================================================== +diff -up vavoom-1.33/source/vc_object.cpp~ vavoom-1.33/source/vc_object.cpp +--- vavoom-1.33/source/vc_object.cpp~ 2010-06-04 23:20:21.000000000 +0200 ++++ vavoom-1.33/source/vc_object.cpp 2014-06-20 15:27:33.178529910 +0200 +@@ -477,12 +477,12 @@ IMPLEMENT_FUNCTION(VObject, IsDestroyed) + + IMPLEMENT_FUNCTION(VObject, Error) + { +- Host_Error(*PF_FormatString()); ++ Host_Error("%s", *PF_FormatString()); + } + + IMPLEMENT_FUNCTION(VObject, FatalError) + { +- Sys_Error(*PF_FormatString()); ++ Sys_Error("%s", *PF_FormatString()); + } + + //************************************************************************** diff --git a/vavoom.spec b/vavoom.spec index 3f107c0..186f89e 100644 --- a/vavoom.spec +++ b/vavoom.spec @@ -1,6 +1,6 @@ Name: vavoom Version: 1.33 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Enhanced Doom, Heretic, Hexen and Strife source port Source0: http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2 Source1: doom.autodlrc @@ -19,6 +19,7 @@ Source13: doom-logo.png Source14: tux-b2f.png Patch0: vavoom-1.21-datadir.patch Patch1: vavoom-1.27-CMakeLists.patch +Patch2: vavoom-1.33-format-security.patch URL: http://vavoom-engine.com/ Group: Amusements/Games License: GPLv2+ @@ -38,6 +39,7 @@ to play these classics under Linux. %setup -q %patch0 -p1 -b .datadir %patch1 -p1 +%patch2 -p1 %build %cmake -DWITH_LIBMAD:BOOL=OFF @@ -108,6 +110,9 @@ fi %{_datadir}/icons/hicolor/48x48/apps/*.png %changelog +* Fri Jun 20 2014 Hans de Goede - 1.33-10 +- Fix FTBFS (rhbz#1037375) + * Sun Jun 08 2014 Fedora Release Engineering - 1.33-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild @@ -217,7 +222,7 @@ fi * Sun Jul 23 2006 Wart 1.21.1-1 - Update to 1.21.1 -* Sat Jul 16 2006 Wart 1.21-2 +* Sun Jul 16 2006 Wart 1.21-2 - Remove some comments from the spec file - Remove shell script wrappers from /usr/bin - Update datadir patch to 1.21