Pullup ticket 1158 - requested by Thomas Klausner

security fix for bomberclone

Revisions pulled up:
- pkgsrc/games/bomberclone/Makefile		1.20
- pkgsrc/games/bomberclone/distinfo		1.10
- pkgsrc/games/bomberclone/patches/patch-ac	1.1
- pkgsrc/games/bomberclone/patches/patch-ad	1.1

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Tue Feb 21 22:44:53 UTC 2006

   Modified Files:
   	pkgsrc/games/bomberclone: Makefile distinfo
   Added Files:
   	pkgsrc/games/bomberclone/patches: patch-ac patch-ad

   Log Message:
   Add patches for fixing
   	http://www.gentoo.org/security/en/glsa/glsa-200602-09.xml
   from Gentoo.

4 files changed, 48 insertions, 3 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index e13d6f0854c..99315949364 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2005/12/11 09:40:40 wiz Exp $
+# $NetBSD: Makefile,v 1.18.2.1 2006/02/24 15:44:22 salo Exp $
 
 DISTNAME=		bomberclone-0.11.6
-PKGREVISION=		1
+PKGREVISION=		3
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bomberclone/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/games/bomberclone/distinfo b/games/bomberclone/distinfo
index 3654a9d6758..7f800da85b5 100644
--- a/games/bomberclone/distinfo
+++ b/games/bomberclone/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.9 2005/03/31 11:41:20 wiz Exp $
+$NetBSD: distinfo,v 1.9.6.1 2006/02/24 15:44:22 salo Exp $
 
 SHA1 (bomberclone-0.11.6.tar.bz2) = 4be64d9b1c4bc94a358702ae512598014acf8239
 RMD160 (bomberclone-0.11.6.tar.bz2) = 28e8a13c013e9a60c0b7420b539bc5c2d4547505
 Size (bomberclone-0.11.6.tar.bz2) = 7916944 bytes
 SHA1 (patch-aa) = b80396a7ad0a9e2fc1a4b32a4da845f07cbf28a7
 SHA1 (patch-ab) = 5f4d7769d12042271226123abd763d85e1aff196
+SHA1 (patch-ac) = dd7e54f9de35709fd0d9087a13b307e94416d42a
+SHA1 (patch-ad) = d87cc4bfcdbccf2f1c173ab10f6f30738e37a32a
diff --git a/games/bomberclone/patches/patch-ac b/games/bomberclone/patches/patch-ac
new file mode 100644
index 00000000000..6ee2c5b912e
--- /dev/null
+++ b/games/bomberclone/patches/patch-ac
@@ -0,0 +1,26 @@
+$NetBSD: patch-ac,v 1.1.2.2 2006/02/24 15:44:23 salo Exp $
+
+From http://dev.gentoo.org/~plasmaroo/stuff/bomberclone-fix-kaboom.patch
+fixing http://www.gentoo.org/security/en/glsa/glsa-200602-09.xml
+(part 1).
+
+--- src/menu.c.orig	2005-03-27 03:31:50.000000000 +0200
++++ src/menu.c
+@@ -629,7 +629,7 @@ menu_displaymessage (char *title, char *
+     memset (text, 0, sizeof (text));
+     memset (out, 0, sizeof (out));
+     va_start (args, fmt);
+-    vsprintf (text, fmt, args);
++    vsnprintf (text, 512, fmt, args);
+     va_end (args);
+ 
+     menu_formattext (text, out, lines, &linenr, &maxlinelen, MENU_MESSAGES_MAXLINELEN,
+@@ -722,7 +722,7 @@ menu_displaytext (char *title, char *fmt
+     memset (text, 0, sizeof (text));
+     memset (out, 0, sizeof (out));
+     va_start (args, fmt);
+-    vsprintf (text, fmt, args);
++    vsnprintf (text, 512, fmt, args);
+     va_end (args);
+ 
+     menu_formattext (text, out, lines, &linenr, &maxlinelen, MENU_MESSAGES_MAXLINELEN,
diff --git a/games/bomberclone/patches/patch-ad b/games/bomberclone/patches/patch-ad
new file mode 100644
index 00000000000..4eec83d5391
--- /dev/null
+++ b/games/bomberclone/patches/patch-ad
@@ -0,0 +1,17 @@
+$NetBSD: patch-ad,v 1.1.2.2 2006/02/24 15:44:23 salo Exp $
+
+From http://dev.gentoo.org/~plasmaroo/stuff/bomberclone-fix-kaboom.patch
+fixing http://www.gentoo.org/security/en/glsa/glsa-200602-09.xml
+(part 2).
+
+--- src/menulabels.c.orig	2004-09-12 18:49:48.000000000 +0200
++++ src/menulabels.c
+@@ -72,7 +72,7 @@ void menu_create_text (_menu *menu, char
+ 	memset (text, 0, sizeof (text));
+ 	memset (out, 0, sizeof (out));
+ 	va_start (args, fmt);
+-	vsprintf (text, fmt, args);
++	vsnprintf (text, 1024, fmt, args);
+ 	va_end (args);
+ 
+ 	menu_formattext (text, out, lineptr, &linecnt, &maxchar, maxlen, maxlines);