ports/111048: [PATCH] games/quake2lnx: fix "Bad challenge" error when connecting to a password protected server

[Alejandro Pulver]

>Number:         111048
>Category:       ports
>Synopsis:       [PATCH] games/quake2lnx: fix "Bad challenge" error when connecting to a password protected server
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Mar 31 02:40:00 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Alejandro Pulver
>Release:        FreeBSD 6.2-RELEASE i386
>Organization:
>Environment:


System: FreeBSD 6.2-RELEASE #0: Fri Jan 12 11:05:30 UTC 2007
    root at dessler.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP



>Description:


- Bump PORTREVISION.
- Remove code from patch-security which was causing a "Bad challenge" error when connecting to password protected servers.
- Turn GAME option to "off" by default (a functional game.so is installed by games/quake2-data) as in other Quake II engine ports.


>How-To-Repeat:





>Fix:


--- quake2lnx.diff begins here ---
Index: quake2lnx/Makefile
===================================================================
RCS file: /home/pcvs/ports/games/quake2lnx/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- quake2lnx/Makefile	8 Jan 2007 04:00:13 -0000	1.26
+++ quake2lnx/Makefile	31 Mar 2007 02:37:08 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	quake2lnx
 PORTVERSION=	0.16.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	games ipv6
 MASTER_SITES=	http://offload1.icculus.org/quake2/files/
 DISTNAME=	quake2-r${PORTVERSION}
@@ -31,7 +31,7 @@
 		AA		"Build ASCII software renderer" off \
 		CLIENT		"Build client executable" on \
 		SERVER		"Build dedicated server executable" on \
-		GAME		"Build a main game .so file" on \
+		GAME		"Build a main game .so file" off \
 		CTF		"Build Capture The Flag mod" off \
 		RETEXTURE	"Enable support of retextured graphics" off \
 		JOYSTICK	"Enable joystick support" off \
Index: quake2lnx/files/patch-security
===================================================================
RCS file: /home/pcvs/ports/games/quake2lnx/files/patch-security,v
retrieving revision 1.1
diff -u -r1.1 patch-security
--- quake2lnx/files/patch-security	15 Mar 2005 19:32:31 -0000	1.1
+++ quake2lnx/files/patch-security	31 Mar 2007 02:37:08 -0000
@@ -115,19 +115,6 @@
  
  	// force the IP key/value pair so the game can filter based on ip
  	Info_SetValueForKey (userinfo, "ip", NET_AdrToString(net_from));
-@@ -317,8 +318,11 @@
- 		{
- 			if (NET_CompareBaseAdr (net_from, svs.challenges[i].adr))
- 			{
--				if (challenge == svs.challenges[i].challenge)
-+				// sku - ignore zero challenges
-+				if( svs.challenges[i].challenge && challenge == svs.challenges[i].challenge ) {
-+					svs.challenges[i].challenge = 0;
- 					break;		// good
-+				}
- 				Netchan_OutOfBandPrint (NS_SERVER, adr, "print\nBad challenge.\n");
- 				return;
- 			}
 @@ -342,6 +346,11 @@
  			&& ( cl->netchan.qport == qport 
  			|| adr.port == cl->netchan.remote_address.port ) )
--- quake2lnx.diff ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: