From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 10 05:20:15 2006 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 2FF6816A405 for ; Mon, 10 Apr 2006 05:20:15 +0000 (UTC) (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 61FE843D49 for ; Mon, 10 Apr 2006 05:20:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3A5KEVV067676 for ; Mon, 10 Apr 2006 05:20:14 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3A5KEm1067675; Mon, 10 Apr 2006 05:20:14 GMT (envelope-from gnats) Resent-Date: Mon, 10 Apr 2006 05:20:14 GMT Resent-Message-Id: <200604100520.k3A5KEm1067675@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, Andrew McNaughton Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id DDBBE16A402 for ; Mon, 10 Apr 2006 05:18:19 +0000 (UTC) (envelope-from andrew@laika.scoop.co.nz) Received: from laika.scoop.co.nz (scoop.xtreme.net.nz [218.101.3.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2A2A443D5E for ; Mon, 10 Apr 2006 05:18:18 +0000 (GMT) (envelope-from andrew@laika.scoop.co.nz) Received: from laika.scoop.co.nz (localhost [127.0.0.1]) by laika.scoop.co.nz (8.13.4/8.13.4) with ESMTP id k395G0kk000499 for ; Sun, 9 Apr 2006 17:16:00 +1200 (NZST) (envelope-from andrew@laika.scoop.co.nz) Received: (from andrew@localhost) by laika.scoop.co.nz (8.13.4/8.13.4/Submit) id k395FxHu000498; Sun, 9 Apr 2006 17:15:59 +1200 (NZST) (envelope-from andrew) Message-Id: <200604090515.k395FxHu000498@laika.scoop.co.nz> Date: Sun, 9 Apr 2006 17:15:59 +1200 (NZST) From: Andrew McNaughton To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95566: ports/bash mishandles PREFIX (patch) X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Andrew McNaughton List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Apr 2006 05:20:15 -0000 >Number: 95566 >Category: ports >Synopsis: ports/bash mishandles PREFIX (patch) >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 10 05:20:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Andrew McNaughton >Release: FreeBSD 6.0-RELEASE i386 >Organization: Scoop Media Ltd http://www.scoop.co.nz/ >Environment: System: FreeBSD laika.scoop.co.nz 6.0-RELEASE FreeBSD 6.0-RELEASE #0: Thu Nov 3 09:36:13 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386 >Description: In order to have a familiar (fast) environment in a situation where I can't mount all my partitions, I want bash at /bin/bash, statically built. I also wan't portupgrade to upgrade bash safely without locking me out of accounts which specify their shell as /bin/bash. This should be no problem. There's an option for building a static binary, and I can set the PREFIX variable. Unfortunately, Compilation fails if I try to set PREFIX="", and if I set PREFIX=/, everything builds and installs OK, except that /etc/shells gets a line with '//bin/bash' instead of '/bin/bash', which means I can get locked out. Sure, most people don't install this way, but the consequences are serious. >How-To-Repeat: cd /usr/ports/shells/bash make install clean PREFIX=/ WITH_STATIC_BASH grep '//bin/bash' /etc/shells >Fix: The following changes seem to do the trick. --- bash.orig/pkg-deinstall Fri Oct 15 02:24:20 2004 +++ bash/pkg-deinstall Sun Apr 9 13:24:51 2006 @@ -3,7 +3,12 @@ # $FreeBSD: ports/shells/bash/pkg-deinstall,v 1.2 2004/10/14 13:24:20 eik Exp $ # -BASH="${PKG_PREFIX-/usr/local}/bin/bash" +if [ x"$PKG_PREFIX" = x"/" ]; then + BASH="/bin/bash" +else + BASH="${PKG_PREFIX-/usr/local}/bin/bash" +fi + SHELLS="${PKG_DESTDIR-}/etc/shells" case $2 in diff -urN bash.orig/pkg-install bash/pkg-install --- bash.orig/pkg-install Fri Oct 15 02:24:20 2004 +++ bash/pkg-install Sun Apr 9 13:24:39 2006 @@ -3,7 +3,12 @@ # $FreeBSD: ports/shells/bash/pkg-install,v 1.2 2004/10/14 13:24:20 eik Exp $ # -BASH="${PKG_PREFIX-/usr/local}/bin/bash" +if [ x"$PKG_PREFIX" = x"/" ]; then + BASH="/bin/bash" +else + BASH="${PKG_PREFIX-/usr/local}/bin/bash" +fi + SHELLS="${PKG_DESTDIR-}/etc/shells" case $2 in ------------------------------------------------------------------- Andrew McNaughton http://www.scoop.co.nz/ andrew@scoop.co.nz Mobile: +61 422 753 792 pgp keyid: 1C7A8CFD -- "Those who can make you believe absurdities can make you commit atrocities." -- Voltaire >Release-Note: >Audit-Trail: >Unformatted: