svn commit: r422722 - in head/databases/riak: . files

[Bartek Rutkowski]

Author: robak
Date: Sat Sep 24 14:08:48 2016
New Revision: 422722
URL: https://svnweb.freebsd.org/changeset/ports/422722

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

Modified:
  head/databases/riak/Makefile
  head/databases/riak/files/patch-deps-node_package-priv-base-env.sh

Modified: head/databases/riak/Makefile
==============================================================================
--- head/databases/riak/Makefile	Sat Sep 24 13:57:13 2016	(r422721)
+++ head/databases/riak/Makefile	Sat Sep 24 14:08:48 2016	(r422722)
@@ -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 at FreeBSD.org
-COMMENT=	Riak is an open source, distributed, noSQL database
+COMMENT=	Open source, distributed, noSQL database
 
 LICENSE=	APACHE20
 

Modified: head/databases/riak/files/patch-deps-node_package-priv-base-env.sh
==============================================================================
--- head/databases/riak/files/patch-deps-node_package-priv-base-env.sh	Sat Sep 24 13:57:13 2016	(r422721)
+++ head/databases/riak/files/patch-deps-node_package-priv-base-env.sh	Sat Sep 24 14:08:48 2016	(r422722)
@@ -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
  }
-
+