diff options
| author | robak <robak@FreeBSD.org> | 2016-09-24 22:08:48 +0800 |
|---|---|---|
| committer | robak <robak@FreeBSD.org> | 2016-09-24 22:08:48 +0800 |
| commit | 984d14abdcfbc338a2f373963d8fc3aa59130406 (patch) | |
| tree | ee5b9911aebbaf3f89728375e719624a64e1cdac /databases | |
| parent | 29d589bbe830984e1315f3dd40c9c9cd98fc7999 (diff) | |
| download | freebsd-ports-gnome-984d14abdcfbc338a2f373963d8fc3aa59130406.tar.gz freebsd-ports-gnome-984d14abdcfbc338a2f373963d8fc3aa59130406.tar.zst freebsd-ports-gnome-984d14abdcfbc338a2f373963d8fc3aa59130406.zip | |
databases/riak: fix riak-admin command functionality
* Fis issues around riak-admin functionality in env.sh script
* Adjust COMMENT
* Bump PORTREVISION
PR: 212864
Submitted by: rm
MFH: 2016Q3
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/riak/Makefile | 4 | ||||
| -rw-r--r-- | databases/riak/files/patch-deps-node_package-priv-base-env.sh | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/databases/riak/Makefile b/databases/riak/Makefile index b99e3ab814f4..61cab647f488 100644 --- a/databases/riak/Makefile +++ b/databases/riak/Makefile @@ -2,13 +2,13 @@ PORTNAME= riak PORTVERSION= 1.4.12 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/${PORTVERSION:R}/${PORTVERSION}/ \ http://downloads.basho.com.s3.amazonaws.com/riak/${PORTVERSION:R}/${PORTVERSION}/ MAINTAINER= robak@FreeBSD.org -COMMENT= Riak is an open source, distributed, noSQL database +COMMENT= Open source, distributed, noSQL database LICENSE= APACHE20 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 index 63c53f3a6d78..75c35f00088e 100644 --- a/databases/riak/files/patch-deps-node_package-priv-base-env.sh +++ b/databases/riak/files/patch-deps-node_package-priv-base-env.sh @@ -1,6 +1,6 @@ ---- deps/node_package/priv/base/env.sh.orig 2013-09-13 10:22:32.000000000 +0200 -+++ deps/node_package/priv/base/env.sh 2013-09-13 10:27:16.000000000 +0200 -@@ -100,7 +100,7 @@ +--- 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 @@ -9,7 +9,7 @@ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then if [ -w $RUN_DIR ]; then mkdir -p $PID_DIR -@@ -161,12 +161,12 @@ +@@ -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 @@ -21,7 +21,8 @@ exit 1 fi - exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@ -+ exec su - $RUNNER_USER -c "$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 } - + |