Import of pkgsrc-2016Q3

chat/ejabberd/patches/patch-ae

@@ -1,11 +1,21 @@
-$NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
+$NetBSD: patch-ae,v 1.15 2016/04/29 19:05:22 fhajny Exp $
 
 - Default locations.
-- Make it work with NetBSD's flock(1).
+- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
+  and AIX where Erlang relies on $HOME set correctly.
 
---- ejabberdctl.template.orig	2015-06-24 09:58:37.000000000 +0000
+--- ejabberdctl.template.orig	2016-04-28 13:57:55.000000000 +0000
 +++ ejabberdctl.template
-@@ -71,10 +71,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+@@ -27,7 +27,7 @@ if [ "$INSTALLUSER" != "" ] ; then
+                 mkdir -p "$INSTALLUSER_HOME"
+                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
+             fi
+-            EXEC_CMD="su $INSTALLUSER -c"
++            EXEC_CMD="su - $INSTALLUSER -c"
+         fi
+     done
+     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
+@@ -73,10 +73,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -19,29 +29,11 @@ $NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
 @@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+     ERLANG_NODE=$ERLANG_NODE_ARG
  fi
- if [ "{{release}}" != "true" ] ; then
-     if [ "$EJABBERDDIR" = "" ] ; then
--        EJABBERDDIR={{libdir}}/ejabberd
-+        EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@
-     fi
-     if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
-         EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -335,7 +335,7 @@ ctl()
-     # using flock if available. Expects a linux-style
-     # flock that can lock a file descriptor.
-     MAXCONNID=100
--    CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
-+    CONNLOCKDIR=@EJABBERD_PIDDIR@
-     FLOCK=/usr/bin/flock
-     if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
-         JOT=/usr/bin/jot
-@@ -362,7 +362,7 @@ ctl()
-             CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
-             (
-                 exec 8>"$CTL_LOCKFILE"
--                if flock --nb 8; then
-+                if flock -x -n 8; then
-                     ctlexec $CTL_CONN $COMMAND
-                     ssresult=$?
-                     # segregate from possible flock exit(1)
+ if [ "{{release}}" != "true" -a "$EJABBERD_BIN_PATH" = "" ] ; then
+-    EJABBERD_BIN_PATH={{libdir}}/ejabberd/priv/bin
++    EJABBERD_BIN_PATH={{libdir}}/erlang/lib/ejabberd/priv/bin
+ fi
+ EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
+ DATETIME=`date "+%Y%m%d-%H%M%S"`