[gentoo-commits] repo/gentoo:master commit in: games-fps/alienarena/files/, games-fps/alienarena/

[Alfredo Tupone]

commit:     e3a760e62c0a9d431cc9d3f7f84fa0e62ef5046b
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 18 19:20:00 2016 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Mon Jan 18 19:20:31 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3a760e6

games-fps/alienarena: Fix format-security. Bug #571894

Package-Manager: portage-2.2.26

 games-fps/alienarena/alienarena-20130827.ebuild             |  8 ++++++--
 games-fps/alienarena/files/alienarena-20130827-format.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/games-fps/alienarena/alienarena-20130827.ebuild 
b/games-fps/alienarena/alienarena-20130827.ebuild
index b07a3c2..4e19f1a 100644
--- a/games-fps/alienarena/alienarena-20130827.ebuild
+++ b/games-fps/alienarena/alienarena-20130827.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 EAPI=5
-inherit eutils gnome2-utils games
+inherit eutils gnome2-utils eutils games
 
 MY_PN=alienarena-7.66
 DESCRIPTION="Fast-paced multiplayer deathmatch game"
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/${MY_PN/_/.}
 
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-format.patch
+}
+
 src_configure() {
        egamesconf \
                --with-icondir=/usr/share/icons/hicolor/48x48/apps/ \

diff --git a/games-fps/alienarena/files/alienarena-20130827-format.patch 
b/games-fps/alienarena/files/alienarena-20130827-format.patch
new file mode 100644
index 0000000..4a88eab
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20130827-format.patch
@@ -0,0 +1,11 @@
+--- source/game/p_client.c.old 2016-01-18 20:13:25.147714704 +0100
++++ source/game/p_client.c     2016-01-18 20:13:38.776476727 +0100
+@@ -2123,7 +2123,7 @@
+ #else
+       ent->ctype = 0; //alien is default
+       sprintf(modelpath, "players/%s/human", playermodel);
+-      sprintf(ent->charModel, playermodel);
++      sprintf(ent->charModel, "%s", playermodel);
+       Q2_FindFile (modelpath, &file);
+       if(file) 
+       {