Skip to content

Commit 1f61602

Browse files
author
fhajny
committed
Update chat/ejabberd to 17.07.
Version 17.07 ============= Core - Close accepted socket if sockname/peername has failed. Version 17.06 ============= New features - The new cache system is also a new component that allows fine tuning of ejabberd performance for either small systems or large scale servers. - Certificate Manager is a feature that has been requested by many organisations, allowing administrators to manage their certificate more easily - Riak support for several modules API - Deprecate misc:encode_base64/1 and misc:decode_base64/1 - Rename is_user_exists function to user_exists - Allow api access on both ipv4 and 6 loopback addresses - Fix invalid argument in get_messages_susbset Admin - Refactor ejabberdctl - Improve ejabberdctl parameters parsing - Quote all paths to allow spaces in directory names - update-deps-releases.pl: Show operations to perform before asking to apply them - Fix Salt import from prosody SCRAMmed password Configuration - Validate module options on start_module/2 - Validate new options before module reloading - Validate second-level options - Introduce iqdisc global option - stream_management listen option deprecated, use mod_stream_mgmt - Check presence of some files during option validation - Speedup configuration options lookup - Validate all certfiles on startup - Only validate certfiles if public_key:short_name_hash/1 is available - Introduce Certficate Manager Commands - Add clear_cache admin command - Parse correctly presence_broadcast option in change_room_option command - Describe command arguments and results in mod_muc_admin - Improve export2sql explanation; remove obsolete and duplicated command - Fix and document push_roster_all command - Fix mod_muc_admin command set_room_affiliation - Fix invalid {args,result}_examples in mod_muc_admin - Fix srg_user_add/del for non-Mnesia database backends - Make ext_mod api return rescode Compilation - Erlang 17.5 or higher is required - Add --enable-system-deps configure option - Add --enable-stun and --enable-sip configure options Core - Speedup Mnesia tables initialization - Improve Mnesia tables creation and transformation - Improve ejabberd_c2s:close() - ejabberd_c2s: Don’t close session on stream resume - Speedup loading of translation files - Fix ejabberd_router:is_my_route/1 - Don’t let a receiver crash if a controller is unavailable - Fix OTP-17.5 support - websocket: Catch exception that may happen when sending data over websocket Databases - New sql_connect_timeout option - New sql_query_timeout option - Get rid of sql_queries.erl - Use round-robin algorithm when selecting worker from DB pool - Add Riak as BOSH RAM backend - Add Riak as mod_proxy65 RAM backend - Add Riak as mod_carboncopy RAM backend - Add Riak as router RAM backend - Add Riak as session manager RAM backend - Fix cleaning of Riak route table - Add pubsub import from prosody/metronome - Fix username in mam export - Fix Salt import from prosody SCRAMmed password - In offline export to SQL, first write all DELETE, later all INSERT Cache - Implement cache for mod_announce - Implement cache for mod_private - Implement cache for mod_privacy/mod_blocking - Implement cache for mod_last - Implement cache for mod_vcard and mod_vcard_xupdate - Implement cache for roster - Add cache options to the validator - Use cache for authentication backends - Use new cache API in mod_shared_roster_ldap - Use new cache API in ejabberd_oauth - Use new cache API in mod_mam - Use new cache API in mod_caps - Use cache in front of Redis/SQL RAM backends Modules - mod_http_upload: Add support for HTTP File Upload 0.3.0 - mod_mam: Added export function - mod_metrics: Don’t leak with UDP sockets - mod_metrics: New options ip and port - mod_muc: Allow a room admin to un/subscribe another JID - mod_offline: Don’t store messages via a single process - mod_offline: Make sure only jabber:x:event tag is present in offline event - mod_register: New option ‘access_remove’ ACL - mod_stream_mgmt: Preserve stanza count on timeout - mod_vcard_ldap: Parse ldap_uids like in eldap_utils - mod_client_state: Reset state on session resume - mod_metrics: Fix IP address parsing - mod_pubsub: Avoid useless calls on simples subscriptions - mod_block_strangers: Add allow_local_users option Elixir - Update elixir to v1.4.4
1 parent ca1f600 commit 1f61602

5 files changed

Lines changed: 97 additions & 69 deletions

File tree

‎chat/ejabberd/Makefile‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.72 2017/04/13 19:04:53 fhajny Exp $
1+
# $NetBSD: Makefile,v 1.73 2017/07/07 10:08:39 fhajny Exp $
22

3-
DISTNAME= ejabberd-17.04
3+
DISTNAME= ejabberd-17.07
44
CATEGORIES= chat
55
MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
66
EXTRACT_SUFX= .tgz
@@ -10,32 +10,33 @@ HOMEPAGE= http://www.ejabberd.im/
1010
COMMENT= Free and Open Source distributed fault-tolerant Jabber server
1111
LICENSE= gnu-gpl-v2
1212

13-
DEPENDS+= erlang-cache_tab>=1.0.7:../../devel/erlang-cache_tab
14-
DEPENDS+= erlang-epam>=1.0.2:../../security/erlang-epam
13+
DEPENDS+= erlang-cache_tab>=1.0.9:../../devel/erlang-cache_tab
14+
DEPENDS+= erlang-epam>=1.0.3:../../security/erlang-epam
1515
DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
16-
DEPENDS+= erlang-esip>=1.0.11:../../net/erlang-esip
16+
DEPENDS+= erlang-esip>=1.0.13:../../net/erlang-esip
1717
DEPENDS+= erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
18-
DEPENDS+= erlang-fast_tls>=1.0.11:../../security/erlang-fast_tls
19-
DEPENDS+= erlang-fast_xml>=1.1.21:../../textproc/erlang-fast_xml
20-
DEPENDS+= erlang-fast_yaml>=1.0.9:../../textproc/erlang-fast_yaml
21-
DEPENDS+= erlang-iconv>=1.0.4:../../converters/erlang-iconv
18+
DEPENDS+= erlang-fast_tls>=1.0.13:../../security/erlang-fast_tls
19+
DEPENDS+= erlang-fast_xml>=1.1.23:../../textproc/erlang-fast_xml
20+
DEPENDS+= erlang-fast_yaml>=1.0.10:../../textproc/erlang-fast_yaml
21+
DEPENDS+= erlang-iconv>=1.0.5:../../converters/erlang-iconv
2222
DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
23-
DEPENDS+= erlang-lager>=3.2.1:../../sysutils/erlang-lager
23+
DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager
2424
DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl
25-
DEPENDS+= erlang-p1_mysql>=1.0.2:../../databases/erlang-p1_mysql
25+
DEPENDS+= erlang-p1_mysql>=1.0.3:../../databases/erlang-p1_mysql
2626
DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2
27-
DEPENDS+= erlang-p1_pgsql>=1.1.2:../../databases/erlang-p1_pgsql
28-
DEPENDS+= erlang-p1_utils>=1.0.8:../../misc/erlang-p1_utils
29-
DEPENDS+= erlang-stringprep>=1.0.8:../../textproc/erlang-stringprep
30-
DEPENDS+= erlang-stun>=1.0.10:../../net/erlang-stun
31-
DEPENDS+= erlang-xmpp>=1.1.9:../../net/erlang-xmpp
27+
DEPENDS+= erlang-p1_pgsql>=1.1.3:../../databases/erlang-p1_pgsql
28+
DEPENDS+= erlang-p1_utils>=1.0.9:../../misc/erlang-p1_utils
29+
DEPENDS+= erlang-stringprep>=1.0.9:../../textproc/erlang-stringprep
30+
DEPENDS+= erlang-stun>=1.0.12:../../net/erlang-stun
31+
DEPENDS+= erlang-xmpp>=1.1.13:../../net/erlang-xmpp
3232
CONFLICTS+= jabberd-[0-9]*
3333

3434
GNU_CONFIGURE= yes
3535
USE_GCC_RUNTIME= yes
3636
USE_TOOLS+= bash:run gmake patch
3737

3838
CONFIGURE_ARGS+= --disable-debug
39+
CONFIGURE_ARGS+= --enable-system-deps
3940
CONFIGURE_ARGS+= --enable-iconv
4041
CONFIGURE_ARGS+= --enable-mysql
4142
CONFIGURE_ARGS+= --enable-odbc

‎chat/ejabberd/PLIST‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
@comment $NetBSD: PLIST,v 1.46 2017/04/13 19:04:53 fhajny Exp $
1+
@comment $NetBSD: PLIST,v 1.47 2017/07/07 10:08:39 fhajny Exp $
2+
lib/erlang/lib/${PKGNAME}/COPYING
23
lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
34
lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
45
lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -31,6 +32,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam
3132
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
3233
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
3334
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
35+
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_db_modules.beam
3436
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
3537
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
3638
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
@@ -43,7 +45,9 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam
4345
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam
4446
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam
4547
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam
48+
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_options.beam
4649
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
50+
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_pkix.beam
4751
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
4852
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
4953
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis.beam
@@ -55,14 +59,17 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
5559
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam
5660
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
5761
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_redis.beam
62+
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_riak.beam
5863
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_sql.beam
5964
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
6065
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
6166
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
6267
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam
68+
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sip.beam
6369
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam
6470
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_mnesia.beam
6571
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_redis.beam
72+
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_riak.beam
6673
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_sql.beam
6774
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam
6875
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sql.beam
@@ -101,12 +108,10 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_announce_riak.beam
101108
lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.beam
102109
lib/erlang/lib/${PKGNAME}/ebin/mod_block_strangers.beam
103110
lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
104-
lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_mnesia.beam
105-
lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_riak.beam
106-
lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_sql.beam
107111
lib/erlang/lib/${PKGNAME}/ebin/mod_bosh.beam
108112
lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_mnesia.beam
109113
lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_redis.beam
114+
lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_riak.beam
110115
lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_sql.beam
111116
lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
112117
lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
@@ -115,6 +120,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_caps_sql.beam
115120
lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
116121
lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam
117122
lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_redis.beam
123+
lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_riak.beam
118124
lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_sql.beam
119125
lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
120126
lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
@@ -168,6 +174,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
168174
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
169175
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_mnesia.beam
170176
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_redis.beam
177+
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_riak.beam
171178
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
172179
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sql.beam
173180
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
@@ -198,9 +205,6 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_mnesia.beam
198205
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_riak.beam
199206
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_sql.beam
200207
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate.beam
201-
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_mnesia.beam
202-
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_riak.beam
203-
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_sql.beam
204208
lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam
205209
lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam
206210
lib/erlang/lib/${PKGNAME}/ebin/node_club.beam
@@ -233,7 +237,6 @@ lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
233237
lib/erlang/lib/${PKGNAME}/ebin/rest.beam
234238
lib/erlang/lib/${PKGNAME}/ebin/scram.beam
235239
lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
236-
lib/erlang/lib/${PKGNAME}/ebin/sql_queries.beam
237240
lib/erlang/lib/${PKGNAME}/ebin/str.beam
238241
lib/erlang/lib/${PKGNAME}/ebin/translate.beam
239242
lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam

‎chat/ejabberd/distinfo‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
$NetBSD: distinfo,v 1.49 2017/04/13 19:04:53 fhajny Exp $
1+
$NetBSD: distinfo,v 1.50 2017/07/07 10:08:39 fhajny Exp $
22

3-
SHA1 (ejabberd-17.04.tgz) = cd098135ae2cdf75267cba0c99759578e21b7274
4-
RMD160 (ejabberd-17.04.tgz) = 301914a72893035eea6719ef09ae99b87981a804
5-
SHA512 (ejabberd-17.04.tgz) = 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
6-
Size (ejabberd-17.04.tgz) = 1690441 bytes
3+
SHA1 (ejabberd-17.07.tgz) = 6a964e02ffe4ceb6065d981a0cf11ed99592632a
4+
RMD160 (ejabberd-17.07.tgz) = 6db03e36a5dc509b196e41c6f1ccc4c8e36e45f4
5+
SHA512 (ejabberd-17.07.tgz) = a1b1ec69272191590f97c846dd27eb427a3a4f0fa9ddedd316f2d73837f970dfba5e2d1671d1fa520e014c81cf4f3559f5a4d3d439b8db51c7fff986d5e97df0
6+
Size (ejabberd-17.07.tgz) = 1707408 bytes
77
SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
88
SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
9-
SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
9+
SHA1 (patch-ae) = b74d8d147dad45eef63e969f6774748233fc0fc8
1010
SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
11-
SHA1 (patch-rebar.config) = f091a8915f262663d52d853ba9e4008044837521
11+
SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a
1212
SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684
1313
SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569

‎chat/ejabberd/patches/patch-ae‎

Lines changed: 57 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,63 @@
1-
$NetBSD: patch-ae,v 1.15 2016/04/29 19:05:22 fhajny Exp $
1+
$NetBSD: patch-ae,v 1.16 2017/07/07 10:08:40 fhajny Exp $
22

33
- Default locations.
44
- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
55
and AIX where Erlang relies on $HOME set correctly.
6+
- At least SunOS has not wheel group.
7+
- Portable grep calls.
68

7-
--- ejabberdctl.template.orig 2016-04-28 13:57:55.000000000 +0000
9+
--- ejabberdctl.template.orig 2017-06-30 12:24:35.000000000 +0000
810
+++ ejabberdctl.template
9-
@@ -27,7 +27,7 @@ if [ "$INSTALLUSER" != "" ] ; then
10-
mkdir -p "$INSTALLUSER_HOME"
11-
chown "$INSTALLUSER" "$INSTALLUSER_HOME"
12-
fi
13-
- EXEC_CMD="su $INSTALLUSER -c"
14-
+ EXEC_CMD="su - $INSTALLUSER -c"
15-
fi
16-
done
17-
if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
18-
@@ -73,10 +73,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
19-
EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
20-
fi
21-
if [ "$LOGS_DIR" = "" ] ; then
22-
- LOGS_DIR={{localstatedir}}/log/ejabberd
23-
+ LOGS_DIR=@EJABBERD_LOGDIR@
24-
fi
25-
if [ "$SPOOL_DIR" = "" ] ; then
26-
- SPOOL_DIR={{localstatedir}}/lib/ejabberd
27-
+ SPOOL_DIR=@EJABBERD_DB@
28-
fi
29-
if [ "$EJABBERD_DOC_PATH" = "" ] ; then
30-
EJABBERD_DOC_PATH={{docdir}}
31-
@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
32-
ERLANG_NODE=$ERLANG_NODE_ARG
33-
fi
34-
if [ "{{release}}" != "true" -a "$EJABBERD_BIN_PATH" = "" ] ; then
35-
- EJABBERD_BIN_PATH={{libdir}}/ejabberd/priv/bin
36-
+ EJABBERD_BIN_PATH={{libdir}}/erlang/lib/ejabberd/priv/bin
37-
fi
38-
EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
39-
DATETIME=`date "+%Y%m%d-%H%M%S"`
11+
@@ -21,7 +21,7 @@ if [ -n "$INSTALLUSER" ] ; then
12+
if [ $(id -g) -eq $(id -g $INSTALLUSER || echo -1) ] ; then
13+
EXEC_CMD="as_current_user"
14+
else
15+
- id -Gn | grep -q wheel && EXEC_CMD="as_install_user"
16+
+ id -Gn | grep 'wheel\|root' >/dev/null && EXEC_CMD="as_install_user"
17+
fi
18+
else
19+
EXEC_CMD="as_current_user"
20+
@@ -49,8 +49,8 @@ done
21+
22+
# define ejabberd variables if not already defined from the command line
23+
: ${ETC_DIR:={{sysconfdir}}/ejabberd}
24+
-: ${LOGS_DIR:={{localstatedir}}/log/ejabberd}
25+
-: ${SPOOL_DIR:={{localstatedir}}/lib/ejabberd}
26+
+: ${LOGS_DIR:=@EJABBERD_LOGDIR@}
27+
+: ${SPOOL_DIR:=@EJABBERD_DB@}
28+
: ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml}
29+
: ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg}
30+
[ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
31+
@@ -103,7 +103,7 @@ export ERL_LIBS
32+
exec_cmd()
33+
{
34+
case $EXEC_CMD in
35+
- as_install_user) su -c '"$0" $@"' "$INSTALLUSER" -- "$@" ;;
36+
+ as_install_user) su - -c '"$0" $@"' "$INSTALLUSER" -- "$@" ;;
37+
as_current_user) "$@" ;;
38+
esac
39+
}
40+
@@ -202,19 +202,19 @@ uid()
41+
# stop epmd if there is no other running node
42+
stop_epmd()
43+
{
44+
- "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
45+
+ "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null
46+
}
47+
48+
# make sure node not already running and node name unregistered
49+
# if all ok, ensure runtime directory exists and make it current directory
50+
check_start()
51+
{
52+
- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
53+
- ps ux | grep -v grep | grep -q " $ERLANG_NODE " && {
54+
+ "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && {
55+
+ ps ux | grep -v grep | grep " $ERLANG_NODE " >/dev/null && {
56+
echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
57+
exit 4
58+
} || {
59+
- ps ux | grep -v grep | grep -q beam && {
60+
+ ps ux | grep -v grep | grep beam >/dev/null && {
61+
echo "ERROR: The ejabberd node '$ERLANG_NODE' is registered,"
62+
echo " but no related beam process has been found."
63+
echo "Shutdown all other erlang nodes, and call 'epmd -kill'."

‎chat/ejabberd/patches/patch-rebar.config‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
$NetBSD: patch-rebar.config,v 1.9 2017/04/13 19:04:53 fhajny Exp $
1+
$NetBSD: patch-rebar.config,v 1.10 2017/07/07 10:08:40 fhajny Exp $
22

33
Deps are handled by pkgsrc.
44

5-
--- rebar.config.orig 2017-04-11 10:13:58.000000000 +0000
5+
--- rebar.config.orig 2017-06-30 12:24:35.000000000 +0000
66
+++ rebar.config
77
@@ -79,9 +79,9 @@
88

@@ -16,8 +16,8 @@ Deps are handled by pkgsrc.
1616
+ {i, "@LOCALBASE@/lib/erlang/lib/p1_utils/include"},
1717
{if_var_false, debug, no_debug_info},
1818
{if_var_true, debug, debug_info},
19-
{if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
20-
@@ -105,7 +105,7 @@
19+
{if_var_true, sip, {d, 'SIP'}},
20+
@@ -108,7 +108,7 @@
2121
]}}.
2222

2323
{if_var_true, elixir,
@@ -26,7 +26,7 @@ Deps are handled by pkgsrc.
2626
{if_var_true, elixir,
2727
{src_dirs, ["include"]}}.
2828

29-
@@ -135,9 +135,9 @@
29+
@@ -138,9 +138,9 @@
3030

3131
{eunit_compile_opts, [{i, "tools"},
3232
{i, "include"},

0 commit comments

Comments
 (0)