diff options
author | fhajny <fhajny@pkgsrc.org> | 2017-08-20 12:58:04 +0000 |
---|---|---|
committer | fhajny <fhajny@pkgsrc.org> | 2017-08-20 12:58:04 +0000 |
commit | 1580b919f9bb3418688fd9e99c7a0979e47c3fae (patch) | |
tree | 9c446267a964581fa4a57c72d0a4d866193b9f3f /chat | |
parent | c858e4466e07742e1517eb073ec17b2afe7ffbd1 (diff) | |
download | pkgsrc-1580b919f9bb3418688fd9e99c7a0979e47c3fae.tar.gz |
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’s route table haven’t 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 ‘certfile’ option
- Introduce ‘hosts’ modules option
- Fix ERLANG_OPTS, INET_DIST_INTERFACE and FIREWALL_WINDOW option
- Remove unused ‘managers’ 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
Diffstat (limited to 'chat')
-rw-r--r-- | chat/ejabberd/Makefile | 16 | ||||
-rw-r--r-- | chat/ejabberd/PLIST | 6 | ||||
-rw-r--r-- | chat/ejabberd/distinfo | 12 | ||||
-rw-r--r-- | chat/ejabberd/patches/patch-ae | 26 |
4 files changed, 28 insertions, 32 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile index 6f8a653e229..ee685e364de 100644 --- a/chat/ejabberd/Makefile +++ b/chat/ejabberd/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.74 2017/08/01 14:58:53 wiz Exp $ +# $NetBSD: Makefile,v 1.75 2017/08/20 12:58:04 fhajny Exp $ -DISTNAME= ejabberd-17.07 +DISTNAME= ejabberd-17.08 CATEGORIES= chat MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tgz @@ -10,12 +10,12 @@ 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.9:../../devel/erlang-cache_tab +DEPENDS+= erlang-cache_tab>=1.0.10:../../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.13:../../net/erlang-esip +DEPENDS+= erlang-esip>=1.0.15:../../net/erlang-esip DEPENDS+= erlang-ezlib>=1.0.2:../../devel/erlang-ezlib -DEPENDS+= erlang-fast_tls>=1.0.13:../../security/erlang-fast_tls +DEPENDS+= erlang-fast_tls>=1.0.15:../../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 @@ -23,12 +23,12 @@ DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl 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_oauth2>=0.6.2:../../security/erlang-p1_oauth2 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 +DEPENDS+= erlang-stun>=1.0.14:../../net/erlang-stun +DEPENDS+= erlang-xmpp>=1.1.14:../../net/erlang-xmpp CONFLICTS+= jabberd-[0-9]* GNU_CONFIGURE= yes diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST index e434d7bfbe6..7e49b1445d6 100644 --- a/chat/ejabberd/PLIST +++ b/chat/ejabberd/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.47 2017/07/07 10:08:39 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.48 2017/08/20 12:58:04 fhajny Exp $ lib/erlang/lib/${PKGNAME}/COPYING lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam @@ -28,6 +28,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster.beam +lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam @@ -179,6 +180,9 @@ 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 lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_push.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_push_keepalive.beam +lib/erlang/lib/${PKGNAME}/ebin/mod_push_mnesia.beam lib/erlang/lib/${PKGNAME}/ebin/mod_register.beam lib/erlang/lib/${PKGNAME}/ebin/mod_register_web.beam lib/erlang/lib/${PKGNAME}/ebin/mod_roster.beam diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo index 449e490f287..2ccb8eb722e 100644 --- a/chat/ejabberd/distinfo +++ b/chat/ejabberd/distinfo @@ -1,12 +1,12 @@ -$NetBSD: distinfo,v 1.50 2017/07/07 10:08:39 fhajny Exp $ +$NetBSD: distinfo,v 1.51 2017/08/20 12:58:04 fhajny Exp $ -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 (ejabberd-17.08.tgz) = b9f05fbd9890d71bcbf91fee4fb5c0a1a8fc322c +RMD160 (ejabberd-17.08.tgz) = bb695e29c7c2d9b4726dfde06fe4e0b7588723a8 +SHA512 (ejabberd-17.08.tgz) = 037902e557fcc09616f6c120c543be9f4aedd4eac9a6a9618209f0ebc66a24d3857870569c31478cc37652d243e1b7a02151f7c2b15ef2ddfefee8a04a8dd328 +Size (ejabberd-17.08.tgz) = 1716503 bytes SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88 SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8 -SHA1 (patch-ae) = b74d8d147dad45eef63e969f6774748233fc0fc8 +SHA1 (patch-ae) = 41a3ce9c4fcbd3125240167e2fb3d202cbfccf05 SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe SHA1 (patch-rebar.config) = 1c9aad883e7e47908ad92580cca5ba35c0c3034a SHA1 (patch-rebar.config.script) = a9dd2828a7de79cc93b6313580d83d82f6a7a684 diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae index 0ef67fd718e..120b1ac36f3 100644 --- a/chat/ejabberd/patches/patch-ae +++ b/chat/ejabberd/patches/patch-ae @@ -1,23 +1,15 @@ -$NetBSD: patch-ae,v 1.16 2017/07/07 10:08:40 fhajny Exp $ +$NetBSD: patch-ae,v 1.17 2017/08/20 12:58:04 fhajny Exp $ - Default locations. - Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS - and AIX where Erlang relies on $HOME set correctly. + and AIX where Erlang relies on $HOME set correctly. Use a portable + su arg order while at it. - At least SunOS has not wheel group. - Portable grep calls. ---- ejabberdctl.template.orig 2017-06-30 12:24:35.000000000 +0000 +--- ejabberdctl.template.orig 2017-08-14 07:43:02.000000000 +0000 +++ ejabberdctl.template -@@ -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 +@@ -56,8 +56,8 @@ done # define ejabberd variables if not already defined from the command line : ${ETC_DIR:={{sysconfdir}}/ejabberd} @@ -28,16 +20,16 @@ $NetBSD: patch-ae,v 1.16 2017/07/07 10:08:40 fhajny Exp $ : ${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 +@@ -108,7 +108,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_install_user) su -c '"$0" "$@"' "$INSTALLUSER" -- "$@" ;; ++ as_install_user) su - "$INSTALLUSER" -c '"$@"' -- "$@" ;; as_current_user) "$@" ;; esac } -@@ -202,19 +202,19 @@ uid() +@@ -207,19 +207,19 @@ uid() # stop epmd if there is no other running node stop_epmd() { |