summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorAlejandro Pulver <alepulver@FreeBSD.org>2007-04-08 04:15:47 +0000
committerAlejandro Pulver <alepulver@FreeBSD.org>2007-04-08 04:15:47 +0000
commitb706d52882edfab5c094f61fb2942fb6cb7137b3 (patch)
tree0a24670305cdf30fd198e0464ac3cf0ae8c8e809 /games
parent- Bump PORTREVISION. (diff)
- 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. PR: ports/111048 Submitted by: alepulver (myself) Approved by: danfe (maintainer, timeout) Reported by: Kyle Hunter <keletmaster@gmail.com>
Notes
Notes: svn path=/head/; revision=189463
Diffstat (limited to 'games')
-rw-r--r--games/quake2lnx/Makefile4
-rw-r--r--games/quake2lnx/files/patch-security13
2 files changed, 2 insertions, 15 deletions
diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile
index e497149e305d..4b8b55deb8d5 100644
--- a/games/quake2lnx/Makefile
+++ b/games/quake2lnx/Makefile
@@ -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 @@ OPTIONS= X11 "Build X11 software driver" on \
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 \
diff --git a/games/quake2lnx/files/patch-security b/games/quake2lnx/files/patch-security
index 89934359d270..900217da8bde 100644
--- a/games/quake2lnx/files/patch-security
+++ b/games/quake2lnx/files/patch-security
@@ -115,19 +115,6 @@ diff -u -r1.2 sv_main.c
// 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 ) )