diff options
| author | triaxx <triaxx@pkgsrc.org> | 2020-04-29 20:27:03 +0000 |
|---|---|---|
| committer | triaxx <triaxx@pkgsrc.org> | 2020-04-29 20:27:03 +0000 |
| commit | 020ddb082ab99f0ae2a4d847c248c3a108fc6f4a (patch) | |
| tree | 4a0d710d9ef5fdf55477296ff627f3c9ddaadedd /bootstrap/bootstrap | |
| parent | 4239fe48626550a06ee959eebb9bac522ee7c7cc (diff) | |
| download | pkgsrc-020ddb082ab99f0ae2a4d847c248c3a108fc6f4a.tar.gz | |
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.
Diffstat (limited to 'bootstrap/bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 47a8c1d879a..28676abe994 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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> # 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/pkg" ]; then prefix=/usr/pkg [ -z "$varbase" ] && varbase=/var fi +checkarg_sane_absolute_path "$prefix" "--prefix" [ -z "$varbase" ] && varbase=${prefix}/var [ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb |