Pullup ticket 1822 - requested by adrianp

security fix for gtetrinet

Revisions pulled up:
- pkgsrc/games/gtetrinet/Makefile			1.34
- pkgsrc/games/gtetrinet/distinfo			1.5
- pkgsrc/games/gtetrinet/patches/patch-ac		1.1

   Module Name:	pkgsrc
   Committed By:	adrianp
   Date:		Sat Sep  2 12:38:23 UTC 2006

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

   Log Message:
   Fix for CVE-2006-3125 via Debian.
   Bump to nb8

3 files changed, 124 insertions, 3 deletions

diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 07e5a2629b1..f554664b0ea 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.32 2006/04/17 13:46:28 wiz Exp $
+# $NetBSD: Makefile,v 1.32.2.1 2006/09/11 12:33:09 ghen Exp $
 #
 
 DISTNAME=	gtetrinet-0.7.7
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	games gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtetrinet/0.7/}
 
diff --git a/games/gtetrinet/distinfo b/games/gtetrinet/distinfo
index 051b26be2c9..a46c06b1fff 100644
--- a/games/gtetrinet/distinfo
+++ b/games/gtetrinet/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:11:59 agc Exp $
+$NetBSD: distinfo,v 1.4.12.1 2006/09/11 12:33:09 ghen Exp $
 
 SHA1 (gtetrinet-0.7.7.tar.gz) = 4223617048386b58e2654b2cbe987ea1f7591011
 RMD160 (gtetrinet-0.7.7.tar.gz) = b2e107538e68af9aa403f4d286ad6bf5691a299a
 Size (gtetrinet-0.7.7.tar.gz) = 476896 bytes
 SHA1 (patch-aa) = d6496e30634be397cabe574ce2b0595f354f00e4
 SHA1 (patch-ab) = 3b7fbcaf1989bda98c445b34e278d7a9d76751f4
+SHA1 (patch-ac) = ece45fdb6e91f77b09425eb00ef7f796c8059c89
diff --git a/games/gtetrinet/patches/patch-ac b/games/gtetrinet/patches/patch-ac
new file mode 100644
index 00000000000..fbb7e2c2a50
--- /dev/null
+++ b/games/gtetrinet/patches/patch-ac
@@ -0,0 +1,120 @@
+$NetBSD: patch-ac,v 1.1.2.2 2006/09/11 12:33:09 ghen Exp $
+
+--- src/tetrinet.c.orig	2003-06-17 00:18:58.000000000 +0100
++++ src/tetrinet.c
+@@ -238,7 +238,7 @@ void tetrinet_inmessage (enum inmsg_type
+         break;
+     case IN_PLAYERNUM:
+         tmp_pnum = atoi (data);
+-        if (tmp_pnum >= MAX_PLAYERS)
++        if (tmp_pnum >= MAX_PLAYERS || tmp_pnum < 0)
+           break;
+         bigfieldnum = playernum = tmp_pnum;
+         if (!connected)
+@@ -296,7 +296,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             token = strtok (NULL, "");
+             if (token == NULL) break;
+@@ -324,7 +324,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             if (!playercount)
+               break;
+@@ -353,7 +353,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             if ((pnum == playernum) && !spectating)
+                 g_snprintf (buf, sizeof(buf),
+@@ -382,7 +382,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             token = strtok (NULL, "");
+             if (token == NULL) token = "";
+@@ -401,7 +401,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             token = strtok (NULL, "");
+             if (token == NULL) token = "";
+@@ -510,7 +510,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             token = strtok (NULL, "");
+             if (token == NULL) token = "";
+@@ -522,7 +522,7 @@ void tetrinet_inmessage (enum inmsg_type
+         {
+             int pnum;
+             pnum = atoi (data);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             /* player is out */
+             playerplaying[pnum] = 0;
+@@ -532,7 +532,7 @@ void tetrinet_inmessage (enum inmsg_type
+         {
+             int pnum;
+             pnum = atoi (data);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             if (teamnames[pnum][0])
+                 g_snprintf (buf, sizeof(buf),
+@@ -671,7 +671,7 @@ void tetrinet_inmessage (enum inmsg_type
+             s = strtok (data, " ");
+             if (s == NULL) break;
+             pnum = atoi (s);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum < 0)
+               break;
+             s = strtok (NULL, "");
+             if (s == NULL) break;
+@@ -705,14 +705,14 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             to = atoi (token);
+-            if (to >= MAX_PLAYERS)
++            if (to >= MAX_PLAYERS || to < 0)
+               break;
+             sbid = strtok (NULL, " ");
+             if (sbid == NULL) break;
+             token = strtok (NULL, "");
+             if (token == NULL) break;
+             from = atoi(token);
+-            if (from >= MAX_PLAYERS)
++            if (from >= MAX_PLAYERS || from < 0)
+               break;
+             for (sbnum = 0; sbinfo[sbnum].id; sbnum ++)
+                 if (strcmp (sbid, sbinfo[sbnum].id) == 0) break;
+@@ -727,7 +727,7 @@ void tetrinet_inmessage (enum inmsg_type
+             token = strtok (data, " ");
+             if (token == NULL) break;
+             pnum = atoi (token);
+-            if (pnum >= MAX_PLAYERS)
++            if (pnum >= MAX_PLAYERS || pnum <= 0)
+               break;
+             token = strtok (NULL, "");
+             if (token == NULL) break;