From alejandro@varnet.biz  Thu Sep 22 23:57:37 2005
Return-Path: <alejandro@varnet.biz>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 0951116A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Sep 2005 23:57:37 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: from relay03.pair.com (relay03.pair.com [209.68.5.17])
	by mx1.FreeBSD.org (Postfix) with SMTP id 8EED943D45
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 22 Sep 2005 23:57:36 +0000 (GMT)
	(envelope-from alejandro@varnet.biz)
Received: (qmail 20237 invoked from network); 22 Sep 2005 23:57:35 -0000
Received: from unknown (HELO phobos.mars.bsd) (unknown)
  by unknown with SMTP; 22 Sep 2005 23:57:35 -0000
Message-Id: <1127433446.0@phobos.mars.bsd>
Date: Thu, 22 Sep 2005 20:57:26 -0300
From: "Alejandro Pulver" <alejandro@varnet.biz>
To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@freebsd.org>
Subject: [MAINTAINER UPDATE] games/warzone2100: fix segmentation fault and wrapper script
X-Send-Pr-Version: gtk-send-pr 0.4.6 
X-GNATS-Notify:

>Number:         86480
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] games/warzone2100: fix segmentation fault and wrapper script
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    barner
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Sep 23 00:00:30 GMT 2005
>Closed-Date:    Fri Sep 23 08:45:18 GMT 2005
>Last-Modified:  Fri Sep 23 08:45:18 GMT 2005
>Originator:     Alejandro Pulver
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:





>Description:


Changes:
* Fix segmentation fault (it was calling "closedir()" with a NULL pointer as an argument, in Linux "closedir()" ignores it, but in FreeBSD it crashes).
* Fix wrapper script (arguments weren't passed to the real executable).


>How-To-Repeat:





>Fix:


--- warzone2100.diff begins here ---
diff -urN /usr/ports/games/warzone2100/Makefile warzone2100/Makefile
--- /usr/ports/games/warzone2100/Makefile	Fri Sep 16 08:07:08 2005
+++ warzone2100/Makefile	Wed Sep 21 11:19:38 2005
@@ -2,7 +2,7 @@
 # Date created:				21 Aug 2005
 # Whom:					Alejandro Pulver <alejandro@varnet.biz>
 #
-# $FreeBSD: ports/games/warzone2100/Makefile,v 1.1 2005/09/16 11:07:08 barner Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	warzone2100
diff -urN /usr/ports/games/warzone2100/files/patch-src_loadsave.c warzone2100/files/patch-src_loadsave.c
--- /usr/ports/games/warzone2100/files/patch-src_loadsave.c	Wed Dec 31 21:00:00 1969
+++ warzone2100/files/patch-src_loadsave.c	Thu Sep 22 15:41:21 2005
@@ -0,0 +1,22 @@
+--- src/loadsave.c.orig	Wed Jul 27 13:33:56 2005
++++ src/loadsave.c	Thu Sep 22 15:40:54 2005
+@@ -341,7 +341,8 @@
+ 				}
+ 			}
+ 		}
+-		closedir(d);
++		if (d)
++			closedir(d);
+ 	}
+ #endif
+ 	bLoadSaveUp = TRUE;
+@@ -444,7 +445,8 @@
+ 			DeleteFile(entry->d_name);
+ 		}
+ 
+-		closedir(d);
++		if (d)
++			closedir(d);
+ 	}
+ #endif
+ 
diff -urN /usr/ports/games/warzone2100/files/warzone.in warzone2100/files/warzone.in
--- /usr/ports/games/warzone2100/files/warzone.in	Fri Sep 16 08:07:08 2005
+++ warzone2100/files/warzone.in	Thu Sep 22 16:11:28 2005
@@ -4,4 +4,4 @@
 
 cd %%DATADIR%% || exit 1
 
-exec %%PREFIX%%/libexec/warzone
+exec %%PREFIX%%/libexec/warzone "$@"
--- warzone2100.diff ends here ---



>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->barner 
Responsible-Changed-By: barner 
Responsible-Changed-When: Fri Sep 23 08:26:42 GMT 2005 
Responsible-Changed-Why:  
Grab. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86480 
State-Changed-From-To: open->closed 
State-Changed-By: barner 
State-Changed-When: Fri Sep 23 08:44:49 GMT 2005 
State-Changed-Why:  
Committed, thanks. I also bumped PORTREVISON. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86480 
>Unformatted:
