Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: fix PR pkg/55217



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba14d8cb84af
branches:  trunk
changeset: 428610:ba14d8cb84af
user:      triaxx <triaxx%pkgsrc.org@localhost>
date:      Wed Apr 29 20:27:03 2020 +0000

description:
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:

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

diffs (27 lines):

diff -r eefaccb6ae1f -r ba14d8cb84af bootstrap/bootstrap
--- a/bootstrap/bootstrap       Wed Apr 29 20:25:46 2020 +0000
+++ b/bootstrap/bootstrap       Wed Apr 29 20:27:03 2020 +0000
@@ -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 @@
        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 @@
        prefix=/usr/pkg
        [ -z "$varbase" ] && varbase=/var
 fi
+checkarg_sane_absolute_path "$prefix" "--prefix"
 
 [ -z "$varbase" ] && varbase=${prefix}/var
 [ -z "$pkgdbdir" ] && pkgdbdir=${prefix}/pkgdb



Home | Main Index | Thread Index | Old Index