From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 23 00:00:32 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5E4A116A41F for ; Fri, 23 Sep 2005 00:00:32 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id EC08643D46 for ; Fri, 23 Sep 2005 00:00:31 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.3/8.13.3) with ESMTP id j8N00VQw078459 for ; Fri, 23 Sep 2005 00:00:31 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.3/8.13.1/Submit) id j8N00Vbo078458; Fri, 23 Sep 2005 00:00:31 GMT (envelope-from gnats) Resent-Date: Fri, 23 Sep 2005 00:00:31 GMT Resent-Message-Id: <200509230000.j8N00Vbo078458@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Alejandro Pulver" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0951116A41F for ; 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 ; 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" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.6 Cc: Subject: ports/86480: [MAINTAINER UPDATE] games/warzone2100: fix segmentation fault and wrapper script X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Sep 2005 00:00:32 -0000 >Number: 86480 >Category: ports >Synopsis: [MAINTAINER UPDATE] games/warzone2100: fix segmentation fault and wrapper script >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Sep 23 00:00:30 GMT 2005 >Closed-Date: >Last-Modified: >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 # -# $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: >Unformatted: