[BlockOutII] Fix crash when localtime() returns NULL (rhbz#1154305)

Hans de Goede jwrdegoede at fedoraproject.org
Wed Oct 22 17:27:08 UTC 2014


commit 2e16492160bf6389cf527b67638df3fb01740a41
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Oct 22 19:27:09 2014 +0200

    Fix crash when localtime() returns NULL (rhbz#1154305)

 BlockOutII.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/BlockOutII.spec b/BlockOutII.spec
index bb1c348..327a8ca 100644
--- a/BlockOutII.spec
+++ b/BlockOutII.spec
@@ -5,7 +5,7 @@
 
 Name:           BlockOutII
 Version:        2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A free adaptation of the original BlockOut DOS game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -23,7 +23,10 @@ Patch2:         BlockOutII-2.3-bl2Home.patch
 Patch3:         BlockOutII-2.3-music.patch
 Patch4:         BlockOutII-2.3-restore-resolution.patch
 Patch5:         BlockOutII-2.3-libpng15.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1037001
 Patch6:         BlockOutII-2.3-format-security.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1154305
+Patch7:         BlockOutII-2.3-localtime-null.patch
 BuildRequires:  SDL_mixer-devel libpng-devel desktop-file-utils
 Requires:       hicolor-icon-theme opengl-games-utils
 
@@ -49,6 +52,7 @@ Pons.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 # Convert the README and put it somewhere we can use it from %%doc
 iconv -f ISO8859-1 -t UTF8 %{SOURCE1} > t; mv t BlockOut/README.txt
@@ -109,6 +113,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 %changelog
+* Wed Oct 22 2014 Hans de Goede <hdegoede at redhat.com> - 2.4-10
+- Fix crash when localtime() returns NULL (rhbz#1154305)
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 


More information about the scm-commits mailing list