Use a complete set of command line options for executing "flock" to make

"ejabberctl" work with NetBSD 7.0's flock(1) as well.

3 files changed, 23 insertions, 12 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 2aebae8315b..4d4b9c4a4c8 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.43 2014/07/31 10:31:51 fhajny Exp $
+# $NetBSD: Makefile,v 1.44 2014/08/21 19:32:27 tron Exp $
 
 DISTNAME=	ejabberd-14.07
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 73b9e28e43e..2e30ba29e32 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.25 2014/07/30 09:45:38 fhajny Exp $
+$NetBSD: distinfo,v 1.26 2014/08/21 19:32:27 tron Exp $
 
 SHA1 (ejabberd-14.07.tgz) = 321b28faedbc28f80664d4b301424b118dd0bad0
 RMD160 (ejabberd-14.07.tgz) = 6df710abe3a73746939930790623d65009c2b83f
 Size (ejabberd-14.07.tgz) = 3200975 bytes
 SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787
 SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
-SHA1 (patch-ae) = fbdefae69e864b0ae34384226d6da7e2b810a704
+SHA1 (patch-ae) = 542ac36eecc4b679dded78e56903686060fd643a
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index b1e28e69407..2970a78c2e4 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,9 +1,11 @@
-$NetBSD: patch-ae,v 1.8 2014/07/30 09:45:38 fhajny Exp $
+$NetBSD: patch-ae,v 1.9 2014/08/21 19:32:27 tron Exp $
 
-Default locations.
---- ejabberdctl.template.orig	2014-07-22 15:42:49.000000000 +0000
-+++ ejabberdctl.template
-@@ -22,7 +22,7 @@ if [ "$INSTALLUSER" != "" ] ; then
+- Default locations.
+- Make it work with NetBSD's flock(1).
+
+--- ejabberdctl.template.orig	2014-07-22 16:42:49.000000000 +0100
++++ ejabberdctl.template	2014-08-21 20:17:35.000000000 +0100
+@@ -22,7 +22,7 @@
      EXEC_CMD="false"
      for GID in `id -G`; do
          if [ $GID -eq 0 ] ; then
@@ -12,7 +14,7 @@ Default locations.
          fi
      done
      if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-@@ -67,10 +67,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
+@@ -67,10 +67,10 @@
      EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
  fi
  if [ "$LOGS_DIR" = "" ] ; then
@@ -25,7 +27,7 @@ Default locations.
  fi
  if [ "$EJABBERD_DOC_PATH" = "" ] ; then
      EJABBERD_DOC_PATH={{docdir}}
-@@ -81,7 +81,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+@@ -81,7 +81,7 @@
  fi
  if [ "{{release}}" != "true" ] ; then
      if [ "$EJABBERDDIR" = "" ] ; then
@@ -34,7 +36,7 @@ Default locations.
      fi
      if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
          EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -281,7 +281,7 @@ ctl()
+@@ -281,7 +281,7 @@
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100
@@ -43,3 +45,12 @@ Default locations.
      FLOCK='/usr/bin/flock'
      if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
          JOT='/usr/bin/jot'
+@@ -308,7 +308,7 @@
+             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)