pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/chat/ejabberd

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Jul  7 10:08:40 UTC 2017

Modified Files:
        pkgsrc/chat/ejabberd: Makefile PLIST distinfo
        pkgsrc/chat/ejabberd/patches: patch-ae patch-rebar.config

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.46 -r1.47 pkgsrc/chat/ejabberd/PLIST
cvs rdiff -u -r1.49 -r1.50 pkgsrc/chat/ejabberd/distinfo
cvs rdiff -u -r1.15 -r1.16 pkgsrc/chat/ejabberd/patches/patch-ae
cvs rdiff -u -r1.9 -r1.10 pkgsrc/chat/ejabberd/patches/patch-rebar.config

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: pkgsrc/chat/ejabberd/Makefile
diff -u pkgsrc/chat/ejabberd/Makefile:1.72 pkgsrc/chat/ejabberd/Makefile:1.73
--- pkgsrc/chat/ejabberd/Makefile:1.72  Thu Apr 13 19:04:53 2017
+++ pkgsrc/chat/ejabberd/Makefile       Fri Jul  7 10:08:39 2017
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2017/04/13 19:04:53 fhajny Exp $
+# $NetBSD: Makefile,v 1.73 2017/07/07 10:08:39 fhajny Exp $
 
-DISTNAME=      ejabberd-17.04
+DISTNAME=      ejabberd-17.07
 CATEGORIES=    chat
 MASTER_SITES=  https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tgz
@@ -10,25 +10,25 @@ HOMEPAGE=   http://www.ejabberd.im/
 COMMENT=       Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      erlang-cache_tab>=1.0.7:../../devel/erlang-cache_tab
-DEPENDS+=      erlang-epam>=1.0.2:../../security/erlang-epam
+DEPENDS+=      erlang-cache_tab>=1.0.9:../../devel/erlang-cache_tab
+DEPENDS+=      erlang-epam>=1.0.3:../../security/erlang-epam
 DEPENDS+=      erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
-DEPENDS+=      erlang-esip>=1.0.11:../../net/erlang-esip
+DEPENDS+=      erlang-esip>=1.0.13:../../net/erlang-esip
 DEPENDS+=      erlang-ezlib>=1.0.2:../../devel/erlang-ezlib
-DEPENDS+=      erlang-fast_tls>=1.0.11:../../security/erlang-fast_tls
-DEPENDS+=      erlang-fast_xml>=1.1.21:../../textproc/erlang-fast_xml
-DEPENDS+=      erlang-fast_yaml>=1.0.9:../../textproc/erlang-fast_yaml
-DEPENDS+=      erlang-iconv>=1.0.4:../../converters/erlang-iconv
+DEPENDS+=      erlang-fast_tls>=1.0.13:../../security/erlang-fast_tls
+DEPENDS+=      erlang-fast_xml>=1.1.23:../../textproc/erlang-fast_xml
+DEPENDS+=      erlang-fast_yaml>=1.0.10:../../textproc/erlang-fast_yaml
+DEPENDS+=      erlang-iconv>=1.0.5:../../converters/erlang-iconv
 DEPENDS+=      erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
-DEPENDS+=      erlang-lager>=3.2.1:../../sysutils/erlang-lager
+DEPENDS+=      erlang-lager>=3.4.2.:../../sysutils/erlang-lager
 DEPENDS+=      erlang-luerl>=0.2:../../lang/erlang-luerl
-DEPENDS+=      erlang-p1_mysql>=1.0.2:../../databases/erlang-p1_mysql
+DEPENDS+=      erlang-p1_mysql>=1.0.3:../../databases/erlang-p1_mysql
 DEPENDS+=      erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2
-DEPENDS+=      erlang-p1_pgsql>=1.1.2:../../databases/erlang-p1_pgsql
-DEPENDS+=      erlang-p1_utils>=1.0.8:../../misc/erlang-p1_utils
-DEPENDS+=      erlang-stringprep>=1.0.8:../../textproc/erlang-stringprep
-DEPENDS+=      erlang-stun>=1.0.10:../../net/erlang-stun
-DEPENDS+=      erlang-xmpp>=1.1.9:../../net/erlang-xmpp
+DEPENDS+=      erlang-p1_pgsql>=1.1.3:../../databases/erlang-p1_pgsql
+DEPENDS+=      erlang-p1_utils>=1.0.9:../../misc/erlang-p1_utils
+DEPENDS+=      erlang-stringprep>=1.0.9:../../textproc/erlang-stringprep
+DEPENDS+=      erlang-stun>=1.0.12:../../net/erlang-stun
+DEPENDS+=      erlang-xmpp>=1.1.13:../../net/erlang-xmpp
 CONFLICTS+=    jabberd-[0-9]*
 
 GNU_CONFIGURE=         yes
@@ -36,6 +36,7 @@ USE_GCC_RUNTIME=      yes
 USE_TOOLS+=            bash:run gmake patch
 
 CONFIGURE_ARGS+=       --disable-debug
+CONFIGURE_ARGS+=       --enable-system-deps
 CONFIGURE_ARGS+=       --enable-iconv
 CONFIGURE_ARGS+=       --enable-mysql
 CONFIGURE_ARGS+=       --enable-odbc

Index: pkgsrc/chat/ejabberd/PLIST
diff -u pkgsrc/chat/ejabberd/PLIST:1.46 pkgsrc/chat/ejabberd/PLIST:1.47
--- pkgsrc/chat/ejabberd/PLIST:1.46     Thu Apr 13 19:04:53 2017
+++ pkgsrc/chat/ejabberd/PLIST  Fri Jul  7 10:08:39 2017
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.46 2017/04/13 19:04:53 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.47 2017/07/07 10:08:39 fhajny Exp $
+lib/erlang/lib/${PKGNAME}/COPYING
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -31,6 +32,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_db_modules.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
@@ -43,7 +45,9 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_options.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_pkix.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis.beam
@@ -55,14 +59,17 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sip.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sql.beam
@@ -101,12 +108,10 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_annou
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_block_strangers.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_mnesia.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_riak.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_bosh_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
@@ -115,6 +120,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_caps_
 lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
@@ -168,6 +174,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_proxy
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_mnesia.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_redis.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
@@ -198,9 +205,6 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_vcard
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_riak.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_mnesia.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_riak.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_sql.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_club.beam
@@ -233,7 +237,6 @@ lib/erlang/lib/${PKGNAME}/ebin/randoms.b
 lib/erlang/lib/${PKGNAME}/ebin/rest.beam
 lib/erlang/lib/${PKGNAME}/ebin/scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
-lib/erlang/lib/${PKGNAME}/ebin/sql_queries.beam
 lib/erlang/lib/${PKGNAME}/ebin/str.beam
 lib/erlang/lib/${PKGNAME}/ebin/translate.beam
 lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.49 pkgsrc/chat/ejabberd/distinfo:1.50
--- pkgsrc/chat/ejabberd/distinfo:1.49  Thu Apr 13 19:04:53 2017
+++ pkgsrc/chat/ejabberd/distinfo       Fri Jul  7 10:08:39 2017
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.49 2017/04/13 19:04:53 fhajny Exp $
+$NetBSD: distinfo,v 1.50 2017/07/07 10:08:39 fhajny Exp $
 
-SHA1 (ejabberd-17.04.tgz) = cd098135ae2cdf75267cba0c99759578e21b7274
-RMD160 (ejabberd-17.04.tgz) = 301914a72893035eea6719ef09ae99b87981a804
-SHA512 (ejabberd-17.04.tgz) = 03467434dba92bd1ff2f70d78aa8fcf86fc73cb52aaaa73e4947229e1d14225e7b0d0133c3da7c8efe4c9db13aab932f40f757be46b120d0f280f96d62c203d7
-Size (ejabberd-17.04.tgz) = 1690441 bytes
+SHA1 (ejabberd-17.07.tgz) = 6a964e02ffe4ceb6065d981a0cf11ed99592632a
+RMD160 (ejabberd-17.07.tgz) = 6db03e36a5dc509b196e41c6f1ccc4c8e36e45f4
+SHA512 (ejabberd-17.07.tgz) = a1b1ec69272191590f97c846dd27eb427a3a4f0fa9ddedd316f2d73837f970dfba5e2d1671d1fa520e014c81cf4f3559f5a4d3d439b8db51c7fff986d5e97df0
+Size (ejabberd-17.07.tgz) = 1707408 bytes
 SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
-SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
+SHA1 (patch-ae) = b74d8d147dad45eef63e969f6774748233fc0fc8
 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config) = f091a8915f262663d52d853ba9e4008044837521
+SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a
 SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684
 SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569

Index: pkgsrc/chat/ejabberd/patches/patch-ae
diff -u pkgsrc/chat/ejabberd/patches/patch-ae:1.15 pkgsrc/chat/ejabberd/patches/patch-ae:1.16
--- pkgsrc/chat/ejabberd/patches/patch-ae:1.15  Fri Apr 29 19:05:22 2016
+++ pkgsrc/chat/ejabberd/patches/patch-ae       Fri Jul  7 10:08:40 2017
@@ -1,39 +1,63 @@
-$NetBSD: patch-ae,v 1.15 2016/04/29 19:05:22 fhajny Exp $
+$NetBSD: patch-ae,v 1.16 2017/07/07 10:08:40 fhajny Exp $
 
 - Default locations.
 - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
   and AIX where Erlang relies on $HOME set correctly.
+- At least SunOS has not wheel group.
+- Portable grep calls.
 
---- ejabberdctl.template.orig  2016-04-28 13:57:55.000000000 +0000
+--- ejabberdctl.template.orig  2017-06-30 12:24:35.000000000 +0000
 +++ ejabberdctl.template
-@@ -27,7 +27,7 @@ if [ "$INSTALLUSER" != "" ] ; then
-                 mkdir -p "$INSTALLUSER_HOME"
-                 chown "$INSTALLUSER" "$INSTALLUSER_HOME"
-             fi
--            EXEC_CMD="su $INSTALLUSER -c"
-+            EXEC_CMD="su - $INSTALLUSER -c"
-         fi
-     done
-     if [ `id -g` -eq `id -g $INSTALLUSER` ] ; then
-@@ -73,10 +73,10 @@ if [ "$EJABBERD_CONFIG_PATH" = "" ] ; th
-     EJABBERD_CONFIG_PATH=$ETC_DIR/ejabberd.yml
- fi
- if [ "$LOGS_DIR" = "" ] ; then
--    LOGS_DIR={{localstatedir}}/log/ejabberd
-+    LOGS_DIR=@EJABBERD_LOGDIR@
- fi
- if [ "$SPOOL_DIR" = "" ] ; then
--    SPOOL_DIR={{localstatedir}}/lib/ejabberd
-+    SPOOL_DIR=@EJABBERD_DB@
- fi
- if [ "$EJABBERD_DOC_PATH" = "" ] ; then
-     EJABBERD_DOC_PATH={{docdir}}
-@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
-     ERLANG_NODE=$ERLANG_NODE_ARG
- fi
- if [ "{{release}}" != "true" -a "$EJABBERD_BIN_PATH" = "" ] ; then
--    EJABBERD_BIN_PATH={{libdir}}/ejabberd/priv/bin
-+    EJABBERD_BIN_PATH={{libdir}}/erlang/lib/ejabberd/priv/bin
- fi
- EJABBERD_LOG_PATH=$LOGS_DIR/ejabberd.log
- DATETIME=`date "+%Y%m%d-%H%M%S"`
+@@ -21,7 +21,7 @@ if [ -n "$INSTALLUSER" ] ; then
+     if [ $(id -g) -eq $(id -g $INSTALLUSER || echo -1) ] ; then
+         EXEC_CMD="as_current_user"
+     else
+-        id -Gn | grep -q wheel && EXEC_CMD="as_install_user"
++        id -Gn | grep 'wheel\|root' >/dev/null && EXEC_CMD="as_install_user"
+     fi
+ else
+     EXEC_CMD="as_current_user"
+@@ -49,8 +49,8 @@ done
+ 
+ # define ejabberd variables if not already defined from the command line
+ : ${ETC_DIR:={{sysconfdir}}/ejabberd}
+-: ${LOGS_DIR:={{localstatedir}}/log/ejabberd}
+-: ${SPOOL_DIR:={{localstatedir}}/lib/ejabberd}
++: ${LOGS_DIR:=@EJABBERD_LOGDIR@}
++: ${SPOOL_DIR:=@EJABBERD_DB@}
+ : ${EJABBERD_CONFIG_PATH:="$ETC_DIR"/ejabberd.yml}
+ : ${EJABBERDCTL_CONFIG_PATH:="$ETC_DIR"/ejabberdctl.cfg}
+ [ -f "$EJABBERDCTL_CONFIG_PATH" ] && . "$EJABBERDCTL_CONFIG_PATH"
+@@ -103,7 +103,7 @@ export ERL_LIBS
+ exec_cmd()
+ {
+     case $EXEC_CMD in
+-        as_install_user) su -c '"$0" $@"' "$INSTALLUSER" -- "$@" ;;
++        as_install_user) su - -c '"$0" $@"' "$INSTALLUSER" -- "$@" ;;
+         as_current_user) "$@" ;;
+     esac
+ }
+@@ -202,19 +202,19 @@ uid()
+ # stop epmd if there is no other running node
+ stop_epmd()
+ {
+-    "$EPMD" -names 2>/dev/null | grep -q name || "$EPMD" -kill >/dev/null
++    "$EPMD" -names 2>/dev/null | grep name >/dev/null || "$EPMD" -kill >/dev/null
+ }
+ 
+ # make sure node not already running and node name unregistered
+ # if all ok, ensure runtime directory exists and make it current directory
+ check_start()
+ {
+-    "$EPMD" -names 2>/dev/null | grep -q " ${ERLANG_NODE%@*} " && {
+-        ps ux | grep -v grep | grep -q " $ERLANG_NODE " && {
++    "$EPMD" -names 2>/dev/null | grep " ${ERLANG_NODE%@*} " >/dev/null && {
++        ps ux | grep -v grep | grep " $ERLANG_NODE " >/dev/null && {
+             echo "ERROR: The ejabberd node '$ERLANG_NODE' is already running."
+             exit 4
+         } || {
+-            ps ux | grep -v grep | grep -q beam && {
++            ps ux | grep -v grep | grep beam >/dev/null && {
+                 echo "ERROR: The ejabberd node '$ERLANG_NODE' is registered,"
+                 echo "       but no related beam process has been found."
+                 echo "Shutdown all other erlang nodes, and call 'epmd -kill'."

Index: pkgsrc/chat/ejabberd/patches/patch-rebar.config
diff -u pkgsrc/chat/ejabberd/patches/patch-rebar.config:1.9 pkgsrc/chat/ejabberd/patches/patch-rebar.config:1.10
--- pkgsrc/chat/ejabberd/patches/patch-rebar.config:1.9 Thu Apr 13 19:04:53 2017
+++ pkgsrc/chat/ejabberd/patches/patch-rebar.config     Fri Jul  7 10:08:40 2017
@@ -1,8 +1,8 @@
-$NetBSD: patch-rebar.config,v 1.9 2017/04/13 19:04:53 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.10 2017/07/07 10:08:40 fhajny Exp $
 
 Deps are handled by pkgsrc.
 
---- rebar.config.orig  2017-04-11 10:13:58.000000000 +0000
+--- rebar.config.orig  2017-06-30 12:24:35.000000000 +0000
 +++ rebar.config
 @@ -79,9 +79,9 @@
  
@@ -16,8 +16,8 @@ Deps are handled by pkgsrc.
 +          {i, "@LOCALBASE@/lib/erlang/lib/p1_utils/include"},
              {if_var_false, debug, no_debug_info},
              {if_var_true, debug, debug_info},
-             {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},
-@@ -105,7 +105,7 @@
+           {if_var_true, sip, {d, 'SIP'}},
+@@ -108,7 +108,7 @@
                          ]}}.
  
  {if_var_true, elixir,
@@ -26,7 +26,7 @@ Deps are handled by pkgsrc.
  {if_var_true, elixir,
                {src_dirs, ["include"]}}.
  
-@@ -135,9 +135,9 @@
+@@ -138,9 +138,9 @@
  
  {eunit_compile_opts, [{i, "tools"},
                      {i, "include"},
Home | Main Index | Thread Index | Old Index