Thu Aug 21 19:32:27 2014 UTC ()
Use a complete set of command line options for executing "flock" to make
"ejabberctl" work with NetBSD 7.0's flock(1) as well.


(tron)
diff -r1.43 -r1.44 pkgsrc/chat/ejabberd/Makefile
diff -r1.25 -r1.26 pkgsrc/chat/ejabberd/distinfo
diff -r1.8 -r1.9 pkgsrc/chat/ejabberd/patches/patch-ae
cvs diff -r1.43 -r1.44 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2014/07/31 10:31:51 1.43
+++ pkgsrc/chat/ejabberd/Makefile 2014/08/21 19:32:27 1.44
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.43 2014/07/31 10:31:51 fhajny Exp $ 1# $NetBSD: Makefile,v 1.44 2014/08/21 19:32:27 tron Exp $
2 2
3DISTNAME= ejabberd-14.07 3DISTNAME= ejabberd-14.07
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= chat 5CATEGORIES= chat
6MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.ejabberd.im/ 10HOMEPAGE= http://www.ejabberd.im/
11COMMENT= Free and Open Source distributed fault-tolerant Jabber server 11COMMENT= Free and Open Source distributed fault-tolerant Jabber server
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base 14BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base
15CONFLICTS+= jabberd-[0-9]* 15CONFLICTS+= jabberd-[0-9]*
16 16
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
cvs diff -r1.25 -r1.26 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2014/07/30 09:45:38 1.25
+++ pkgsrc/chat/ejabberd/distinfo 2014/08/21 19:32:27 1.26
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.25 2014/07/30 09:45:38 fhajny Exp $ 1$NetBSD: distinfo,v 1.26 2014/08/21 19:32:27 tron Exp $
2 2
3SHA1 (ejabberd-14.07.tgz) = 321b28faedbc28f80664d4b301424b118dd0bad0 3SHA1 (ejabberd-14.07.tgz) = 321b28faedbc28f80664d4b301424b118dd0bad0
4RMD160 (ejabberd-14.07.tgz) = 6df710abe3a73746939930790623d65009c2b83f 4RMD160 (ejabberd-14.07.tgz) = 6df710abe3a73746939930790623d65009c2b83f
5Size (ejabberd-14.07.tgz) = 3200975 bytes 5Size (ejabberd-14.07.tgz) = 3200975 bytes
6SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787 6SHA1 (patch-aa) = f573f541ae6963acffa5a470a290874b3312b787
7SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988 7SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
8SHA1 (patch-ae) = fbdefae69e864b0ae34384226d6da7e2b810a704 8SHA1 (patch-ae) = 542ac36eecc4b679dded78e56903686060fd643a
9SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe 9SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
cvs diff -r1.8 -r1.9 pkgsrc/chat/ejabberd/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-ae 2014/07/30 09:45:38 1.8
+++ pkgsrc/chat/ejabberd/patches/patch-ae 2014/08/21 19:32:27 1.9
@@ -1,45 +1,56 @@ @@ -1,45 +1,56 @@
1$NetBSD: patch-ae,v 1.8 2014/07/30 09:45:38 fhajny Exp $ 1$NetBSD: patch-ae,v 1.9 2014/08/21 19:32:27 tron Exp $
2 2
3Default locations. 3- Default locations.
4--- ejabberdctl.template.orig 2014-07-22 15:42:49.000000000 +0000 4- Make it work with NetBSD's flock(1).
5+++ ejabberdctl.template 5
6@@ -22,7 +22,7 @@ if [ "$INSTALLUSER" != "" ] ; then 6--- ejabberdctl.template.orig 2014-07-22 16:42:49.000000000 +0100
 7+++ ejabberdctl.template 2014-08-21 20:17:35.000000000 +0100
 8@@ -22,7 +22,7 @@
7 EXEC_CMD="false" 9 EXEC_CMD="false"
8 for GID in `id -G`; do 10 for GID in `id -G`; do
9 if [ $GID -eq 0 ] ; then 11 if [ $GID -eq 0 ] ; then
10- EXEC_CMD="su $INSTALLUSER -p -c" 12- EXEC_CMD="su $INSTALLUSER -p -c"
11+ EXEC_CMD="su $INSTALLUSER -m -c" 13+ EXEC_CMD="su $INSTALLUSER -m -c"
12 fi 14 fi
13 done 15 done
14 if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then 16 if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
15@@ -67,10 +67,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th 17@@ -67,10 +67,10 @@
16 EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml 18 EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
17 fi 19 fi
18 if [ "$LOGS_DIR" = "" ] ; then 20 if [ "$LOGS_DIR" = "" ] ; then
19- LOGS_DIR={{localstatedir}}/log/ejabberd 21- LOGS_DIR={{localstatedir}}/log/ejabberd
20+ LOGS_DIR=@EJABBERD_LOGDIR@ 22+ LOGS_DIR=@EJABBERD_LOGDIR@
21 fi 23 fi
22 if [ "$SPOOL_DIR" = "" ] ; then 24 if [ "$SPOOL_DIR" = "" ] ; then
23- SPOOL_DIR={{localstatedir}}/lib/ejabberd 25- SPOOL_DIR={{localstatedir}}/lib/ejabberd
24+ SPOOL_DIR=@EJABBERD_DB@ 26+ SPOOL_DIR=@EJABBERD_DB@
25 fi 27 fi
26 if [ "$EJABBERD_DOC_PATH" = "" ] ; then 28 if [ "$EJABBERD_DOC_PATH" = "" ] ; then
27 EJABBERD_DOC_PATH={{docdir}} 29 EJABBERD_DOC_PATH={{docdir}}
28@@ -81,7 +81,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then 30@@ -81,7 +81,7 @@
29 fi 31 fi
30 if [ "{{release}}" != "true" ] ; then 32 if [ "{{release}}" != "true" ] ; then
31 if [ "$EJABBERDDIR" = "" ] ; then 33 if [ "$EJABBERDDIR" = "" ] ; then
32- EJABBERDDIR={{libdir}}/ejabberd 34- EJABBERDDIR={{libdir}}/ejabberd
33+ EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@ 35+ EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@
34 fi 36 fi
35 if [ "$EJABBERD_EBIN_PATH" = "" ] ; then 37 if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
36 EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin 38 EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
37@@ -281,7 +281,7 @@ ctl() 39@@ -281,7 +281,7 @@
38 # using flock if available. Expects a linux-style 40 # using flock if available. Expects a linux-style
39 # flock that can lock a file descriptor. 41 # flock that can lock a file descriptor.
40 MAXCONNID=100 42 MAXCONNID=100
41- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl 43- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
42+ CONNLOCKDIR=@EJABBERD_PIDDIR@ 44+ CONNLOCKDIR=@EJABBERD_PIDDIR@
43 FLOCK='/usr/bin/flock' 45 FLOCK='/usr/bin/flock'
44 if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then 46 if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
45 JOT='/usr/bin/jot' 47 JOT='/usr/bin/jot'
 48@@ -308,7 +308,7 @@
 49 CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
 50 (
 51 exec 8>"$CTL_LOCKFILE"
 52- if flock --nb 8; then
 53+ if flock -x -n 8; then
 54 ctlexec $CTL_CONN $COMMAND
 55 ssresult=$?
 56 # segregate from possible flock exit(1)