From 77c6e11b5ab11ffa01d65af9fd26c3697ee2a606659dda00817bd92ba5f3ed17 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Sat, 26 Sep 2015 19:23:31 +0000 Subject: [PATCH 1/7] Accepting request 333807 from home:nemysis:branches:games Please accept these changes. And enet-devel not works in 13.2, hmm. OBS-URL: https://build.opensuse.org/request/show/333807 OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=7 --- 7kaa-2.14.5.patch | 64 ++++++++++++++++++++++++++++++++++++++ 7kaa-2.14.5.tar.bz2 | 3 ++ 7kaa-source-2.14.4.tar.bz2 | 3 -- 7kaa.changes | 23 ++++++++++++++ 7kaa.spec | 23 ++++++++------ 5 files changed, 103 insertions(+), 13 deletions(-) create mode 100644 7kaa-2.14.5.patch create mode 100644 7kaa-2.14.5.tar.bz2 delete mode 100644 7kaa-source-2.14.4.tar.bz2 diff --git a/7kaa-2.14.5.patch b/7kaa-2.14.5.patch new file mode 100644 index 0000000..0b587bc --- /dev/null +++ b/7kaa-2.14.5.patch @@ -0,0 +1,64 @@ +diff -ruB 7kaa-2.14.5.orig/src/client/OFIRMIF.cpp 7kaa-2.14.5/src/client/OFIRMIF.cpp +--- 7kaa-2.14.5.orig/src/client/OFIRMIF.cpp 2015-05-19 03:00:20.000000000 +0200 ++++ 7kaa-2.14.5/src/client/OFIRMIF.cpp 2015-09-25 16:23:43.405735779 +0200 +@@ -491,7 +491,7 @@ + x = INFO_X1+6+i%4*50; + y = pop_disp_y1+1+i/4*29; + +- switch( mouse.single_click(x, y, x+27, y+23, 2) ) ++ switch( mouse.any_click(x, y, x+27, y+23, LEFT_BUTTON) ? 1 : (mouse.any_click(x, y, x+27, y+23, RIGHT_BUTTON) ? 2 : 0) ) + { + case 1: // left button to select worker + selected_worker_id = i+1; +diff -ruB 7kaa-2.14.5.orig/src/client/OF_BASE.cpp 7kaa-2.14.5/src/client/OF_BASE.cpp +--- 7kaa-2.14.5.orig/src/client/OF_BASE.cpp 2015-05-19 03:00:20.000000000 +0200 ++++ 7kaa-2.14.5/src/client/OF_BASE.cpp 2015-09-25 17:05:59.616753330 +0200 +@@ -238,8 +238,8 @@ + + //------ detect the overseer button -----// + +- int rc = mouse.single_click(INFO_X1+6, INFO_Y1+58, +- INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, 2 ); ++ int rc = mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, LEFT_BUTTON) ? 1 ++ : mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, RIGHT_BUTTON) ? 2 : 0; + + if( rc==1 ) // display this overseer's info + { +diff -ruB 7kaa-2.14.5.orig/src/client/OF_CAMP.cpp 7kaa-2.14.5/src/client/OF_CAMP.cpp +--- 7kaa-2.14.5.orig/src/client/OF_CAMP.cpp 2015-05-19 03:00:20.000000000 +0200 ++++ 7kaa-2.14.5/src/client/OF_CAMP.cpp 2015-09-25 17:07:32.962237653 +0200 +@@ -421,8 +421,8 @@ + + //------ detect the overseer button -----// + +- int rc = mouse.single_click(INFO_X1+6, INFO_Y1+58, +- INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, 2 ); ++ int rc = mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, LEFT_BUTTON) ? 1 ++ : mouse.any_click(INFO_X1+6, INFO_Y1+58, INFO_X1+5+UNIT_LARGE_ICON_WIDTH, INFO_Y1+57+UNIT_LARGE_ICON_HEIGHT, RIGHT_BUTTON) ? 2 : 0; + + if( rc==1 ) // display this overseer's info + { +diff -ruB 7kaa-2.14.5.orig/src/client/OF_MARK.cpp 7kaa-2.14.5/src/client/OF_MARK.cpp +--- 7kaa-2.14.5.orig/src/client/OF_MARK.cpp 2015-05-19 03:00:20.000000000 +0200 ++++ 7kaa-2.14.5/src/client/OF_MARK.cpp 2015-09-25 16:22:12.651232950 +0200 +@@ -814,7 +814,7 @@ + } + else + { +- market_product_array[marketGoods->raw_id-1] = NULL; ++ market_product_array[marketGoods->product_raw_id-1] = NULL; + marketGoods->product_raw_id = 0; + } + } +diff -ruB 7kaa-2.14.5.orig/src/client/OVOLUME.cpp 7kaa-2.14.5/src/client/OVOLUME.cpp +--- 7kaa-2.14.5.orig/src/client/OVOLUME.cpp 2015-05-19 03:00:20.000000000 +0200 ++++ 7kaa-2.14.5/src/client/OVOLUME.cpp 2015-09-25 16:24:29.805481641 +0200 +@@ -70,7 +70,7 @@ + long absY = posVolume.y >= 0 ? posVolume.y : -posVolume.y; + long dist = absX >= absY ? absX :absY; + if( dist <= DEFAULT_DIST_LIMIT ) +- rel_vol = rel_vol = 100 - dist * 100 / DEFAULT_VOL_DROP; ++ rel_vol = 100 - dist * 100 / DEFAULT_VOL_DROP; + else + rel_vol = 0; + diff --git a/7kaa-2.14.5.tar.bz2 b/7kaa-2.14.5.tar.bz2 new file mode 100644 index 0000000..cc62cb1 --- /dev/null +++ b/7kaa-2.14.5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:185308f54c829cde51a5a15231def904b8737e2a1502fa5469a2724ed0fa17a5 +size 38473819 diff --git a/7kaa-source-2.14.4.tar.bz2 b/7kaa-source-2.14.4.tar.bz2 deleted file mode 100644 index d25bce0..0000000 --- a/7kaa-source-2.14.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60b61f321db6c295330fb3fb21894bc41cb6e0bd797aff9abe45cf2392b49fa1 -size 27366752 diff --git a/7kaa.changes b/7kaa.changes index 662a6f2..7b35034 100644 --- a/7kaa.changes +++ b/7kaa.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +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 diff --git a/7kaa.spec b/7kaa.spec index 7706170..a3db157 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -1,7 +1,7 @@ # # spec file for package 7kaa # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,25 +19,27 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: 7kaa -Version: 2.14.4 +Version: 2.14.5 Release: 0 Summary: Seven Kingdoms: Ancient Adversaries License: GPL-2.0 Group: Amusements/Games/StrategyGame Url: http://7kfans.com/ -Source0: http://sourceforge.net/projects/skfans/files/7KAA%20%{version}/%{name}-source-%{version}.tar.bz2 +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 Source1: %{name}.png Source2: %{name}.desktop %if 0%{?suse_version} -BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: update-desktop-files %endif +BuildRequires: enet-devel BuildRequires: gcc-c++ BuildRequires: openal-soft-devel -BuildRequires: pkgconfig(SDL_net) -BuildRequires: pkgconfig(sdl) +BuildRequires: pkgconfig(sdl2) Recommends: %{name}-music +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Seven Kingdoms made departures from the traditional real-time strategy models @@ -58,10 +60,11 @@ the GPL v2. %prep %setup -q +%patch0 -p1 %build %configure --docdir=%{_docdir}/%{name} -make %{?_smp_mflags} +export CXXFLAGS="%{optflags} -fno-strict-aliasing" %install %make_install @@ -73,12 +76,12 @@ install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/pixmaps/%{name}.png install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/%{name}.desktop %if 0%{?suse_version} -%suse_update_desktop_file %{name} -%fdupes %{buildroot}%{_prefix} + %suse_update_desktop_file %{name} + %fdupes -s %{buildroot}%{_prefix} %endif %files -%defattr(-,root,root,-) +%defattr(-,root,root) %doc COPYING README %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop From 2b6521f4c4623140b536775b99d9136cbf9d2b98046d6a1b2923c41f87d555e1 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 14:11:08 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=8 --- 7kaa.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/7kaa.spec b/7kaa.spec index a3db157..150327e 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -65,6 +65,7 @@ the GPL v2. %build %configure --docdir=%{_docdir}/%{name} export CXXFLAGS="%{optflags} -fno-strict-aliasing" +make %{?_smp_mflags} %install %make_install From 700b7f5ee044f27172e06b922ab47a7ce97ca3dd57a02133195a9b3342b70361 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 14:22:32 +0000 Subject: [PATCH 3/7] OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=9 --- 7kaa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 150327e..97f7fa8 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -65,7 +65,7 @@ the GPL v2. %build %configure --docdir=%{_docdir}/%{name} export CXXFLAGS="%{optflags} -fno-strict-aliasing" -make %{?_smp_mflags} +make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing" %install %make_install From d0650c8ae432b7b899423993a2ec8b2cb51f9eddb392ed4d5cee51bc286cad9e Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 14:53:53 +0000 Subject: [PATCH 4/7] fix? OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=10 --- 7kaa.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/7kaa.spec b/7kaa.spec index 97f7fa8..469b151 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -63,9 +63,9 @@ the GPL v2. %patch0 -p1 %build -%configure --docdir=%{_docdir}/%{name} export CXXFLAGS="%{optflags} -fno-strict-aliasing" -make %{?_smp_mflags} CXXFLAGS="%{optflags} -fno-strict-aliasing" +%configure --docdir=%{_docdir}/%{name} +make %{?_smp_mflags} %install %make_install From 23bb223f8d4c7367f084e22f42410488b84e0d8a2c661c5b6312df28d4096098 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 15:06:45 +0000 Subject: [PATCH 5/7] update OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=11 --- 7kaa-2.14.5_overflow.patch | 30 ++++++++++++++++++++++++++++++ 7kaa.changes | 5 +++++ 7kaa.spec | 3 +++ 3 files changed, 38 insertions(+) create mode 100644 7kaa-2.14.5_overflow.patch diff --git a/7kaa-2.14.5_overflow.patch b/7kaa-2.14.5_overflow.patch new file mode 100644 index 0000000..fb82054 --- /dev/null +++ b/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; diff --git a/7kaa.changes b/7kaa.changes index 7b35034..3d48072 100644 --- a/7kaa.changes +++ b/7kaa.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/7kaa.spec b/7kaa.spec index 469b151..1c62d56 100644 --- a/7kaa.spec +++ b/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" From 103396aacf8b608feae76396d97f6f25b4ac826e350eb58e619c9d1f17c8ea6b Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 15:09:27 +0000 Subject: [PATCH 6/7] update OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=12 --- 7kaa.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7kaa.spec b/7kaa.spec index 1c62d56..12704e2 100644 --- a/7kaa.spec +++ b/7kaa.spec @@ -29,7 +29,7 @@ Source0: http://sourceforge.net/projects/skfans/files/7KAA%20%{version}/% # 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 +Patch1: %{name}-2.14.5_overflow.patch Source1: %{name}.png Source2: %{name}.desktop %if 0%{?suse_version} From a9349e25d7dcfa87daeabccf5464bf5b9f869abd69738bd49256633eb10ca5d0 Mon Sep 17 00:00:00 2001 From: Dirk Stoecker Date: Tue, 29 Sep 2015 15:17:56 +0000 Subject: [PATCH 7/7] update OBS-URL: https://build.opensuse.org/package/show/games/7kaa?expand=0&rev=13 --- 7kaa.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7kaa.changes b/7kaa.changes index 3d48072..ae7a558 100644 --- a/7kaa.changes +++ b/7kaa.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Tue Sep 29 15:06:37 UTC 2015 - opensuse@dstoecker.de -- patch buffer overflow +- patch buffer overflow (7kaa-2.14.5_overflow.patch) ------------------------------------------------------------------- Fri Sep 25 18:32:04 UTC 2015 - nemysis@openSUSE.org