CVS commit: pkgsrc/chat/ejabberd

["Filip Hajny" <fhajny%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   fhajny
Date:           Fri Jul 20 09:58:26 UTC 2018

Modified Files:
        pkgsrc/chat/ejabberd: Makefile PLIST distinfo

Log Message:
chat/ejabberd: Update to 18.06.

Admin
- Stop ejabberd initialization on invalid/unknown options
- Add new options for OOM watchdog: oom_watermark and oom_queue
- Add ability to modify version string
- Add option ext_api_headers to define REST API custom headers
- Fix Erlang limits in ejabberdctl.cfg.example to reflect current
  situation
- Make trusted_proxied ejabberd_http option accept ip masks
- Teach acl ip matching about ipv4 mapped ipv6 addresses
- Removed watchdog_admins option from config, as has no effect anymore
- Improve logging of external authentication failures
- ejabberd_auth: Don't use cache if the option is disabled
- Make connected_users_info and user_sessions_info DB-agnostic

Core
- Support SASL PLAIN by xmpp_stream_out
- Add Resource Binding support to xmpp_stream_out
- Improve robustness of external authentication backends
- Don't use 'unsupported-version' inside SM element
- Generate SASL failures on unencrypted connections only for s2s
- Fix reset_stream in websocket using pre-rfc protocol
- Don't crash in bosh when we receive request with RID < prev_rid
- Get rid of all calls to jlib.erl module
- Support IPv6 connections for PostgreSQL, MySQL and LDAP
- Fix authentication for usernames containing uppercase characters
- Optimize HTTP requests memory usage
- PKIX: Just warn instead of ignore a certificate containing no domain
  names
- PKIX: Don't replace valid certificates with invalid ones

Modules
- Log modules startup
- mod_disco: Advertise disco#info and disco#items features
- mod_irc: is moved away from ejabberd repo to ejabberd-contrib
- mod_mam: Don't replace existing stanza ID
- HTTP upload: Generate HTTP Upload form using xdata codec
- HTTP upload: Improve error formatting
- HTTP upload: Return detailed error if HTTP upload is too large

MUC
- Always display room's xdata in disco#info
- Display muc#roomconfig_changesubject in room's disco#info
- Render roomname, allowinvites and allowpm in room disco#info
- Support for roomconfig_lang/roominfo_lang
- mod_muc_sql: Fix export to SQL

Push
- Omit summary for outgoing messages
- Further improve handling of carbons
- Also include sender/body for carbons
- Include a static body text by default
- keepalive: Increase default timeout to 3 days
- SQL: Check 'max_user_sessions' limit


To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 pkgsrc/chat/ejabberd/Makefile
cvs rdiff -u -r1.53 -r1.54 pkgsrc/chat/ejabberd/PLIST
cvs rdiff -u -r1.57 -r1.58 pkgsrc/chat/ejabberd/distinfo

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.84 pkgsrc/chat/ejabberd/Makefile:1.85
--- pkgsrc/chat/ejabberd/Makefile:1.84  Thu May 17 13:40:38 2018
+++ pkgsrc/chat/ejabberd/Makefile       Fri Jul 20 09:58:26 2018
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.84 2018/05/17 13:40:38 fhajny Exp $
+# $NetBSD: Makefile,v 1.85 2018/07/20 09:58:26 fhajny Exp $
 
-DISTNAME=      ejabberd-18.04
+DISTNAME=      ejabberd-18.06
 CATEGORIES=    chat
 MASTER_SITES=  https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=  .tgz
@@ -10,27 +10,27 @@ HOMEPAGE=   https://www.ejabberd.im/
 COMMENT=       Free and Open Source distributed fault-tolerant Jabber server
 LICENSE=       gnu-gpl-v2
 
-DEPENDS+=      erlang-cache_tab>=1.0.13:../../devel/erlang-cache_tab
+DEPENDS+=      erlang-cache_tab>=1.0.14:../../devel/erlang-cache_tab
 DEPENDS+=      erlang-epam>=1.0.4:../../security/erlang-epam
 DEPENDS+=      erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
-DEPENDS+=      erlang-eimp>=1.0.5:../../graphics/erlang-eimp
-DEPENDS+=      erlang-esip>=1.0.23:../../net/erlang-esip
+DEPENDS+=      erlang-eimp>=1.0.6:../../graphics/erlang-eimp
+DEPENDS+=      erlang-esip>=1.0.24:../../net/erlang-esip
 DEPENDS+=      erlang-ezlib>=1.0.4:../../devel/erlang-ezlib
-DEPENDS+=      erlang-fast_tls>=1.0.22:../../security/erlang-fast_tls
-DEPENDS+=      erlang-fast_xml>=1.1.30:../../textproc/erlang-fast_xml
-DEPENDS+=      erlang-fast_yaml>=1.0.14:../../textproc/erlang-fast_yaml
-DEPENDS+=      erlang-iconv>=1.0.7:../../converters/erlang-iconv
+DEPENDS+=      erlang-fast_tls>=1.0.23:../../security/erlang-fast_tls
+DEPENDS+=      erlang-fast_xml>=1.1.31:../../textproc/erlang-fast_xml
+DEPENDS+=      erlang-fast_yaml>=1.0.15:../../textproc/erlang-fast_yaml
+DEPENDS+=      erlang-iconv>=1.0.8:../../converters/erlang-iconv
 DEPENDS+=      erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
 DEPENDS+=      erlang-jose>=1.8.4:../../security/erlang-jose
 DEPENDS+=      erlang-lager>=3.4.2.:../../sysutils/erlang-lager
 DEPENDS+=      erlang-luerl>=0.3:../../lang/erlang-luerl
-DEPENDS+=      erlang-p1_mysql>=1.0.5:../../databases/erlang-p1_mysql
+DEPENDS+=      erlang-p1_mysql>=1.0.6:../../databases/erlang-p1_mysql
 DEPENDS+=      erlang-p1_oauth2>=0.6.3:../../security/erlang-p1_oauth2
-DEPENDS+=      erlang-p1_pgsql>=1.1.5:../../databases/erlang-p1_pgsql
-DEPENDS+=      erlang-p1_utils>=1.0.11:../../misc/erlang-p1_utils
-DEPENDS+=      erlang-stringprep>=1.0.11:../../textproc/erlang-stringprep
-DEPENDS+=      erlang-stun>=1.0.22:../../net/erlang-stun
-DEPENDS+=      erlang-xmpp>=1.1.21:../../net/erlang-xmpp
+DEPENDS+=      erlang-p1_pgsql>=1.1.6:../../databases/erlang-p1_pgsql
+DEPENDS+=      erlang-p1_utils>=1.0.12:../../misc/erlang-p1_utils
+DEPENDS+=      erlang-stringprep>=1.0.12:../../textproc/erlang-stringprep
+DEPENDS+=      erlang-stun>=1.0.23:../../net/erlang-stun
+DEPENDS+=      erlang-xmpp>=1.2.1:../../net/erlang-xmpp
 
 GNU_CONFIGURE=         yes
 USE_GCC_RUNTIME=       yes

Index: pkgsrc/chat/ejabberd/PLIST
diff -u pkgsrc/chat/ejabberd/PLIST:1.53 pkgsrc/chat/ejabberd/PLIST:1.54
--- pkgsrc/chat/ejabberd/PLIST:1.53     Thu May 17 13:40:38 2018
+++ pkgsrc/chat/ejabberd/PLIST  Fri Jul 20 09:58:26 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.53 2018/05/17 13:40:38 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.54 2018/07/20 09:58:26 fhajny Exp $
 lib/${PKGNAME}/COPYING
 lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/${PKGNAME}/ebin/XmppAddr.beam
@@ -94,12 +94,12 @@ lib/${PKGNAME}/ebin/eldap_utils.beam
 lib/${PKGNAME}/ebin/elixir_logger_backend.beam
 lib/${PKGNAME}/ebin/ext_mod.beam
 lib/${PKGNAME}/ebin/extauth.beam
+lib/${PKGNAME}/ebin/extauth_sup.beam
 lib/${PKGNAME}/ebin/gen_iq_handler.beam
 lib/${PKGNAME}/ebin/gen_mod.beam
 lib/${PKGNAME}/ebin/gen_pubsub_node.beam
 lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam
 lib/${PKGNAME}/ebin/jd2ejd.beam
-lib/${PKGNAME}/ebin/jlib.beam
 lib/${PKGNAME}/ebin/misc.beam
 lib/${PKGNAME}/ebin/mod_adhoc.beam
 lib/${PKGNAME}/ebin/mod_admin_extra.beam
@@ -135,11 +135,6 @@ lib/${PKGNAME}/ebin/mod_http_api.beam
 lib/${PKGNAME}/ebin/mod_http_fileserver.beam
 lib/${PKGNAME}/ebin/mod_http_upload.beam
 lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
-lib/${PKGNAME}/ebin/mod_irc.beam
-lib/${PKGNAME}/ebin/mod_irc_connection.beam
-lib/${PKGNAME}/ebin/mod_irc_mnesia.beam
-lib/${PKGNAME}/ebin/mod_irc_riak.beam
-lib/${PKGNAME}/ebin/mod_irc_sql.beam
 lib/${PKGNAME}/ebin/mod_last.beam
 lib/${PKGNAME}/ebin/mod_last_mnesia.beam
 lib/${PKGNAME}/ebin/mod_last_riak.beam
@@ -255,7 +250,6 @@ lib/${PKGNAME}/include/ELDAPv3.hrl
 lib/${PKGNAME}/include/XmppAddr.hrl
 lib/${PKGNAME}/include/adhoc.hrl
 lib/${PKGNAME}/include/bosh.hrl
-lib/${PKGNAME}/include/ejabberd.hrl
 lib/${PKGNAME}/include/ejabberd_acme.hrl
 lib/${PKGNAME}/include/ejabberd_auth.hrl
 lib/${PKGNAME}/include/ejabberd_commands.hrl
@@ -269,12 +263,10 @@ lib/${PKGNAME}/include/ejabberd_sql_pt.h
 lib/${PKGNAME}/include/ejabberd_web_admin.hrl
 lib/${PKGNAME}/include/eldap.hrl
 lib/${PKGNAME}/include/http_bind.hrl
-lib/${PKGNAME}/include/jlib.hrl
 lib/${PKGNAME}/include/logger.hrl
 lib/${PKGNAME}/include/mod_announce.hrl
 lib/${PKGNAME}/include/mod_caps.hrl
 lib/${PKGNAME}/include/mod_carboncopy.hrl
-lib/${PKGNAME}/include/mod_irc.hrl
 lib/${PKGNAME}/include/mod_last.hrl
 lib/${PKGNAME}/include/mod_mam.hrl
 lib/${PKGNAME}/include/mod_muc.hrl
@@ -289,6 +281,7 @@ lib/${PKGNAME}/include/mod_shared_roster
 lib/${PKGNAME}/include/mod_vcard.hrl
 lib/${PKGNAME}/include/mod_vcard_xupdate.hrl
 lib/${PKGNAME}/include/pubsub.hrl
+lib/${PKGNAME}/include/scram.hrl
 lib/${PKGNAME}/include/translate.hrl
 lib/${PKGNAME}/priv/bin/captcha.sh
 lib/${PKGNAME}/priv/css/admin.css

Index: pkgsrc/chat/ejabberd/distinfo
diff -u pkgsrc/chat/ejabberd/distinfo:1.57 pkgsrc/chat/ejabberd/distinfo:1.58
--- pkgsrc/chat/ejabberd/distinfo:1.57  Thu May 17 13:40:38 2018
+++ pkgsrc/chat/ejabberd/distinfo       Fri Jul 20 09:58:26 2018
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.57 2018/05/17 13:40:38 fhajny Exp $
+$NetBSD: distinfo,v 1.58 2018/07/20 09:58:26 fhajny Exp $
 
-SHA1 (ejabberd-18.04.tgz) = 5d40aa2ac37bd8bfe39d518d22dba4c8ff94aa20
-RMD160 (ejabberd-18.04.tgz) = 4001974cd9c4bf5aebf2aaff18abbcf8d64fa370
-SHA512 (ejabberd-18.04.tgz) = 72a75aa7f60cbe80dac49ba4c7e0015c56bf9dbe62d95348d33c3542aa2bfbc2e8a69f39f53a3fabdc5a3e8fa14266134f67555fda8612b1b844838472fa65fc
-Size (ejabberd-18.04.tgz) = 1866384 bytes
+SHA1 (ejabberd-18.06.tgz) = 18c3ab25c904f7898717171d5e4ee568b8fcd68f
+RMD160 (ejabberd-18.06.tgz) = d5b00602ccded838df81bb766e0aaefc639c02f6
+SHA512 (ejabberd-18.06.tgz) = ccf3cb8d5edce255604abc7c3b0c77d237203fd673d425a7676a1c35f2d24a27bcfd605a941cd8e7149f111a134bca2aa1d488642e4d0decb273f757c6be8d60
+Size (ejabberd-18.06.tgz) = 1848145 bytes
 SHA1 (patch-aa) = b36ab8e2a189e07dc09186fdea0599d99294e0e5
 SHA1 (patch-ad) = de437722779c823a68f576ec587f5bc3a05e6fbc
 SHA1 (patch-ae) = d8d1ca7072f35a5652673cf461860e0f585ecd5b