cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/riak: fix riak-admin command functionality

Browse Source 
* Fis issues around riak-admin functionality in env.sh script
* Adjust COMMENT
* Bump PORTREVISION

PR:		212864
Submitted by:	rm
MFH:		2016Q3
This commit is contained in:
Bartek Rutkowski 2016-09-24 14:08:48 +00:00
parent 4457b85fc6
commit 55aec8abdb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=422722
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/riak/Makefile
View File

@ -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

13
databases/riak/files/patch-deps-node_package-priv-base-env.sh
View File

@ -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
}