[pkgsrc/pkgsrc-2019Q2]: pkgsrc/bootstrap Pullup ticket #5987 - requested by s...

[bsiegert <bsiegert%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ce0dcaa3765
branches:  pkgsrc-2019Q2
changeset: 408146:0ce0dcaa3765
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Sat Jul 06 16:23:36 2019 +0000

description:
Pullup ticket #5987 - requested by sevan
bootstrap: macOS build fix

Revisions pulled up:
- bootstrap/bootstrap                                           1.267

---
   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.

diffstat:

 bootstrap/bootstrap |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 417e0d75c649 -r 0ce0dcaa3765 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Tue Jul 02 13:19:10 2019 +0000
+++ b/bootstrap/bootstrap       Sat Jul 06 16:23:36 2019 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.266 2019/06/20 09:11:26 jperkin Exp $
+# $NetBSD: bootstrap,v 1.266.2.1 2019/07/06 16:23:36 bsiegert Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -353,7 +353,8 @@
        */)     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 "$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