update

OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=11

7kaa-2.14.5_overflow.patch

@@ -0,0 +1,30 @@
+diff -ur 7kaa-2.14.5/src/client/OGAMEMP.cpp 7kaa-2.14.5_fix/src/client/OGAMEMP.cpp
+--- 7kaa-2.14.5/src/client/OGAMEMP.cpp	2015-05-19 03:00:20.000000000 +0200
++++ 7kaa-2.14.5_fix/src/client/OGAMEMP.cpp	2015-09-29 17:05:01.007513932 +0200
+@@ -4966,7 +4966,7 @@
+ 					String str;
+ 
+ 					snprintf(str,
+-						 255,
++						 MAX_STR_LEN+1,
+ 						 ngettext("This multiplayer saved game needs %d human players while now there is only %d human player.",
+ 							  "This multiplayer saved game needs %d human players while now there are only %d human players.",
+ 							  regPlayerCount),
+@@ -5123,7 +5123,7 @@
+ 				String str;
+ 
+ 				snprintf(str,
+-					 255,
++					 MAX_STR_LEN+1,
+ 					 ngettext("This multiplayer saved game needs %d human players while now there is only %d human player.",
+ 						  "This multiplayer saved game needs %d human players while now there are only %d human players.",
+ 						  playerCount),
+@@ -5141,7 +5141,7 @@
+ 			{
+ 				String str;
+ 
+-				snprintf(str, 255, _("This multiplayer saved game can only support %d human players while now there are %d human players. The game cannot start."), maxPlayer, playerCount);
++				snprintf(str, MAX_STR_LEN+1, _("This multiplayer saved game can only support %d human players while now there are %d human players. The game cannot start."), maxPlayer, playerCount);
+ 
+ 				box.msg(str);
+ 				return 0;

7kaa.changes

@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue Sep 29 15:06:37 UTC 2015 - opensuse@dstoecker.de
+
+- patch buffer overflow
+
+-------------------------------------------------------------------
+Fri Sep 25 18:32:04 UTC 2015 - nemysis@openSUSE.org
+
+- Update to 2.14.5, announce message:
+
+ * Switched to using SDL2.
+ * Gained support for full-screen stretching.
+ * Gained support for MacOS.
+ * Switched to using enet, replacing SDL_net.
+ * Audio code improvements.
+ * The multiplayer connection code has stablized.
+ * New game hotkeys.
+ * Migrate population across extended town networks.
+ * Added ability to migrate 10 people at a time across between towns.
+ * Gettext translation support.
+ * Several bug fixes.
+
+- Add patch 7kaa-2.14.5.patch, - fix build
+- Remove BuildRequires for desktop-file-utils
+- Add BuildRequires, changed by Upstream for enet-devel and sdl2
+- Remove BuildRequires, changed by Upstream for SDL_net and sdl
+- Fix build with gcc5, add CXXFLAGS="%{optflags} -fno-strict-aliasing"
+
 -------------------------------------------------------------------
 Fri Nov  7 17:04:26 UTC 2014 - nemysis@gmx.ch
 

7kaa.spec

@@ -28,6 +28,8 @@ Url:            http://7kfans.com/
 Source0:        http://sourceforge.net/projects/skfans/files/7KAA%20%{version}/%{name}-%{version}.tar.bz2
 # PATCH-FIX-OPENSUSE - 7kaa-2.14.5.patch -- https://github.com/the3dfxdude/7kaa/issues/48
 Patch0:         %{name}-2.14.5.patch
+# PATCH-FIX-UPSTREAM - patch buffer overflow due to wrong size assumptions
+Patch0:         %{name}-2.14.5_overflow.patch
 Source1:        %{name}.png
 Source2:        %{name}.desktop
 %if 0%{?suse_version}
@@ -61,6 +63,7 @@ the GPL v2.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"