Security fixes from Debian, bug #191484

(Portage version: 2.1.3.9)

5 files changed, 85 insertions, 3 deletions

diff --git a/games-fps/alienarena/ChangeLog b/games-fps/alienarena/ChangeLog
index 67ff5b07a102..86a282c8f378 100644
--- a/games-fps/alienarena/ChangeLog
+++ b/games-fps/alienarena/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for games-fps/alienarena
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.5 2007/07/28 09:13:00 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/ChangeLog,v 1.6 2007/09/24 21:27:48 nyhm Exp $
+
+*alienarena-20070613-r1 (24 Sep 2007)
+
+  24 Sep 2007; Tristan Heaven <nyhm@gentoo.org>
+  +files/alienarena-20070613-dos.patch,
+  +files/alienarena-20070613-format-strings.patch,
+  -alienarena-20070613.ebuild, +alienarena-20070613-r1.ebuild:
+  Security fixes from Debian, bug #191484
 
   28 Jul 2007; Tristan Heaven <nyhm@gentoo.org> alienarena-20070613.ebuild:
   Fix dependencies for USE=sdl
diff --git a/games-fps/alienarena/alienarena-20070613.ebuild b/games-fps/alienarena/alienarena-20070613-r1.ebuild
index eb6c3714d818..3b73d70b5b08 100644
--- a/games-fps/alienarena/alienarena-20070613.ebuild
+++ b/games-fps/alienarena/alienarena-20070613-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20070613.ebuild,v 1.2 2007/07/28 09:13:00 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-fps/alienarena/alienarena-20070613-r1.ebuild,v 1.1 2007/09/24 21:27:48 nyhm Exp $
 
 inherit eutils flag-o-matic toolchain-funcs games
 
@@ -32,7 +32,10 @@ src_unpack() {
 	unpack ${A}
 	cd ${MY_PN}
 	rm -f */*.so
-	epatch "${FILESDIR}"/${P}-paths.patch
+	epatch \
+		"${FILESDIR}"/${P}-paths.patch \
+		"${FILESDIR}"/${P}-format-strings.patch \
+		"${FILESDIR}"/${P}-dos.patch
 	sed -i \
 		-e "s:GENTOO_DATADIR:${GAMES_DATADIR}/${PN}:" \
 		-e "s:GENTOO_LIBDIR:$(games_get_libdir)/${PN}:" \
diff --git a/games-fps/alienarena/files/alienarena-20070613-dos.patch b/games-fps/alienarena/files/alienarena-20070613-dos.patch
new file mode 100644
index 000000000000..2e63b1dde446
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070613-dos.patch
@@ -0,0 +1,13 @@
+# fix-CVE-2007-4754-CVE-2007-4755.dpatch by Nico Golde <nion@debian.org>
+
+--- source/server/sv_main.c
++++ source/server/sv_main.c
+@@ -152,7 +152,7 @@
+ 			nametxt[k]=0;

+ 			s = NET_AdrToString ( cl->netchan.remote_address);

+ 			Com_sprintf (player, sizeof(player), "%i %i \"%s\" \"%s\"\n", 

+-				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, s);

++				cl->edict->client->ps.stats[STAT_FRAGS], cl->ping, nametxt, "suppressed");

+ 			playerLength = strlen(player);

+ 			if (statusLength + playerLength >= sizeof(status) )

+ 				break;		// can't hold any more

diff --git a/games-fps/alienarena/files/alienarena-20070613-format-strings.patch b/games-fps/alienarena/files/alienarena-20070613-format-strings.patch
new file mode 100644
index 000000000000..daa8b37a4ec4
--- /dev/null
+++ b/games-fps/alienarena/files/alienarena-20070613-format-strings.patch
@@ -0,0 +1,58 @@
+# fix-CVE-2007-4754-CVE-2007-4755.dpatch by Nico Golde <nion@debian.org>
+
+--- source/game/acesrc/acebot_cmds.c
++++ source/game/acesrc/acebot_cmds.c
+@@ -142,7 +142,7 @@
+ 	va_end (argptr);
+ 
+ 	if (dedicated->value)
+-		gi.cprintf(NULL, PRINT_MEDIUM, bigbuffer);
++		gi.cprintf(NULL, PRINT_MEDIUM, "%s", bigbuffer);
+ 
+ 	for (i=0 ; i<maxclients->value ; i++)
+ 	{
+@@ -150,7 +150,7 @@
+ 		if (!cl_ent->inuse || cl_ent->is_bot)
+ 			continue;
+ 
+-		gi.cprintf(cl_ent,  PRINT_MEDIUM, bigbuffer);
++		gi.cprintf(cl_ent,  PRINT_MEDIUM, "%s", bigbuffer);
+ 	}
+ 
+ }
+@@ -171,7 +171,7 @@
+ 	len = vsprintf (bigbuffer,fmt,argptr);
+ 	va_end (argptr);
+ 
+-	gi.cprintf(ent, printlevel, bigbuffer);
++	gi.cprintf(ent, printlevel, "%s", bigbuffer);
+ 	
+ }
+ 
+@@ -191,7 +191,7 @@
+ 	len = vsprintf (bigbuffer,fmt,argptr);
+ 	va_end (argptr);
+ 	
+-	gi.centerprintf(ent, bigbuffer);
++	gi.centerprintf(ent,"%s", bigbuffer);
+ 	
+ }
+ 
+@@ -211,7 +211,7 @@
+ 	va_end (argptr);
+ 
+ 	if (dedicated->value)
+-		gi.cprintf(NULL, printlevel, bigbuffer);
++		gi.cprintf(NULL, printlevel, "%s", bigbuffer);
+ 
+ 	for (i=0 ; i<maxclients->value ; i++)
+ 	{
+@@ -219,7 +219,7 @@
+ 		if (!cl_ent->inuse || cl_ent->is_bot)
+ 			continue;
+ 
+-		gi.cprintf(cl_ent, printlevel, bigbuffer);
++		gi.cprintf(cl_ent, printlevel, "%s", bigbuffer);
+ 	}
+ }
+ 
diff --git a/games-fps/alienarena/files/digest-alienarena-20070613 b/games-fps/alienarena/files/digest-alienarena-20070613-r1
index d6346c0e6e31..d6346c0e6e31 100644
--- a/games-fps/alienarena/files/digest-alienarena-20070613
+++ b/games-fps/alienarena/files/digest-alienarena-20070613-r1