Pullup ticket 1792 - requested by wiz

security update for bomberclone

Revisions pulled up:
- pkgsrc/games/bomberclone/Makefile		1.24
- pkgsrc/games/bomberclone/PLIST		1.10
- pkgsrc/games/bomberclone/distinfo		1.12
- pkgsrc/games/bomberclone/patches/patch-ac	removed
- pkgsrc/games/bomberclone/patches/patch-ad	removed

   Module Name:		pkgsrc
   Committed By:	wiz
   Date:		Wed Aug 16 15:35:25 UTC 2006

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

   Log Message:
   Update to 0.11.7:

   Version 0.11.7
   ==============
   2006-08-15

   - Added: BomberClone Icon to the bomberclone win32 binary.

   - Added: resolution 1280x800

   - Testing: Security Problems found by Luigi Auriemma
     Bugs: A] memcpy crash in rscache_add
           B] information disclosure in send_pkg
           C] simple error message termination
     for more informations look here:
     http://aluigi.altervista.org/adv/bcloneboom-adv.txt
     Solutions to
     A) rewrote the whole resend cache system, also send_mapinfo needed a
        bad workaround for a bug i couldn't find out. (to disable the workaround
        use ./configure CFLAGS=-DBUG_MAPINFO)
     B) made sure that the size of a packet is set right before send over
        the network. Found only the function (do_gameinfo) where something
        like this occured.
   	 do_pkg will also check the size of the incoming packet with the
   	 p->h.len value.
     C) accept the error packets only from the server of a game. Since only the
        server will send such type of packets.

   - Fixed: Security Problem found by Stefan Cornelius.
     For more information look here:
     https://lists.uni-koeln.de/pipermail/sec-info/Week-of-Mon-20060313/006561.html

   - Added: "more random" by Patrik Nilsson:
     This map type is just a hacked version of "autogenerated",
     and is as the name tells more random. Since both block,
     rock and nothing are placed randomly inside the border.

   - Fixed: High CPU usage in menus.
     This fix was made by Chris E..

   - Fixed: Bug with more as 8 different player graphics.
     The window size hasen't changed if there where more as
     8 different player graphics to choose from.

   - Removed the Dedicated Server Support from the game.
     The whole bomberclone game is not designed for a dedicated
     server. The test shown that the whole game would have to
     be rewritten. Also that the host can leave the game would
     not work no more.

5 files changed, 16 insertions, 52 deletions

diff --git a/games/bomberclone/Makefile b/games/bomberclone/Makefile
index a18f6629f7c..803b3547972 100644
--- a/games/bomberclone/Makefile
+++ b/games/bomberclone/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2006/06/26 21:54:26 wiz Exp $
+# $NetBSD: Makefile,v 1.23.2.1 2006/08/16 20:17:44 salo Exp $
 
-DISTNAME=		bomberclone-0.11.6.2
+DISTNAME=		bomberclone-0.11.7
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=bomberclone/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://www.bomberclone.de/
@@ -10,9 +11,15 @@ COMMENT=		Multi-player Bomberman clone
 
 CONFLICTS=		bomberclone-data-[0-9]*
 
+BUILDLINK_TRANSFORM+=	rm:-Werror
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 
+post-install:
+	${RM} -fr ${PREFIX}/share/bomberclone/*/CVS
+	${RM} -fr ${PREFIX}/share/bomberclone/*/*/CVS
+	${RM} -fr ${PREFIX}/share/bomberclone/*/*/*/CVS
+
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
diff --git a/games/bomberclone/PLIST b/games/bomberclone/PLIST
index c75becc443a..c19fa382f7f 100644
--- a/games/bomberclone/PLIST
+++ b/games/bomberclone/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2006/06/26 21:54:26 wiz Exp $
+@comment $NetBSD: PLIST,v 1.9.2.1 2006/08/16 20:17:44 salo Exp $
 bin/bomberclone
 share/bomberclone/gfx/font0.png
 share/bomberclone/gfx/font1.png
@@ -63,6 +63,7 @@ share/bomberclone/music/cinderella_clown.mod
 share/bomberclone/music/mario_is_a_weenie.xm
 share/bomberclone/music/slice_me_nice.xm
 share/bomberclone/music/zb-tnt.xm
+share/bomberclone/pixmaps/bomberclone.ico
 share/bomberclone/pixmaps/bomberclone.png
 share/bomberclone/player/dead0.png
 share/bomberclone/player/ghost.png
@@ -158,6 +159,7 @@ share/doc/bomberclone/INSTALL
 share/doc/bomberclone/NEWS
 share/doc/bomberclone/README
 share/doc/bomberclone/TODO
+share/doc/bomberclone/bomberclone.nsi
 @dirrm share/doc/bomberclone
 @dirrm share/bomberclone/tileset/zbb_frog
 @dirrm share/bomberclone/tileset/uccia_garbage
diff --git a/games/bomberclone/distinfo b/games/bomberclone/distinfo
index 1cef6f6a5bf..b612b92d012 100644
--- a/games/bomberclone/distinfo
+++ b/games/bomberclone/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.11 2006/06/26 21:54:26 wiz Exp $
+$NetBSD: distinfo,v 1.11.2.1 2006/08/16 20:17:44 salo Exp $
 
-SHA1 (bomberclone-0.11.6.2.tar.gz) = 35eb325cbfc54b4179d1acb1929e0ae7a0aa3781
-RMD160 (bomberclone-0.11.6.2.tar.gz) = a1570957c02f2836aaed9966597464ee177d61e7
-Size (bomberclone-0.11.6.2.tar.gz) = 8001287 bytes
+SHA1 (bomberclone-0.11.7.tar.bz2) = 108948667d0504cedfddaf4a55e69b221b14edbd
+RMD160 (bomberclone-0.11.7.tar.bz2) = e2267a1c80eb809f4c4233a98f68ad316ead2cb0
+Size (bomberclone-0.11.7.tar.bz2) = 7940132 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
deleted file mode 100644
index 4f468ea03a8..00000000000
--- a/games/bomberclone/patches/patch-ac
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/02/21 22:44:53 wiz 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
deleted file mode 100644
index be3afb51d7d..00000000000
--- a/games/bomberclone/patches/patch-ad
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/02/21 22:44:53 wiz 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);