Fixed BUG #108724. Patch fixes usage of vsprintf.

Package-Manager: portage-2.0.53_rc6

4 files changed, 62 insertions, 8 deletions

diff --git a/games-action/xbomber/ChangeLog b/games-action/xbomber/ChangeLog
index af47d1031052..d1eacdf67e86 100644
--- a/games-action/xbomber/ChangeLog
+++ b/games-action/xbomber/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xbomber
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.6 2005/10/10 00:15:52 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/ChangeLog,v 1.7 2005/11/06 16:12:01 kugelfang Exp $
+
+  06 Nov 2005; Danny van Dyk <kugelfang@gentoo.org>
+  +files/xbomber-101-va_list.patch, xbomber-101.ebuild:
+  Fixed BUG #108724. Patch fixes usage of vsprintf.
 
   10 Oct 2005; Luis Medinas <metalgod@gentoo.org> xbomber-101.ebuild:
   Added ~amd64 keyword.
diff --git a/games-action/xbomber/Manifest b/games-action/xbomber/Manifest
index 3a7615ade974..fc815dc5ab2d 100644
--- a/games-action/xbomber/Manifest
+++ b/games-action/xbomber/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6266857596ff6ee22731ce6a63610423 ChangeLog 644
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 18a77a9ae420f18fc7801470f2960838 xbomber-101.ebuild 901
+MD5 f004c0550fd71063d5c6ce40961e687a ChangeLog 806
 MD5 291e88bb8c9b7116bf92e2213f46d600 files/digest-xbomber-101 60
+MD5 626494cc1742e60724d492110029787d files/xbomber-101-va_list.patch 905
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+MD5 f0ebf2d101bfb15b35ca9a0a5a6f08cf xbomber-101.ebuild 941
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFDScG9wUpWvClEHQoRArDpAJsGLhQZvLGHlc0bSNWWig/50L+JXgCeL01m
-xIAQNqZjtCfcfc3r/+jPynI=
-=gvS5
+iD8DBQFDbizO5mJXAu5GbtIRAjI0AJ94M2cZATJWoYO7LSqFIjS6FnlrdACfUT/u
+p8LM2kPbne1Zd9QlkY1BJBk=
+=s6yk
 -----END PGP SIGNATURE-----
diff --git a/games-action/xbomber/files/xbomber-101-va_list.patch b/games-action/xbomber/files/xbomber-101-va_list.patch
new file mode 100644
index 000000000000..cd15b84b00e3
--- /dev/null
+++ b/games-action/xbomber/files/xbomber-101-va_list.patch
@@ -0,0 +1,48 @@
+--- bomber.c.orig	2005-11-06 16:50:04.000000000 +0100
++++ bomber.c	2005-11-06 16:47:35.000000000 +0100
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdarg.h>
+ #include <unistd.h>
+ #include <string.h>
+ #include <sys/uio.h>
+@@ -626,8 +627,11 @@
+ void scrprintf(char *str,...)
+ {
+ char output[256],*p,*p2;
++va_list ap;
+ 
+-	vsprintf(output,str,&str+1);
++	va_start(ap, str);
++	vsprintf(output,str,ap);
++	va_end(ap);
+ 	p=output;
+ 	for(;;)
+ 	{
+@@ -653,8 +657,11 @@
+ void bigscrprintf(char *str,...)
+ {
+ char output[256],*p,*p2;
++va_list ap;
+ 
+-	vsprintf(output,str,&str+1);
++	va_start(ap, str);
++	vsprintf(output,str,ap);
++	va_end(ap);
+ 	p=output;
+ 	for(;;)
+ 	{
+@@ -1873,8 +1880,11 @@
+ additem(char *item,...)
+ {
+ char output[256];
++va_list ap;
+ 
+-	vsprintf(output,item,&item+1);
++	va_start(ap, item);
++	vsprintf(output,item,ap);
++	va_end(ap);
+ 	if(menunum<0)
+ 		menutitle=menuput;
+ 	else
diff --git a/games-action/xbomber/xbomber-101.ebuild b/games-action/xbomber/xbomber-101.ebuild
index 470dd008c60b..edc2a26a94eb 100644
--- a/games-action/xbomber/xbomber-101.ebuild
+++ b/games-action/xbomber/xbomber-101.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.7 2005/10/10 00:15:52 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xbomber/xbomber-101.ebuild,v 1.8 2005/11/06 16:12:01 kugelfang Exp $
 
 inherit games
 
@@ -23,6 +23,7 @@ src_unpack() {
 	sed -i "s:X386:X11R6:" Makefile
 	sed -i "s:data/%s:${GAMES_DATADIR}/${PN}/%s:" bomber.c
 	sed -i "s:=\"data\":=\"${GAMES_DATADIR}/${PN}\":" sound.c
+	epatch ${FILESDIR}/${P}-va_list.patch
 }
 
 src_compile() {