summaryrefslogtreecommitdiff
path: root/chat
diff options
context:
space:
mode:
authorfhajny <fhajny@pkgsrc.org>2016-04-29 19:05:22 +0000
committerfhajny <fhajny@pkgsrc.org>2016-04-29 19:05:22 +0000
commitebcdcc173b7e4bb05f99f3707d40df2db35e73f0 (patch)
treee6d1db5f9fed76f026315c412ad29a4e5c59e964 /chat
parent8600d276488cf8c13a0aa5bfcea7806a766c88ef (diff)
downloadpkgsrc-ebcdcc173b7e4bb05f99f3707d40df2db35e73f0.tar.gz
Update chat/ejabberd to 16.04.
API Commands - Add API versionning - Changed error handling, based on exception - ejabberd Command bugfixes - Accept commands: add_commands syntax (along commands: – add_commands) - Fix mod_muc_admin:get_room_options and set_room_affiliation - mod_http_api: support 'open' ejabberd commands Databases - Split modules DB specific code into separate modules - Rename "odbc" to "sql" everywhere - Rename "internal" auth to "mnesia" - Improve detection of databases supported by modules - Switch to varchar(64) in mysql user.server/salt as text can't have default values - 'serverkey' and 'salt' should have empty string as default XMPP - Drop headline messages sent to offline resources - Don't omit bounces for messages of type "result" - Match namespace when checking for chat states - Fix check for standalone chat state notifications - Disable TLS compression for s2s by default - Make sure that ejabberd_sm sid are unique - Send stream trailer at the very end of the processing - Generate shorted jid for anonymous connections - Fix anonymous SASL auth ejabberdctl - Add option to migration script to delete data from a table after they have been successfully moved to SQL database: ejabberdctl delete_mnesia example.org - Remove useless variable and quote EPMD and SPOOL_DIR - Fix node ping command - Use UUID for ctl node name - Remove --auth in ejabberd_ctl.erl as it's useless, still useful for mod_rest - Force ERL_PATH for Elixir console Pubsub - Fix use of pubsub node plugin when configured with default_node_config - Set default value for pubsub#itemreply option - Add subscribe/unsubscribe hooks Internal - Add mod_mam header file - Replace ?ERR_* macros with ?ERRT_* - change mod_ping Timers using maps instead of dict Dependencies - Update p1_utils to 1.0.4: Adds p1_time_compat:unique_timestamp() - Update fast_tls to 1.0.3: Prevent buffer overflows and allocation failures - Update stringprep to 1.0.3: Fix compilation on Windows and error message - Update stun to 1.0.3: Use fast_tls 1.0.3 - Update esip to 1.0.4: Use fast_tls 1.0.3
Diffstat (limited to 'chat')
-rw-r--r--chat/ejabberd/Makefile14
-rw-r--r--chat/ejabberd/PLIST82
-rw-r--r--chat/ejabberd/distinfo14
-rw-r--r--chat/ejabberd/patches/patch-ae39
-rw-r--r--chat/ejabberd/patches/patch-rebar.config30
5 files changed, 109 insertions, 70 deletions
diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 6de047a2d09..36cb7bb5aca 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.64 2016/04/25 20:24:14 fhajny Exp $
+# $NetBSD: Makefile,v 1.65 2016/04/29 19:05:22 fhajny Exp $
-DISTNAME= ejabberd-16.03
+DISTNAME= ejabberd-16.04
CATEGORIES= chat
MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
EXTRACT_SUFX= .tgz
@@ -11,9 +11,9 @@ COMMENT= Free and Open Source distributed fault-tolerant Jabber server
LICENSE= gnu-gpl-v2
DEPENDS+= erlang-cache_tab>=1.0.2:../../devel/erlang-cache_tab
-DEPENDS+= erlang-esip>=1.0.2:../../net/erlang-esip
+DEPENDS+= erlang-esip>=1.0.4:../../net/erlang-esip
DEPENDS+= erlang-ezlib>=1.0.1:../../devel/erlang-ezlib
-DEPENDS+= erlang-fast_tls>=1.0.1:../../security/erlang-fast_tls
+DEPENDS+= erlang-fast_tls>=1.0.3:../../security/erlang-fast_tls
DEPENDS+= erlang-fast_xml>=1.1.3:../../textproc/erlang-fast_xml
DEPENDS+= erlang-fast_yaml>=1.0.3:../../textproc/erlang-fast_yaml
DEPENDS+= erlang-iconv>=1.0.0:../../converters/erlang-iconv
@@ -24,10 +24,10 @@ DEPENDS+= erlang-p1_mysql>=1.0.1:../../databases/erlang-p1_mysql
DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2
DEPENDS+= erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam
DEPENDS+= erlang-p1_pgsql>=1.1.0:../../databases/erlang-p1_pgsql
-DEPENDS+= erlang-p1_utils>=1.0.3:../../misc/erlang-p1_utils
+DEPENDS+= erlang-p1_utils>=1.0.4:../../misc/erlang-p1_utils
DEPENDS+= erlang-p1_xmlrpc>=1.15.1:../../textproc/erlang-p1_xmlrpc
-DEPENDS+= erlang-stringprep>=1.0.2:../../textproc/erlang-stringprep
-DEPENDS+= erlang-stun>=1.0.1:../../net/erlang-stun
+DEPENDS+= erlang-stringprep>=1.0.3:../../textproc/erlang-stringprep
+DEPENDS+= erlang-stun>=1.0.3:../../net/erlang-stun
CONFLICTS+= jabberd-[0-9]*
GNU_CONFIGURE= yes
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index d57595f4fab..82aacd9825b 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.39 2016/04/25 20:24:14 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.40 2016/04/29 19:05:22 fhajny Exp $
lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -16,11 +16,11 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_internal.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
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
@@ -40,8 +40,6 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc_sup.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
@@ -56,10 +54,12 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.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_odbc.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm_redis.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
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sql_pt.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sql_sup.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_stun.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sup.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_system_monitor.beam
@@ -69,7 +69,7 @@ lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_web_admin.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_websocket.beam
lib/erlang/lib/${PKGNAME}/ebin/ejabberd_xmlrpc.beam
-lib/erlang/lib/${PKGNAME}/ebin/ejd2odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejd2sql.beam
lib/erlang/lib/${PKGNAME}/ebin/eldap.beam
lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam
lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.beam
@@ -88,9 +88,19 @@ lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_admin_extra.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_announce_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_announce_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.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_caps.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_caps_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_caps_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam
@@ -105,20 +115,40 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_irc_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_irc_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_irc_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_last.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_last_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_last_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_last_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_mam.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_mam_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_mam_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_metrics.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_mix.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_muc_admin.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_muc_log.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc_riak.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_muc_room.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_muc_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_multicast.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_offline.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_offline_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_offline_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_offline_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_ping.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_pres_counter.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_privacy.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_privacy_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_privacy_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_privacy_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_private_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_private_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_private_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_lib.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_service.beam
@@ -128,9 +158,15 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.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
+lib/erlang/lib/${PKGNAME}/ebin/mod_roster_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_roster_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_roster_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_service_log.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_ldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_riak.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_shared_roster_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_sic.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_sip.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_sip_proxy.beam
@@ -139,38 +175,44 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_mnesia.beam
+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
lib/erlang/lib/${PKGNAME}/ebin/node_dag.beam
lib/erlang/lib/${PKGNAME}/ebin/node_dispatch.beam
lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_flat_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_flat_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_hometree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_hometree_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam
lib/erlang/lib/${PKGNAME}/ebin/node_mix.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_mix_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_mix_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/node_online.beam
lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_pep_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_pep_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/node_private.beam
lib/erlang/lib/${PKGNAME}/ebin/node_public.beam
lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
-lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
-lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam
lib/erlang/lib/${PKGNAME}/ebin/prosody2ejabberd.beam
-lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
lib/erlang/lib/${PKGNAME}/ebin/pubsub_migrate.beam
lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
-lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_sql.beam
lib/erlang/lib/${PKGNAME}/ebin/randoms.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
@@ -189,12 +231,22 @@ lib/erlang/lib/${PKGNAME}/include/eldap.hrl
lib/erlang/lib/${PKGNAME}/include/http_bind.hrl
lib/erlang/lib/${PKGNAME}/include/jlib.hrl
lib/erlang/lib/${PKGNAME}/include/logger.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_announce.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_caps.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_carboncopy.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_irc.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_last.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_mam.hrl
lib/erlang/lib/${PKGNAME}/include/mod_muc.hrl
lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl
lib/erlang/lib/${PKGNAME}/include/mod_offline.hrl
lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_private.hrl
lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl
lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_shared_roster.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_vcard.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_vcard_xupdate.hrl
lib/erlang/lib/${PKGNAME}/include/ns.hrl
lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 6d2e57e1654..4c33d90bad4 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.42 2016/04/25 20:24:14 fhajny Exp $
+$NetBSD: distinfo,v 1.43 2016/04/29 19:05:22 fhajny Exp $
-SHA1 (ejabberd-16.03.tgz) = 48a8310b1b441f278f763f0c7c64165353fe3f6d
-RMD160 (ejabberd-16.03.tgz) = cc98f37bdf512163b3baa7087d71c4858e62f773
-SHA512 (ejabberd-16.03.tgz) = e5a12a85c0c9f18a85ef3506a1b5fd6468ad45bbb152014dfd6ad77a71d321e971f8ab92354aedef959e9f3899e10cbb302989ff216ff4ed4cbdc8a4ed55954d
-Size (ejabberd-16.03.tgz) = 1694054 bytes
+SHA1 (ejabberd-16.04.tgz) = eaf9fcb827397d9f8cb5c70b2b2bf432408d5d06
+RMD160 (ejabberd-16.04.tgz) = 1672ad385d091cb703c41aa3984eff85756f79db
+SHA512 (ejabberd-16.04.tgz) = 5975d5a164060cca59b6d92de2c432f063061e832b2e03cae351fe3c16b178259489dc0b82ea800f1c2388eeb7e3aa4340630ad3c10a22cc6d6f0b4eef8fa0f2
+Size (ejabberd-16.04.tgz) = 1715963 bytes
SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
-SHA1 (patch-ae) = da166a0ccfe49aa26b62f680af1c9bd7611c18e9
+SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
-SHA1 (patch-rebar.config) = 01e2e06bf8ad82dc01834972009c517dff7baed4
+SHA1 (patch-rebar.config) = 657a06a7cb002f0bbb898942aa447b984d46604a
SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index 513b881419f..fb9c3222754 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,11 +1,10 @@
-$NetBSD: patch-ae,v 1.14 2016/04/25 20:24:14 fhajny Exp $
+$NetBSD: patch-ae,v 1.15 2016/04/29 19:05:22 fhajny Exp $
- Default locations.
-- Make it work with NetBSD's flock(1).
- Use 'su -' instead of just 'su'. Fixes priv delegation on SunOS
and AIX where Erlang relies on $HOME set correctly.
---- ejabberdctl.template.orig 2016-03-30 14:08:04.000000000 +0000
+--- ejabberdctl.template.orig 2016-04-28 13:57:55.000000000 +0000
+++ ejabberdctl.template
@@ -27,7 +27,7 @@ if [ "$INSTALLUSER" != "" ] ; then
mkdir -p "$INSTALLUSER_HOME"
@@ -29,30 +28,12 @@ $NetBSD: patch-ae,v 1.14 2016/04/25 20:24:14 fhajny Exp $
fi
if [ "$EJABBERD_DOC_PATH" = "" ] ; then
EJABBERD_DOC_PATH={{docdir}}
-@@ -87,7 +87,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+@@ -85,7 +85,7 @@ if [ "$ERLANG_NODE_ARG" != "" ] ; then
+ ERLANG_NODE=$ERLANG_NODE_ARG
fi
- if [ "{{release}}" != "true" ] ; then
- if [ "$EJABBERDDIR" = "" ] ; then
-- EJABBERDDIR={{libdir}}/ejabberd
-+ EJABBERDDIR={{libdir}}/erlang/lib/ejabberd
- fi
- if [ "$EJABBERD_PRIV_PATH" = "" ] ; then
- EJABBERD_PRIV_PATH=$EJABBERDDIR/priv
-@@ -371,7 +371,7 @@ ctl()
- # using flock if available. Expects a linux-style
- # flock that can lock a file descriptor.
- MAXCONNID=100
-- CONNLOCKDIR={{localstatedir}}/lock/ejabberdctl
-+ CONNLOCKDIR=@EJABBERD_PIDDIR@
- FLOCK=/usr/bin/flock
- if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
- JOT=/usr/bin/jot
-@@ -398,7 +398,7 @@ ctl()
- CTL_LOCKFILE="$CONNLOCKDIR/$CTL_CONN"
- (
- exec 8>"$CTL_LOCKFILE"
-- if flock --nb 8; then
-+ if flock -x -n 8; then
- ctlexec $CTL_CONN "$@"
- ssresult=$?
- # segregate from possible flock exit(1)
+ 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"`
diff --git a/chat/ejabberd/patches/patch-rebar.config b/chat/ejabberd/patches/patch-rebar.config
index 49739515541..1529f71c3c3 100644
--- a/chat/ejabberd/patches/patch-rebar.config
+++ b/chat/ejabberd/patches/patch-rebar.config
@@ -1,21 +1,21 @@
-$NetBSD: patch-rebar.config,v 1.2 2016/04/25 20:24:14 fhajny Exp $
+$NetBSD: patch-rebar.config,v 1.3 2016/04/29 19:05:22 fhajny Exp $
Deps are handled by pkgsrc.
---- rebar.config.orig 2016-03-30 14:08:04.000000000 +0000
+--- rebar.config.orig 2016-04-28 13:57:55.000000000 +0000
+++ rebar.config
-@@ -7,45 +7,6 @@
+@@ -7,51 +7,6 @@
%%% Created : 1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
%%%-------------------------------------------------------------------
-{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}},
-- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.3"}}},
+- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.4"}}},
- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.2"}}},
-- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.1"}}},
-- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.2"}}},
+- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.3"}}},
+- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.3"}}},
- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.3"}}},
-- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.1"}}},
-- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.2"}}},
+- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.3"}}},
+- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.4"}}},
- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.3"}}},
- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}},
- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}},
@@ -31,10 +31,14 @@ Deps are handled by pkgsrc.
- {tag, "1.0.0"}}}},
- {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
- {tag, "1.0.1"}}}},
-- {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang",
-- "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7
- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client",
- "527722d12d0433b837cdb92a60900c2cb5df8942"}}},
+- %% Forces correct dependency for riakc and allow using newer meck version)
+- {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang",
+- "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7
+- {if_var_true, riak, {protobuffs, ".*", {git, "https://github.com/basho/erlang_protobuffs",
+- "6e7fc924506e2dc166a6170e580ce1d95ebbd5bd"}}}, % for riak_pb-2.1.0.7 with correct meck dependency
+- %% Elixir support, needed to run tests
- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
- {tag, "v1.1.1"}}}},
- %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
@@ -42,8 +46,10 @@ Deps are handled by pkgsrc.
- {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
- {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
- {tag, "1.0.0"}}}},
-- {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck",
-- {tag, "0.8.2"}}}},
+- {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
+- {tag, "0.8.4"}}}},
+- {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
+- {tag, "1.0.5b"}}}},
- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
- {tag, "v1.0.8"}}}}]}.
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 07:18:59 +0000