Received: by mail.netbsd.org (Postfix, from userid 605) id AB93084DA6; Tue, 2 Jul 2019 16:27:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3404E84D62 for ; Tue, 2 Jul 2019 16:27:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id uGoOuq4sVp41 for ; Tue, 2 Jul 2019 16:27:04 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id B4D3B84CCF for ; Tue, 2 Jul 2019 16:27:04 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id AE58CFBF4; Tue, 2 Jul 2019 16:27:04 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156208482447940" MIME-Version: 1.0 Date: Tue, 2 Jul 2019 16:27:04 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/bootstrap To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20190702162704.AE58CFBF4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_156208482447940 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Tue Jul 2 16:27:04 UTC 2019 Modified Files: pkgsrc/bootstrap: bootstrap Log Message: bootstrap/bootstrap: allow the working directory to be a symlink The working directory is only needed for bootstrapping pkgsrc, therefore there aren't too many packages that can fail. Loosening this check is needed for macOS, where /etc, /tmp and /var are symlinks to /private, and using /tmp as the workdir for bootstrapping is a sane choice. To generate a diff of this commit: cvs rdiff -u -r1.266 -r1.267 pkgsrc/bootstrap/bootstrap Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156208482447940 Content-Disposition: inline Content-Length: 1341 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/bootstrap/bootstrap diff -u pkgsrc/bootstrap/bootstrap:1.266 pkgsrc/bootstrap/bootstrap:1.267 --- pkgsrc/bootstrap/bootstrap:1.266 Thu Jun 20 09:11:26 2019 +++ pkgsrc/bootstrap/bootstrap Tue Jul 2 16:27:04 2019 @@ -1,6 +1,6 @@ #! /bin/sh -# $NetBSD: bootstrap,v 1.266 2019/06/20 09:11:26 jperkin Exp $ +# $NetBSD: bootstrap,v 1.267 2019/07/02 16:27:04 rillig Exp $ # # Copyright (c) 2001-2011 Alistair Crooks # All rights reserved. @@ -353,7 +353,8 @@ checkarg_sane_absolute_path() */) die "ERROR: The argument to $2 must not end in /." ;; *//* | */. | */./* | */.. | */../*) die "ERROR: The path $1 (from $2) must be canonical." ;; - /*) checkarg_no_symlink_path "$1" "$2" ;; + /*) [ "${3-}" = "may-be-symlink" ] \ + || checkarg_no_symlink_path "$1" "$2" ;; *) die "ERROR: The argument to $2 must be an absolute path." ;; esac } @@ -505,7 +506,7 @@ checkarg_sane_absolute_path "$sysconfdir checkarg_sane_absolute_path "$varbase" "--varbase" checkarg_sane_relative_path "$pkginfodir" "--pkginfodir" checkarg_sane_relative_path "$pkgmandir" "--pkgmandir" -checkarg_sane_absolute_path "$wrkdir" "--workdir" +checkarg_sane_absolute_path "$wrkdir" "--workdir" may-be-symlink # set defaults for system locations if not already set by the user wrkobjdir=${wrkdir}/pkgsrc --_----------=_156208482447940--