Date: Tue, 16 Jan 2018 18:43:27 +0000 (UTC) From: Stefan Esser <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r459201 - head/ports-mgmt/portmaster/files Message-ID: <201801161843.w0GIhRC2010859@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Tue Jan 16 18:43:27 2018 New Revision: 459201 URL: https://svnweb.freebsd.org/changeset/ports/459201 Log: Test privileges early and complain if privileges are insufficient. The patch is based on ideas presented in the PR, but implemented differently. Re-open the PR, if this solution has unexpected side-effects or proves insufficient. PR: 174729 Reported by: ngie Approved by: antoine (implicit) Added: head/ports-mgmt/portmaster/files/ head/ports-mgmt/portmaster/files/patch-portmaster (contents, props changed) Added: head/ports-mgmt/portmaster/files/patch-portmaster ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/portmaster/files/patch-portmaster Tue Jan 16 18:43:27 2018 (r459201) @@ -0,0 +1,21 @@ +--- portmaster.orig 2018-01-14 21:53:23 UTC ++++ portmaster +@@ -45,7 +45,7 @@ if [ -z "$PM_PARENT_PID" ]; then + my_environment=`set` + + # If we are already root, unset this to avoid potential conflict +- [ `ps -o uid= $$` -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE ++ [ `id -u` -eq 0 ] && unset PM_SU_CMD PM_SU_VERBOSE + fi + + #=============== Begin functions we always want to have =============== +@@ -3233,6 +3233,9 @@ if [ -n "$PM_FIRST_PASS" -a -z "$FETCH_ONLY" ]; then + elif [ -n "$FETCH_ONLY" -a -n "$PM_PACKAGES" ]; then + update_pm_nu $portdir + fi ++ ++# Test for necessary privileges to actually install ports ++[ "$($PM_SU_CMD id -u)" = 0 ] || fail "Insufficient privileges to install ports (run as root or set PM_SU_CMD)" + + # Do these things first time through + if [ -z "$PM_INDEX_ONLY" -a -z "$PM_BUILDING" -a -z "$SHOW_WORK" -a -z "$NO_ACTION" ]; then
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801161843.w0GIhRC2010859>