Sun Aug 20 12:58:04 2017 UTC ()
Update chat/ejabberd to 17.08.

Core
- Erlang/OTP 17.5 or higher is required, and 20 is now supported
- Make ejabberd_cluster modular
- Replace gen_fsm with p1_fsm to avoid warnings in OTP20+
- Fix clustering table reg_users_counter
- ext_mod: Update spec from custom and allow modules dependencies
- extauth.py: Fix to support : in passwords
- Set high water mark in lager for all backends
- Fix old route record in mnesia窶冱 route table haven窶冲 been remove
  when restarting in some cases
- ejabberd_cluster*.erl: Add copyright and fix description
- Add support of rfc6120 section 4.9.3.16 on node shutdown

Configuration
- ejabberd_c2s: Fix priority of 窶歪ertfile窶� option
- Introduce 窶鷲osts窶� modules option
- Fix ERLANG_OPTS, INET_DIST_INTERFACE and FIREWALL_WINDOW option
- Remove unused 窶藁anagers窶� option, related to the deferred XEP-0321

Commands
- Fix errors when running ejabberdctl as root
- Fix set_presence command to work in recent ejabberd
- Rename stop_all_connections to stop_s2s_connections for consistency
- Change policy of user_resources command, from user to admin
- Remove old command calling interface
- Describe more command arguments and results

Modules
- mod_http_api: Use hide_sensitive_log_data option when registering
  users
- mod_http_fileserver: Request basic auth dialog from browser
- mod_muc: Fix nick bug with MUC on riak
- mod_muc: new hooks
- mod_push: Support XEP-0357: Push Notifications
- mod_push_keepalive: New module

PubSub/PEP
- Keep disco#info on PEP compatible with XEP-0060
- Preliminary export PubSub data from Mnesia tables to SQL file
- Fix PubSub send last published items
- Fix PEP node removal
- Fix PEP node identity
- Fix disco#items on PEP service
- Fix getting cached last item
- Add import of PEP from prosody


(fhajny)
diff -r1.74 -r1.75 pkgsrc/chat/ejabberd/Makefile
diff -r1.47 -r1.48 pkgsrc/chat/ejabberd/PLIST
diff -r1.50 -r1.51 pkgsrc/chat/ejabberd/distinfo
diff -r1.16 -r1.17 pkgsrc/chat/ejabberd/patches/patch-ae
cvs diff -r1.74 -r1.75 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2017/08/01 14:58:53 1.74
+++ pkgsrc/chat/ejabberd/Makefile 2017/08/20 12:58:04 1.75
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.74 2017/08/01 14:58:53 wiz Exp $ 1# $NetBSD: Makefile,v 1.75 2017/08/20 12:58:04 fhajny Exp $
2 2
3DISTNAME= ejabberd-17.07 3DISTNAME= ejabberd-17.08
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ 5MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8MAINTAINER= filip@joyent.com 8MAINTAINER= filip@joyent.com
9HOMEPAGE= https://www.ejabberd.im/ 9HOMEPAGE= https://www.ejabberd.im/
10COMMENT= Free and Open Source distributed fault-tolerant Jabber server 10COMMENT= Free and Open Source distributed fault-tolerant Jabber server
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= erlang-cache_tab>=1.0.9:../../devel/erlang-cache_tab 13DEPENDS+= erlang-cache_tab>=1.0.10:../../devel/erlang-cache_tab
14DEPENDS+= erlang-epam>=1.0.3:../../security/erlang-epam 14DEPENDS+= erlang-epam>=1.0.3:../../security/erlang-epam
15DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis 15DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
16DEPENDS+= erlang-esip>=1.0.13:../../net/erlang-esip 16DEPENDS+= erlang-esip>=1.0.15:../../net/erlang-esip
17DEPENDS+= erlang-ezlib>=1.0.2:../../devel/erlang-ezlib 17DEPENDS+= erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
18DEPENDS+= erlang-fast_tls>=1.0.13:../../security/erlang-fast_tls 18DEPENDS+= erlang-fast_tls>=1.0.15:../../security/erlang-fast_tls
19DEPENDS+= erlang-fast_xml>=1.1.23:../../textproc/erlang-fast_xml 19DEPENDS+= erlang-fast_xml>=1.1.23:../../textproc/erlang-fast_xml
20DEPENDS+= erlang-fast_yaml>=1.0.10:../../textproc/erlang-fast_yaml 20DEPENDS+= erlang-fast_yaml>=1.0.10:../../textproc/erlang-fast_yaml
21DEPENDS+= erlang-iconv>=1.0.5:../../converters/erlang-iconv 21DEPENDS+= erlang-iconv>=1.0.5:../../converters/erlang-iconv
22DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy 22DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
23DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager 23DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager
24DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl 24DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl
25DEPENDS+= erlang-p1_mysql>=1.0.3:../../databases/erlang-p1_mysql 25DEPENDS+= erlang-p1_mysql>=1.0.3:../../databases/erlang-p1_mysql
26DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2 26DEPENDS+= erlang-p1_oauth2>=0.6.2:../../security/erlang-p1_oauth2
27DEPENDS+= erlang-p1_pgsql>=1.1.3:../../databases/erlang-p1_pgsql 27DEPENDS+= erlang-p1_pgsql>=1.1.3:../../databases/erlang-p1_pgsql
28DEPENDS+= erlang-p1_utils>=1.0.9:../../misc/erlang-p1_utils 28DEPENDS+= erlang-p1_utils>=1.0.9:../../misc/erlang-p1_utils
29DEPENDS+= erlang-stringprep>=1.0.9:../../textproc/erlang-stringprep 29DEPENDS+= erlang-stringprep>=1.0.9:../../textproc/erlang-stringprep
30DEPENDS+= erlang-stun>=1.0.12:../../net/erlang-stun 30DEPENDS+= erlang-stun>=1.0.14:../../net/erlang-stun
31DEPENDS+= erlang-xmpp>=1.1.13:../../net/erlang-xmpp 31DEPENDS+= erlang-xmpp>=1.1.14:../../net/erlang-xmpp
32CONFLICTS+= jabberd-[0-9]* 32CONFLICTS+= jabberd-[0-9]*
33 33
34GNU_CONFIGURE= yes 34GNU_CONFIGURE= yes
35USE_GCC_RUNTIME= yes 35USE_GCC_RUNTIME= yes
36USE_TOOLS+= bash:run gmake patch 36USE_TOOLS+= bash:run gmake patch
37 37
38CONFIGURE_ARGS+= --disable-debug 38CONFIGURE_ARGS+= --disable-debug
39CONFIGURE_ARGS+= --enable-system-deps 39CONFIGURE_ARGS+= --enable-system-deps
40CONFIGURE_ARGS+= --enable-iconv 40CONFIGURE_ARGS+= --enable-iconv
41CONFIGURE_ARGS+= --enable-mysql 41CONFIGURE_ARGS+= --enable-mysql
42CONFIGURE_ARGS+= --enable-odbc 42CONFIGURE_ARGS+= --enable-odbc
43CONFIGURE_ARGS+= --enable-pam 43CONFIGURE_ARGS+= --enable-pam
44CONFIGURE_ARGS+= --enable-pgsql 44CONFIGURE_ARGS+= --enable-pgsql
cvs diff -r1.47 -r1.48 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2017/07/07 10:08:39 1.47
+++ pkgsrc/chat/ejabberd/PLIST 2017/08/20 12:58:04 1.48
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.47 2017/07/07 10:08:39 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.48 2017/08/20 12:58:04 fhajny Exp $
2lib/erlang/lib/${PKGNAME}/COPYING 2lib/erlang/lib/${PKGNAME}/COPYING
3lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam 3lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
4lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam 4lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
5lib/erlang/lib/${PKGNAME}/ebin/acl.beam 5lib/erlang/lib/${PKGNAME}/ebin/acl.beam
6lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam 6lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
7lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam 7lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
8lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam 8lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
9lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_oauth.beam 9lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_oauth.beam
10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam 10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam 11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
12lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app 12lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
13lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam 13lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
14lib/erlang/lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam 14lib/erlang/lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam
@@ -18,26 +18,27 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ @@ -18,26 +18,27 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_
18lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam 18lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam
19lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam 19lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam
20lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam 20lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam
21lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam 21lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam
22lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam 22lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
23lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam 23lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam
24lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam 24lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
25lib/erlang/lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam 25lib/erlang/lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam
26lib/erlang/lib/${PKGNAME}/ebin/ejabberd_bosh.beam 26lib/erlang/lib/${PKGNAME}/ebin/ejabberd_bosh.beam
27lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam 27lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
28lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam 28lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
29lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam 29lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam
30lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster.beam 30lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster.beam
 31lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam
31lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam 32lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam
32lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam 33lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
33lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam 34lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
34lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam 35lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
35lib/erlang/lib/${PKGNAME}/ebin/ejabberd_db_modules.beam 36lib/erlang/lib/${PKGNAME}/ebin/ejabberd_db_modules.beam
36lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam 37lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
37lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam 38lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
38lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam 39lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
39lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam 40lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam
40lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam 41lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
41lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam 42lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
42lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam 43lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
43lib/erlang/lib/${PKGNAME}/ebin/ejabberd_mnesia.beam 44lib/erlang/lib/${PKGNAME}/ebin/ejabberd_mnesia.beam
@@ -169,26 +170,29 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_priva @@ -169,26 +170,29 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_priva
169lib/erlang/lib/${PKGNAME}/ebin/mod_private_mnesia.beam 170lib/erlang/lib/${PKGNAME}/ebin/mod_private_mnesia.beam
170lib/erlang/lib/${PKGNAME}/ebin/mod_private_riak.beam 171lib/erlang/lib/${PKGNAME}/ebin/mod_private_riak.beam
171lib/erlang/lib/${PKGNAME}/ebin/mod_private_sql.beam 172lib/erlang/lib/${PKGNAME}/ebin/mod_private_sql.beam
172lib/erlang/lib/${PKGNAME}/ebin/mod_privilege.beam 173lib/erlang/lib/${PKGNAME}/ebin/mod_privilege.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_mnesia.beam 176lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_mnesia.beam
176lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_redis.beam 177lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_redis.beam
177lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_riak.beam 178lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_riak.beam
178lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam 179lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
179lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sql.beam 180lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sql.beam
180lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam 181lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
181lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam 182lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
 183lib/erlang/lib/${PKGNAME}/ebin/mod_push.beam
 184lib/erlang/lib/${PKGNAME}/ebin/mod_push_keepalive.beam
 185lib/erlang/lib/${PKGNAME}/ebin/mod_push_mnesia.beam
182lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam 186lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam
183lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam 187lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam
184lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam 188lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam
185lib/erlang/lib/${PKGNAME}/ebin/mod_roster_mnesia.beam 189lib/erlang/lib/${PKGNAME}/ebin/mod_roster_mnesia.beam
186lib/erlang/lib/${PKGNAME}/ebin/mod_roster_riak.beam 190lib/erlang/lib/${PKGNAME}/ebin/mod_roster_riak.beam
187lib/erlang/lib/${PKGNAME}/ebin/mod_roster_sql.beam 191lib/erlang/lib/${PKGNAME}/ebin/mod_roster_sql.beam
188lib/erlang/lib/${PKGNAME}/ebin/mod_s2s_dialback.beam 192lib/erlang/lib/${PKGNAME}/ebin/mod_s2s_dialback.beam
189lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam 193lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
190lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam 194lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
191lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam 195lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam
192lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_mnesia.beam 196lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_mnesia.beam
193lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_riak.beam 197lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_riak.beam
194lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_sql.beam 198lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_sql.beam
cvs diff -r1.50 -r1.51 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2017/07/07 10:08:39 1.50
+++ pkgsrc/chat/ejabberd/distinfo 2017/08/20 12:58:04 1.51
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.50 2017/07/07 10:08:39 fhajny Exp $ 1$NetBSD: distinfo,v 1.51 2017/08/20 12:58:04 fhajny Exp $
2 2
3SHA1 (ejabberd-17.07.tgz) = 6a964e02ffe4ceb6065d981a0cf11ed99592632a 3SHA1 (ejabberd-17.08.tgz) = b9f05fbd9890d71bcbf91fee4fb5c0a1a8fc322c
4RMD160 (ejabberd-17.07.tgz) = 6db03e36a5dc509b196e41c6f1ccc4c8e36e45f4 4RMD160 (ejabberd-17.08.tgz) = bb695e29c7c2d9b4726dfde06fe4e0b7588723a8
5SHA512 (ejabberd-17.07.tgz) = a1b1ec69272191590f97c846dd27eb427a3a4f0fa9ddedd316f2d73837f970dfba5e2d1671d1fa520e014c81cf4f3559f5a4d3d439b8db51c7fff986d5e97df0 5SHA512 (ejabberd-17.08.tgz) = 037902e557fcc09616f6c120c543be9f4aedd4eac9a6a9618209f0ebc66a24d3857870569c31478cc37652d243e1b7a02151f7c2b15ef2ddfefee8a04a8dd328
6Size (ejabberd-17.07.tgz) = 1707408 bytes 6Size (ejabberd-17.08.tgz) = 1716503 bytes
7SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88 7SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
8SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8 8SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
9SHA1 (patch-ae) = b74d8d147dad45eef63e969f6774748233fc0fc8 9SHA1 (patch-ae) = 41a3ce9c4fcbd3125240167e2fb3d202cbfccf05
10SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe 10SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
11SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a 11SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a
12SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684 12SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684
13SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 13SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
cvs diff -r1.16 -r1.17 pkgsrc/chat/ejabberd/patches/patch-ae (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-ae 2017/07/07 10:08:40 1.16
+++ pkgsrc/chat/ejabberd/patches/patch-ae 2017/08/20 12:58:04 1.17
@@ -1,53 +1,45 @@ @@ -1,53 +1,45 @@
1$NetBSD: patch-ae,v 1.16 2017/07/07 10:08:40 fhajny Exp $ 1$NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $
2 2
3- Default locations. 3- Default locations.
4- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS 4- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
5 and AIX where Erlang relies on $HOME set correctly. 5 and AIX where Erlang relies on $HOME set correctly. Use a portable
 6 su arg order while at it.
6- At least SunOS has not wheel group. 7- At least SunOS has not wheel group.
7- Portable grep calls. 8- Portable grep calls.
8 9
9--- ejabberdctl.template.orig 2017-06-30 12:24:35.000000000 +0000 10--- ejabberdctl.template.orig 2017-08-14 07:43:02.000000000 +0000
10+++ ejabberdctl.template 11+++ ejabberdctl.template
11@@ -21,7 +21,7 @@ if [ -n "$INSTALLUSER" ] ; then 12@@ -56,8 +56,8 @@ done
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  13
22 # define ejabberd variables if not already defined from the command line 14 # define ejabberd variables if not already defined from the command line
23 : ${ETC_DIR:={{sysconfdir}}/ejabberd} 15 : ${ETC_DIR:={{sysconfdir}}/ejabberd}
24-: ${LOGS_DIR:={{localstatedir}}/log/ejabberd} 16-: ${LOGS_DIR:={{localstatedir}}/log/ejabberd}
25-: ${SPOOL_DIR:={{localstatedir}}/lib/ejabberd} 17-: ${SPOOL_DIR:={{localstatedir}}/lib/ejabberd}
26+: ${LOGS_DIR:=@EJABBERD_LOGDIR@} 18+: ${LOGS_DIR:=@EJABBERD_LOGDIR@}
27+: ${SPOOL_DIR:=@EJABBERD_DB@} 19+: ${SPOOL_DIR:=@EJABBERD_DB@}
28 : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml} 20 : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml}
29 : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg} 21 : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg}
30 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH" 22 [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
31@@ -103,7 +103,7 @@ export ERL_LIBS 23@@ -108,7 +108,7 @@ export ERL_LIBS
32 exec_cmd() 24 exec_cmd()
33 { 25 {
34 case $EXEC_CMD in 26 case $EXEC_CMD in
35- as_install_user) su -c '"$0" $@"' "$INSTALLUSER" -- "$@" ;; 27- as_install_user) su -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;;
36+ as_install_user) su - -c '"$0" $@"' "$INSTALLUSER" -- "$@" ;; 28+ as_install_user) su - "$INSTALLUSER" -c '"$@"' -- "$@" ;;
37 as_current_user) "$@" ;; 29 as_current_user) "$@" ;;
38 esac 30 esac
39 } 31 }
40@@ -202,19 +202,19 @@ uid() 32@@ -207,19 +207,19 @@ uid()
41 # stop epmd if there is no other running node 33 # stop epmd if there is no other running node
42 stop_epmd() 34 stop_epmd()
43 { 35 {
44- "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null 36- "$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 37+ "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null
46 } 38 }
47  39
48 # make sure node not already running and node name unregistered 40 # make sure node not already running and node name unregistered
49 # if all ok, ensure runtime directory exists and make it current directory 41 # if all ok, ensure runtime directory exists and make it current directory
50 check_start() 42 check_start()
51 { 43 {
52- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && { 44- "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
53- ps ux | grep -v grep | grep -q " $ERLANG_NODE " && { 45- ps ux | grep -v grep | grep -q " $ERLANG_NODE " && {