CVS commit: pkgsrc/bootstrap

[Frédéric Fauberteau <triaxx%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   triaxx
Date:           Wed Apr 29 20:27:03 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: fix PR pkg/55217

Move sanitfy check for absolute path of $prefix at a place where we are
sure it has been defined to avoid that a bootstrap can be built in a path
containing symbolic link when --prefix is not specified and default $prefix
is set.


To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.278 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.277 pkgsrc/bootstrap/bootstrap:1.278
--- pkgsrc/bootstrap/bootstrap:1.277    Thu Mar 26 15:30:27 2020
+++ pkgsrc/bootstrap/bootstrap  Wed Apr 29 20:27:03 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.277 2020/03/26 15:30:27 nia Exp $
+# $NetBSD: bootstrap,v 1.278 2020/04/29 20:27:03 triaxx Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -497,7 +497,6 @@ while [ $# -gt 0 ]; do
        shift
 done
 
-checkarg_sane_absolute_path "$prefix" "--prefix"
 checkarg_sane_absolute_path "$pkgdbdir" "--pkgdbdir"
 checkarg_sane_absolute_path "$sysconfdir" "--sysconfdir"
 checkarg_sane_absolute_path "$varbase" "--varbase"
@@ -513,6 +512,7 @@ elif [ -z "$prefix" -o "$prefix" = "/usr
        prefix=/usr/pkg
        [ -z "$varbase" ] && varbase=/var
 fi
+checkarg_sane_absolute_path "$prefix" "--prefix"
 
 [ -z "$varbase" ] && varbase=${prefix}/var
 [ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb