Mon Jun 29 21:44:10 2015 UTC ()
Update chat/ejabberd to 15.06.

Message archiving
- Add support for message archiving in Mnesia or relational databases.

Protocol
- Document protocol support and version inside each module and use that
  info in documentation
- Remove deprecated XEP-0090 Entity Time and XEP-0091 Delayed Delivery
- Don't add body element to MUC subject messages
- Do not bounce normal messages sent to unavailable resource

Admin command-line tool
- Fixed several ejabberd commands
- Allow password with ';' passed in ejabberdctl
- Improve ejabberdctl external module install code, allows better
  error checking
- New ping ejabberdctl command to check if the node is up and running
- New commands for Multi-User chat management: get_room_options and
  get_user_rooms

Configuration
- Add config validation at startup
- Fix include of non yaml config files
- New option hide_sensitive_log_data to hide client IP address in log
- New option net_ticktime, to fine tune Erlang cluster networking
- New option max_users_presence in mod_muc, to avoid broadcasting
  presence packet from users after a chat room has reached a given size

Elixir
- Add correct package version for mix

Security
- New options to configure your own custom Diffie-Helman parameters:
  dhfile and s2s_dhfile

PubSub
- Enforce definition of pubsub node max_items
- Fix pubsub/odbc crash on remote user unsubscribe
- Fix use of publish_only affiliation with odbc backend

Multicast
- Pick first local multicast service, otherwise remote

Databases
- Fix anonymous user login, it wasn't stored in anonymous mnesia table
- Fixed some string/binary issues in ejabberd_odbc
- PostgreSQL storage: added missing sm (session manager) table

Packaging
- Microsoft Windows 64 bits installer
- Provide RPM and DEB binary packages for linux 64 bits.

Clean up
- Remove obsolete doc and win32 files


(fhajny)
diff -r1.54 -r1.55 pkgsrc/chat/ejabberd/Makefile
diff -r1.32 -r1.33 pkgsrc/chat/ejabberd/PLIST
diff -r1.33 -r1.34 pkgsrc/chat/ejabberd/distinfo
diff -r1.10 -r1.11 pkgsrc/chat/ejabberd/patches/patch-ae
diff -r1.3 -r0 pkgsrc/chat/ejabberd/patches/patch-deps_p1__iconv_rebar.config
cvs diff -r1.54 -r1.55 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2015/05/04 14:40:38 1.54
+++ pkgsrc/chat/ejabberd/Makefile 2015/06/29 21:44:10 1.55
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.54 2015/05/04 14:40:38 fhajny Exp $ 1# $NetBSD: Makefile,v 1.55 2015/06/29 21:44:10 fhajny Exp $
2 2
3DISTNAME= ejabberd-15.04 3DISTNAME= ejabberd-15.06
4PKGREVISION= 1 
5CATEGORIES= chat 4CATEGORIES= chat
6MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ 5MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
7EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
8 7
9DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz 8DISTFILES= ${DEFAULT_DISTFILES} ${DISTNAME}-deps.tar.gz
10SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/ 9SITES.${DISTNAME}-deps.tar.gz= ftp://ftp.NetBSD.org/pub/NetBSD/misc/fhajny/
11 10
12MAINTAINER= filip@joyent.com 11MAINTAINER= filip@joyent.com
13HOMEPAGE= http://www.ejabberd.im/ 12HOMEPAGE= http://www.ejabberd.im/
14COMMENT= Free and Open Source distributed fault-tolerant Jabber server 13COMMENT= Free and Open Source distributed fault-tolerant Jabber server
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16 15
17BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base 16BUILD_DEPENDS+= git-base>=1.5:../../devel/git-base
@@ -91,25 +90,20 @@ SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@ @@ -91,25 +90,20 @@ SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@
91SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g' 90SUBST_SED.paths+= -e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
92SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g' 91SUBST_SED.paths+= -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
93SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g' 92SUBST_SED.paths+= -e 's,@EJABBERD_PIDDIR@,${EJABBERD_PIDDIR},g'
94SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g' 93SUBST_SED.paths+= -e 's,@PREFIX@,${PREFIX},g'
95SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g' 94SUBST_SED.paths+= -e 's,@DISTNAME@,${DISTNAME},g'
96 95
97# Helper target to refresh remote deps for tarring up 96# Helper target to refresh remote deps for tarring up
98fetch-deps: 97fetch-deps:
99 cd ${WRKSRC} && ${RM} -rf deps && ${BUILD_MAKE_CMD} deps 98 cd ${WRKSRC} && ${RM} -rf deps && ${BUILD_MAKE_CMD} deps
100 99
101post-extract: 100post-extract:
102 ${LN} -s ${WRKDIR}/deps ${WRKSRC}/ 101 ${LN} -s ${WRKDIR}/deps ${WRKSRC}/
103 102
104post-install: 
105 ${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 
106 ${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 
107 ${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE} 
108 
109.include "../../converters/libiconv/buildlink3.mk" 103.include "../../converters/libiconv/buildlink3.mk"
110.include "../../devel/zlib/buildlink3.mk" 104.include "../../devel/zlib/buildlink3.mk"
111.include "../../lang/erlang/buildlink3.mk" 105.include "../../lang/erlang/buildlink3.mk"
112.include "../../security/openssl/buildlink3.mk" 106.include "../../security/openssl/buildlink3.mk"
113.include "../../textproc/expat/buildlink3.mk" 107.include "../../textproc/expat/buildlink3.mk"
114.include "../../textproc/libyaml/buildlink3.mk" 108.include "../../textproc/libyaml/buildlink3.mk"
115.include "../../mk/bsd.pkg.mk" 109.include "../../mk/bsd.pkg.mk"
cvs diff -r1.32 -r1.33 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2015/05/04 14:40:38 1.32
+++ pkgsrc/chat/ejabberd/PLIST 2015/06/29 21:44:10 1.33
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.32 2015/05/04 14:40:38 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.33 2015/06/29 21:44:10 fhajny Exp $
2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam 2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam 3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
4lib/erlang/lib/${PKGNAME}/ebin/acl.beam 4lib/erlang/lib/${PKGNAME}/ebin/acl.beam
5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam 5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
6lib/erlang/lib/${PKGNAME}/ebin/bitmap.beam 6lib/erlang/lib/${PKGNAME}/ebin/bitmap.beam
7lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam 7lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
8lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam 8lib/erlang/lib/${PKGNAME}/ebin/cache_tab_app.beam
9lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam 9lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam
10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam 10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam 11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
12lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam 12lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
13lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam 13lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
14lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam 14lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
@@ -150,26 +150,27 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_caps. @@ -150,26 +150,27 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_caps.
150lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam 150lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
151lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam 151lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
152lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam 152lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
153lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam 153lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam
154lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam 154lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam
155lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam 155lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam
156lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam 156lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam
157lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam 157lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam
158lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam 158lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam
159lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam 159lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
160lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam 160lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
161lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam 161lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam
162lib/erlang/lib/${PKGNAME}/ebin/mod_last.beam 162lib/erlang/lib/${PKGNAME}/ebin/mod_last.beam
 163lib/erlang/lib/${PKGNAME}/ebin/mod_mam.beam
163lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam 164lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam
164lib/erlang/lib/${PKGNAME}/ebin/mod_muc_admin.beam 165lib/erlang/lib/${PKGNAME}/ebin/mod_muc_admin.beam
165lib/erlang/lib/${PKGNAME}/ebin/mod_muc_log.beam 166lib/erlang/lib/${PKGNAME}/ebin/mod_muc_log.beam
166lib/erlang/lib/${PKGNAME}/ebin/mod_muc_room.beam 167lib/erlang/lib/${PKGNAME}/ebin/mod_muc_room.beam
167lib/erlang/lib/${PKGNAME}/ebin/mod_multicast.beam 168lib/erlang/lib/${PKGNAME}/ebin/mod_multicast.beam
168lib/erlang/lib/${PKGNAME}/ebin/mod_offline.beam 169lib/erlang/lib/${PKGNAME}/ebin/mod_offline.beam
169lib/erlang/lib/${PKGNAME}/ebin/mod_ping.beam 170lib/erlang/lib/${PKGNAME}/ebin/mod_ping.beam
170lib/erlang/lib/${PKGNAME}/ebin/mod_pres_counter.beam 171lib/erlang/lib/${PKGNAME}/ebin/mod_pres_counter.beam
171lib/erlang/lib/${PKGNAME}/ebin/mod_privacy.beam 172lib/erlang/lib/${PKGNAME}/ebin/mod_privacy.beam
172lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam 173lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam
173lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam 174lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
174lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam 175lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
175lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam 176lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
@@ -337,29 +338,16 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/pt-b @@ -337,29 +338,16 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/pt-b
337lib/erlang/lib/${PKGNAME}/priv/msgs/pt.msg 338lib/erlang/lib/${PKGNAME}/priv/msgs/pt.msg
338lib/erlang/lib/${PKGNAME}/priv/msgs/ru.msg 339lib/erlang/lib/${PKGNAME}/priv/msgs/ru.msg
339lib/erlang/lib/${PKGNAME}/priv/msgs/sk.msg 340lib/erlang/lib/${PKGNAME}/priv/msgs/sk.msg
340lib/erlang/lib/${PKGNAME}/priv/msgs/sv.msg 341lib/erlang/lib/${PKGNAME}/priv/msgs/sv.msg
341lib/erlang/lib/${PKGNAME}/priv/msgs/th.msg 342lib/erlang/lib/${PKGNAME}/priv/msgs/th.msg
342lib/erlang/lib/${PKGNAME}/priv/msgs/tr.msg 343lib/erlang/lib/${PKGNAME}/priv/msgs/tr.msg
343lib/erlang/lib/${PKGNAME}/priv/msgs/uk.msg 344lib/erlang/lib/${PKGNAME}/priv/msgs/uk.msg
344lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg 345lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg
345lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg 346lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
346lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg 347lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
347lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql 348lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
348sbin/ejabberdctl 349sbin/ejabberdctl
349share/doc/ejabberd/COPYING 350share/doc/ejabberd/COPYING
350share/doc/ejabberd/dev.html 
351share/doc/ejabberd/discorus.png 
352share/doc/ejabberd/features.html 
353share/doc/ejabberd/guide.html 
354share/doc/ejabberd/guide.pdf 
355share/doc/ejabberd/logo.png 
356share/doc/ejabberd/msrl-dit-deep.png 
357share/doc/ejabberd/msrl-dit-flat.png 
358share/doc/ejabberd/msrl-roster-deep.png 
359share/doc/ejabberd/msrl-roster-flat.png 
360share/doc/ejabberd/webadmmain.png 
361share/doc/ejabberd/webadmmainru.png 
362share/doc/ejabberd/yozhikheader.png 
363share/examples/ejabberd/ejabberd.yml 351share/examples/ejabberd/ejabberd.yml
364share/examples/ejabberd/ejabberdctl.cfg 352share/examples/ejabberd/ejabberdctl.cfg
365share/examples/ejabberd/inetrc 353share/examples/ejabberd/inetrc
cvs diff -r1.33 -r1.34 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2015/05/04 14:40:38 1.33
+++ pkgsrc/chat/ejabberd/distinfo 2015/06/29 21:44:10 1.34
@@ -1,13 +1,12 @@ @@ -1,13 +1,12 @@
1$NetBSD: distinfo,v 1.33 2015/05/04 14:40:38 fhajny Exp $ 1$NetBSD: distinfo,v 1.34 2015/06/29 21:44:10 fhajny Exp $
2 2
3SHA1 (ejabberd-15.04-deps.tar.gz) = c4a920fe2e60c0810af1588bd955066261f8dfc4 3SHA1 (ejabberd-15.06-deps.tar.gz) = b3704208c5756c7c717477b9c66e7f5853b6d91e
4RMD160 (ejabberd-15.04-deps.tar.gz) = 527e6f8c9965012281cac6da7feea0993a6d8378 4RMD160 (ejabberd-15.06-deps.tar.gz) = 3ae7d5d31befe7717322253d7692bc3b33172042
5Size (ejabberd-15.04-deps.tar.gz) = 13647808 bytes 5Size (ejabberd-15.06-deps.tar.gz) = 14294458 bytes
6SHA1 (ejabberd-15.04.tgz) = cbd2661e921fe324e694bd1f582a3cbd67c309f9 6SHA1 (ejabberd-15.06.tgz) = 7e3f050f1c27cfe9941440572374c8fa80fca0d7
7RMD160 (ejabberd-15.04.tgz) = 2340080ff4cd4d0b5d8b7aec71ecd85b2938dae4 7RMD160 (ejabberd-15.06.tgz) = ab352af31f929852428a137c49b662e6bff07733
8Size (ejabberd-15.04.tgz) = 3261947 bytes 8Size (ejabberd-15.06.tgz) = 1560640 bytes
9SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5 9SHA1 (patch-aa) = 5025927e6be5792fa8e59541938950d901b91ee5
10SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988 10SHA1 (patch-ad) = cdd7a61333f3206ac3ae9168b1878a059da25988
11SHA1 (patch-ae) = 90787d77dda8317d89908ca9520710ea4e8d43f4 11SHA1 (patch-ae) = a9340add286fe4b70ce0ac6b75a2f9162b8c4e7d
12SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe 12SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
13SHA1 (patch-deps_p1__iconv_rebar.config) = cd1200342aea2d4731207b3b5c33653682a8988f 
cvs diff -r1.10 -r1.11 pkgsrc/chat/ejabberd/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-ae 2015/01/02 09:14:16 1.10
+++ pkgsrc/chat/ejabberd/patches/patch-ae 2015/06/29 21:44:10 1.11
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: patch-ae,v 1.10 2015/01/02 09:14:16 fhajny Exp $ 1$NetBSD: patch-ae,v 1.11 2015/06/29 21:44:10 fhajny Exp $
2 2
3- Default locations. 3- Default locations.
4- Make it work with NetBSD's flock(1). 4- Make it work with NetBSD's flock(1).
5 5
6--- ejabberdctl.template.orig 2014-07-22 16:42:49.000000000 +0100 6--- ejabberdctl.template.orig 2015-06-24 09:58:37.000000000 +0000
7+++ ejabberdctl.template 2014-08-21 20:17:35.000000000 +0100 7+++ ejabberdctl.template
8@@ -67,10 +67,10 @@ 8@@ -71,10 +71,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
9 EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml 9 EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
10 fi 10 fi
11 if [ "$LOGS_DIR" = "" ] ; then 11 if [ "$LOGS_DIR" = "" ] ; then
12- LOGS_DIR={{localstatedir}}/log/ejabberd 12- LOGS_DIR={{localstatedir}}/log/ejabberd
13+ LOGS_DIR=@EJABBERD_LOGDIR@ 13+ LOGS_DIR=@EJABBERD_LOGDIR@
14 fi 14 fi
15 if [ "$SPOOL_DIR" = "" ] ; then 15 if [ "$SPOOL_DIR" = "" ] ; then
16- SPOOL_DIR={{localstatedir}}/lib/ejabberd 16- SPOOL_DIR={{localstatedir}}/lib/ejabberd
17+ SPOOL_DIR=@EJABBERD_DB@ 17+ SPOOL_DIR=@EJABBERD_DB@
18 fi 18 fi
19 if [ "$EJABBERD_DOC_PATH" = "" ] ; then 19 if [ "$EJABBERD_DOC_PATH" = "" ] ; then
20 EJABBERD_DOC_PATH={{docdir}} 20 EJABBERD_DOC_PATH={{docdir}}
21@@ -81,7 +81,7 @@ 21@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
22 fi 22 fi
23 if [ "{{release}}" != "true" ] ; then 23 if [ "{{release}}" != "true" ] ; then
24 if [ "$EJABBERDDIR" = "" ] ; then 24 if [ "$EJABBERDDIR" = "" ] ; then
25- EJABBERDDIR={{libdir}}/ejabberd 25- EJABBERDDIR={{libdir}}/ejabberd
26+ EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@ 26+ EJABBERDDIR={{libdir}}/erlang/lib/@DISTNAME@
27 fi 27 fi
28 if [ "$EJABBERD_EBIN_PATH" = "" ] ; then 28 if [ "$EJABBERD_EBIN_PATH" = "" ] ; then
29 EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin 29 EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
30@@ -281,7 +281,7 @@ 30@@ -335,7 +335,7 @@ ctl()
31 # using flock if available. Expects a linux-style 31 # using flock if available. Expects a linux-style
32 # flock that can lock a file descriptor. 32 # flock that can lock a file descriptor.
33 MAXCONNID=100 33 MAXCONNID=100
34- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl 34- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
35+ CONNLOCKDIR=@EJABBERD_PIDDIR@ 35+ CONNLOCKDIR=@EJABBERD_PIDDIR@
36 FLOCK='/usr/bin/flock' 36 FLOCK=/usr/bin/flock
37 if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then 37 if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
38 JOT='/usr/bin/jot' 38 JOT=/usr/bin/jot
39@@ -308,7 +308,7 @@ 39@@ -362,7 +362,7 @@ ctl()
40 CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN" 40 CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
41 ( 41 (
42 exec 8>"$CTL_LOCKFILE" 42 exec 8>"$CTL_LOCKFILE"
43- if flock --nb 8; then 43- if flock --nb 8; then
44+ if flock -x -n 8; then 44+ if flock -x -n 8; then
45 ctlexec $CTL_CONN $COMMAND 45 ctlexec $CTL_CONN $COMMAND
46 ssresult=$? 46 ssresult=$?
47 # segregate from possible flock exit(1) 47 # segregate from possible flock exit(1)
File Deleted: pkgsrc/chat/ejabberd/patches/Attic/patch-deps_p1__iconv_rebar.config