diff options
author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2018-07-10 12:46:35 +0000 |
---|---|---|
committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2018-07-10 12:46:35 +0000 |
commit | c4d0b9fbaa836e41f3736b93f8d391ce7f827ee5 (patch) | |
tree | eabcdbba65578c5af682343c089169629fd53a5a /databases/riak/files/patch-deps-node_package-priv-base-env.sh | |
parent | Maintainership back to Submitter (diff) |
Bring back databases/riak port
Distfiles are actually still available and we still using it at work
While here:
- take up maintainership
- pacify portlint (make makepatch, knobs ordering, add license file)
- unbreak build on recent -current
- remove JOBS_UNSAFE - builds fine here in poudriere with -J 4
Diffstat (limited to 'databases/riak/files/patch-deps-node_package-priv-base-env.sh')
-rw-r--r-- | databases/riak/files/patch-deps-node_package-priv-base-env.sh | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/databases/riak/files/patch-deps-node_package-priv-base-env.sh b/databases/riak/files/patch-deps-node_package-priv-base-env.sh new file mode 100644 index 000000000000..75c35f00088e --- /dev/null +++ b/databases/riak/files/patch-deps-node_package-priv-base-env.sh @@ -0,0 +1,28 @@ +--- deps/node_package/priv/base/env.sh.orig 2013-11-08 18:56:54 UTC ++++ deps/node_package/priv/base/env.sh +@@ -100,7 +100,7 @@ ping_node() { + # read/write/delete .pid files during startup/shutdown + create_pid_dir() { + # Validate RUNNER_USER is set and they have permissions to write to /var/run +- # Don't continue if we've already sudo'd to RUNNER_USER ++ # Don't continue if we've already su'd to RUNNER_USER + if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then + if [ -w $RUN_DIR ]; then + mkdir -p $PID_DIR +@@ -161,12 +161,13 @@ check_user() { + # Validate that the user running the script is the owner of the + # RUN_DIR. + if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then +- type sudo > /dev/null 2>&1 ++ type su > /dev/null 2>&1 + if [ "$?" -ne 0 ]; then +- echoerr "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 ++ echoerr "su doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2 + exit 1 + fi +- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ ++ ESCAPED_ARGS=`echo "$@" | sed -e 's/\([{}"]\)/\\\\\1/g'` ++ exec su - $RUNNER_USER -c "$RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $ESCAPED_ARGS" + fi + } + |