From owner-freebsd-ports Wed Dec 18 15: 0:19 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E336B37B401 for ; Wed, 18 Dec 2002 15:00:15 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3D4CA43EB2 for ; Wed, 18 Dec 2002 15:00:14 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id gBIN0Dx3097789 for ; Wed, 18 Dec 2002 15:00:13 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id gBIN0Dej097788; Wed, 18 Dec 2002 15:00:13 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 444ED37B401 for ; Wed, 18 Dec 2002 14:53:38 -0800 (PST) Received: from gioria.dyndns.org (AFontenayssB-104-1-1-242.abo.wanadoo.fr [217.128.58.242]) by mx1.FreeBSD.org (Postfix) with ESMTP id 62F2043EDA for ; Wed, 18 Dec 2002 14:53:36 -0800 (PST) (envelope-from root@gioria.dyndns.org) Received: from bushmills.intra.thorm.net (bushmills.intra.thorm.net [192.168.0.3]) by gioria.dyndns.org (Postfix) with ESMTP id E4A2E37485; Thu, 19 Dec 2002 00:02:40 +0100 (CET) Received: by bushmills.intra.thorm.net (Postfix, from userid 0) id 0E946B3DF; Wed, 18 Dec 2002 23:53:41 +0100 (CET) Message-Id: <20021218225341.0E946B3DF@bushmills.intra.thorm.net> Date: Wed, 18 Dec 2002 23:53:41 +0100 (CET) From: Sebastien Gioria Reply-To: Sebastien Gioria To: FreeBSD-gnats-submit@FreeBSD.org Cc: cyrille.lefevre@laposte.net X-Send-Pr-Version: 3.113 Subject: ports/46363: patch for building misc/sh-utils on 5.X and 4.7-STABLE Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 46363 >Category: ports >Synopsis: patch for building misc/sh-utils on 5.X and 4.7-STABLE >Confidential: no >Severity: serious >Priority: high >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Dec 18 15:00:13 PST 2002 >Closed-Date: >Last-Modified: >Originator: Sebastien Gioria >Release: FreeBSD 5.0-RC i386 >Organization: FreeBSD.ORG >Environment: System: FreeBSD bushmills.intra.thorm.net 5.0-RC FreeBSD 5.0-RC #16: Mon Dec 9 18:34:49 CET 2002 eagle@bushmills.intra.thorm.net:/usr/obj/usr/src/sys/bushmills i386 >Description: Actually misc/sh-utils does not build because redefinition of eaccess. >How-To-Repeat: cd /usr/ports/misc/sh-utils ; make >Fix: Apply this patch to src/test.c and the ports will be build on a 5.X Box and on a 4.7-STABLE Box (according to the documentation of __FreeBSD_Version in the porter_handbook). --- src/test.c.orig Wed Dec 18 23:37:09 2002 +++ src/test.c Wed Dec 18 23:37:21 2002 @@ -153,6 +153,7 @@ return (stat (path, finfo)); } +#if (__FreeBSD_version <= 470100) /* Do the same thing access(2) does, but use the effective uid and gid, and don't make the mistake of telling root that any file is executable. But this loses when the containing filesystem is mounted e.g. read-only. */ @@ -190,6 +191,7 @@ return (-1); } +#endif /* Increment our position in the argument list. Check that we're not past the end of the argument list. This check is supressed if the >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message