Tue Jan 3 18:52:33 2017 UTC ()
Update chat/ejabberd to 16.12.

API / integration
- New API permissions framework

Commands
- Add configurable weight for ejabberd commands
- add_rosteritem: Support several groups separated by ;
- create_rooms_file: Fix reading room jids from file
- delete_old_messages: Fix command for SQL backends
- send_message: Don't duplicate the message
- Remove obsolete remove_node command (use leave_cluster)
- Fix reload_config
- Cleanup mod_admin_extra, add few functions
- Expose unregister API command

Core XMPP
- New BOSH module
- Use fxml_gen XML generator
- Use our new stand-alone XMPP library instead of jlib.erl
- Don't let MAM messages go into offline storage
- Add xdata generator for XMPP data form
- Get rid of excessive (io)list_to_binary/1 calls

HTTP
- Add authentication support to mod_http_fileserver
- ejabberd_http: Handle missing POST data gracefully
- Use inets instead of lhttpc in http_p1
- Add http_p1.erl, rest.erl, and oauth2 ReST backend for OAuth2 tokens

MUC
- Create room on configuration request as per XEP-0045, 10.1.3
- Ensure that presence_broadcast room option is stored
- Fix conference disco#items when running multiple virtual hosts
- Fix Result Set Management (RSM) for conference disco#items
- Introduce muc_invite hook
- Make the constant MAX_ROOMS_DISCOITEMS configurable
- mod_carboncopy: Don't copy MUC private messages

MUC/Sub
- Store the flag "Allow Subscription" room option in database
- When getting list of subscribed rooms, also check temporary ones
- Add password support in muc_subscribe
- When unsubscribes, check if room should get closed

Pubsub
- Enforce pubsub node removal
- Relational databases support
- Append ; to privacy_list_data exporting lines
- Improve relational database import

Build
- Make build system compatible with rebar3
- Produce ejabberd.service and fix for systemd usage
- Cleanup ext_mod and fix compilation path
- Fix compilation of external module with new xmpp lib


(fhajny)
diff -r1.68 -r1.69 pkgsrc/chat/ejabberd/Makefile
diff -r1.42 -r1.43 pkgsrc/chat/ejabberd/PLIST
diff -r1.45 -r1.46 pkgsrc/chat/ejabberd/distinfo
diff -r1.5 -r1.6 pkgsrc/chat/ejabberd/patches/patch-rebar.config
cvs diff -r1.68 -r1.69 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2016/10/02 12:17:40 1.68
+++ pkgsrc/chat/ejabberd/Makefile 2017/01/03 18:52:33 1.69
@@ -1,42 +1,43 @@ @@ -1,42 +1,43 @@
1# $NetBSD: Makefile,v 1.68 2016/10/02 12:17:40 fhajny Exp $ 1# $NetBSD: Makefile,v 1.69 2017/01/03 18:52:33 fhajny Exp $
2 2
3DISTNAME= ejabberd-16.09 3DISTNAME= ejabberd-16.12
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ 5MASTER_SITES= http://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= http://www.ejabberd.im/ 9HOMEPAGE= http://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.4:../../devel/erlang-cache_tab 13DEPENDS+= erlang-cache_tab>=1.0.5:../../devel/erlang-cache_tab
14DEPENDS+= erlang-esip>=1.0.8:../../net/erlang-esip 14DEPENDS+= erlang-esip>=1.0.10:../../net/erlang-esip
15DEPENDS+= erlang-ezlib>=1.0.1:../../devel/erlang-ezlib 15DEPENDS+= erlang-ezlib>=1.0.1:../../devel/erlang-ezlib
16DEPENDS+= erlang-fast_tls>=1.0.7:../../security/erlang-fast_tls 16DEPENDS+= erlang-fast_tls>=1.0.9:../../security/erlang-fast_tls
17DEPENDS+= erlang-fast_xml>=1.1.15:../../textproc/erlang-fast_xml 17DEPENDS+= erlang-fast_xml>=1.1.18:../../textproc/erlang-fast_xml
18DEPENDS+= erlang-fast_yaml>=1.0.6:../../textproc/erlang-fast_yaml 18DEPENDS+= erlang-fast_yaml>=1.0.7:../../textproc/erlang-fast_yaml
19DEPENDS+= erlang-iconv>=1.0.2:../../converters/erlang-iconv 19DEPENDS+= erlang-iconv>=1.0.3:../../converters/erlang-iconv
20DEPENDS+= erlang-jiffy>=0.14.7:../../textproc/erlang-jiffy 20DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
21DEPENDS+= erlang-lager>=3.2.1:../../sysutils/erlang-lager 21DEPENDS+= erlang-lager>=3.2.1:../../sysutils/erlang-lager
22DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl 22DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl
23DEPENDS+= erlang-p1_mysql>=1.0.1:../../databases/erlang-p1_mysql 23DEPENDS+= erlang-p1_mysql>=1.0.2:../../databases/erlang-p1_mysql
24DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2 24DEPENDS+= erlang-p1_oauth2>=0.6.1:../../security/erlang-p1_oauth2
25DEPENDS+= erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam 25DEPENDS+= erlang-p1_pam>=1.0.0:../../security/erlang-p1_pam
26DEPENDS+= erlang-p1_pgsql>=1.1.0:../../databases/erlang-p1_pgsql 26DEPENDS+= erlang-p1_pgsql>=1.1.1:../../databases/erlang-p1_pgsql
27DEPENDS+= erlang-p1_utils>=1.0.5:../../misc/erlang-p1_utils 27DEPENDS+= erlang-p1_utils>=1.0.6:../../misc/erlang-p1_utils
28DEPENDS+= erlang-stringprep>=1.0.6:../../textproc/erlang-stringprep 28DEPENDS+= erlang-stringprep>=1.0.7:../../textproc/erlang-stringprep
29DEPENDS+= erlang-stun>=1.0.7:../../net/erlang-stun 29DEPENDS+= erlang-stun>=1.0.9:../../net/erlang-stun
 30DEPENDS+= erlang-xmpp>=1.1.4:../../net/erlang-xmpp
30CONFLICTS+= jabberd-[0-9]* 31CONFLICTS+= jabberd-[0-9]*
31 32
32GNU_CONFIGURE= yes 33GNU_CONFIGURE= yes
33USE_GCC_RUNTIME= yes 34USE_GCC_RUNTIME= yes
34USE_TOOLS+= bash:run gmake patch 35USE_TOOLS+= bash:run gmake patch
35 36
36CONFIGURE_ARGS+= --disable-debug 37CONFIGURE_ARGS+= --disable-debug
37CONFIGURE_ARGS+= --enable-iconv 38CONFIGURE_ARGS+= --enable-iconv
38CONFIGURE_ARGS+= --enable-mysql 39CONFIGURE_ARGS+= --enable-mysql
39CONFIGURE_ARGS+= --enable-odbc 40CONFIGURE_ARGS+= --enable-odbc
40CONFIGURE_ARGS+= --enable-pam 41CONFIGURE_ARGS+= --enable-pam
41CONFIGURE_ARGS+= --enable-pgsql 42CONFIGURE_ARGS+= --enable-pgsql
42CONFIGURE_ARGS+= --enable-zlib 43CONFIGURE_ARGS+= --enable-zlib
@@ -57,53 +58,53 @@ EJABBERD_USER?= ejabberd @@ -57,53 +58,53 @@ EJABBERD_USER?= ejabberd
57EJABBERD_GROUP?= ejabberd 58EJABBERD_GROUP?= ejabberd
58EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd 59EJABBERD_PIDDIR?= ${VARBASE}/run/ejabberd
59EJABBERD_LOGDIR?= ${VARBASE}/log/ejabberd 60EJABBERD_LOGDIR?= ${VARBASE}/log/ejabberd
60EJABBERD_DB?= ${VARBASE}/spool/ejabberd 61EJABBERD_DB?= ${VARBASE}/spool/ejabberd
61 62
62OWN_DIRS_PERMS+= ${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 63OWN_DIRS_PERMS+= ${EJABBERD_PIDDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
63OWN_DIRS_PERMS+= ${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 64OWN_DIRS_PERMS+= ${EJABBERD_LOGDIR} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
64OWN_DIRS_PERMS+= ${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770 65OWN_DIRS_PERMS+= ${EJABBERD_DB} ${EJABBERD_USER} ${EJABBERD_GROUP} 0770
65 66
66FILES_SUBST+= EJABBERD_USER=${EJABBERD_USER} 67FILES_SUBST+= EJABBERD_USER=${EJABBERD_USER}
67FILES_SUBST+= EJABBERD_GROUP=${EJABBERD_GROUP} 68FILES_SUBST+= EJABBERD_GROUP=${EJABBERD_GROUP}
68FILES_SUBST+= EJABBERD_DB=${EJABBERD_DB} 69FILES_SUBST+= EJABBERD_DB=${EJABBERD_DB}
69 70
70PKG_GROUPS+= ${EJABBERD_GROUP} 71PKG_GROUPS+= ${EJABBERD_GROUP}
71PKG_USERS+= ${EJABBERD_USER}:${EJABBERD_GROUP} 72PKG_USERS+= ${EJABBERD_USER}:${EJABBERD_GROUP}
72PKG_GECOS.${EJABBERD_USER}= ejabberd user 73PKG_GECOS.${EJABBERD_USER}= ejabberd user
73PKG_HOME.${EJABBERD_USER}= ${EJABBERD_DB} 74PKG_HOME.${EJABBERD_USER}= ${EJABBERD_DB}
74PKG_SHELL.${EJABBERD_USER}= ${SH} 75PKG_SHELL.${EJABBERD_USER}= ${SH}
75 76
76EGDIR= share/examples/ejabberd 77EGDIR= share/examples/ejabberd
77 78
78INSTALLATION_DIRS+= share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d 79INSTALLATION_DIRS+= share/doc/${PKGBASE} ${EGDIR} share/bash-completion.d
79INSTALLATION_DIRS+= lib/erlang/lib/${DISTNAME}/priv/sql 80INSTALLATION_DIRS+= lib/erlang/lib/${DISTNAME}/priv/sql
80 81
81CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \ 82CONF_FILES_PERMS= ${EGDIR}/ejabberd.yml ${PKG_SYSCONFDIR}/ejabberd.yml \
82 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 83 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
83CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \ 84CONF_FILES_PERMS+= ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg \
84 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 85 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
85CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \ 86CONF_FILES_PERMS+= ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc \
86 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640 87 ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0640
87SPECIAL_PERMS+= sbin/ejabberdctl ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0750 88SPECIAL_PERMS+= sbin/ejabberdctl ${REAL_ROOT_USER} ${EJABBERD_GROUP} 0750
88 89
89REPLACE_BASH= ejabberdctl.template tools/captcha.sh 90REPLACE_BASH= ejabberdctl.template tools/captcha.sh
90 91
91SUBST_CLASSES+= paths 92SUBST_CLASSES+= paths
92SUBST_MESSAGE.paths= Localizing paths 93SUBST_MESSAGE.paths= Localizing paths
93SUBST_STAGE.paths= pre-configure 94SUBST_STAGE.paths= pre-configure
94SUBST_FILES.paths= Makefile.in ejabberd.yml.example ejabberdctl.template 95SUBST_FILES.paths= Makefile.in ejabberd.yml.example ejabberdctl.template
95SUBST_FILES.paths+= tools/ejabberdctl.bc 96SUBST_FILES.paths+= tools/ejabberdctl.bc rebar.config
96SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR 97SUBST_VARS.paths= DISTNAME EJABBERD_DB EJABBERD_LOGDIR EJABBERD_PIDDIR
97SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX 98SUBST_VARS.paths+= PKG_SYSCONFDIR PREFIX LOCALBASE
98 99
99post-extract: 100post-extract:
100 cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built 101 cd ${WRKSRC} && ${MKDIR} deps && ${TOUCH} deps/.got deps/.built
101 102
102post-install: 103post-install:
103 ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \ 104 ${INSTALL_DATA} ${WRKSRC}/tools/ejabberdctl.bc \
104 ${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd 105 ${DESTDIR}${PREFIX}/share/bash-completion.d/ejabberd
105 cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \ 106 cd ${WRKSRC}/sql && ${INSTALL_DATA} *.sql \
106 ${DESTDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/sql 107 ${DESTDIR}${PREFIX}/lib/erlang/lib/${DISTNAME}/priv/sql
107 108
108.include "../../lang/erlang/buildlink3.mk" 109.include "../../lang/erlang/buildlink3.mk"
109.include "../../mk/bsd.pkg.mk" 110.include "../../mk/bsd.pkg.mk"
cvs diff -r1.42 -r1.43 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2016/10/02 12:17:40 1.42
+++ pkgsrc/chat/ejabberd/PLIST 2017/01/03 18:52:33 1.43
@@ -1,56 +1,59 @@ @@ -1,56 +1,59 @@
1@comment $NetBSD: PLIST,v 1.42 2016/10/02 12:17:40 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.43 2017/01/03 18:52:33 fhajny Exp $
2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam 2lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam 3lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
4lib/erlang/lib/${PKGNAME}/ebin/acl.beam 4lib/erlang/lib/${PKGNAME}/ebin/acl.beam
5lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam 
6lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam 5lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
7lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam 6lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
8lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam 7lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
9lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_oauth.beam 8lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_oauth.beam
10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam 9lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
11lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam 10lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
12lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app 11lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
13lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam 12lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
 13lib/erlang/lib/${PKGNAME}/ebin/ejabberd_access_permissions.beam
14lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam 14lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
15lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam 15lib/erlang/lib/${PKGNAME}/ebin/ejabberd_app.beam
16lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam 16lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth.beam
17lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam 17lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_anonymous.beam
18lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam 18lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_external.beam
19lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam 19lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_ldap.beam
20lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam 20lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_mnesia.beam
21lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam 21lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
22lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam 22lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam
23lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam 23lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
 24lib/erlang/lib/${PKGNAME}/ebin/ejabberd_bosh.beam
24lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam 25lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
25lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam 26lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
26lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam 27lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam
27lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster.beam 28lib/erlang/lib/${PKGNAME}/ebin/ejabberd_cluster.beam
28lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam 29lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam
29lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam 30lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
30lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam 31lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
31lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam 32lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
32lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam 33lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam
33lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam 34lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
34lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam 35lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
35lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_bind.beam 36lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_bind.beam
36lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam 37lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
37lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam 38lib/erlang/lib/${PKGNAME}/ebin/ejabberd_idna.beam
38lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam 39lib/erlang/lib/${PKGNAME}/ebin/ejabberd_listener.beam
39lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam 40lib/erlang/lib/${PKGNAME}/ebin/ejabberd_local.beam
40lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam 41lib/erlang/lib/${PKGNAME}/ebin/ejabberd_logger.beam
 42lib/erlang/lib/${PKGNAME}/ebin/ejabberd_mnesia.beam
41lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam 43lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
42lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam 44lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth.beam
43lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam 45lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam
 46lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam
44lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam 47lib/erlang/lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam
45lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam 48lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
46lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam 49lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
47lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam 50lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
48lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis.beam 51lib/erlang/lib/${PKGNAME}/ebin/ejabberd_redis.beam
49lib/erlang/lib/${PKGNAME}/ebin/ejabberd_regexp.beam 52lib/erlang/lib/${PKGNAME}/ebin/ejabberd_regexp.beam
50lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak.beam 53lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak.beam
51lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam 54lib/erlang/lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam
52lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam 55lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
53lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam 56lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
54lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam 57lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s.beam
55lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam 58lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_in.beam
56lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam 59lib/erlang/lib/${PKGNAME}/ebin/ejabberd_s2s_out.beam
@@ -76,47 +79,46 @@ lib/erlang/lib/${PKGNAME}/ebin/ejd2sql.b @@ -76,47 +79,46 @@ lib/erlang/lib/${PKGNAME}/ebin/ejd2sql.b
76lib/erlang/lib/${PKGNAME}/ebin/eldap.beam 79lib/erlang/lib/${PKGNAME}/ebin/eldap.beam
77lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam 80lib/erlang/lib/${PKGNAME}/ebin/eldap_filter.beam
78lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.beam 81lib/erlang/lib/${PKGNAME}/ebin/eldap_filter_yecc.beam
79lib/erlang/lib/${PKGNAME}/ebin/eldap_pool.beam 82lib/erlang/lib/${PKGNAME}/ebin/eldap_pool.beam
80lib/erlang/lib/${PKGNAME}/ebin/eldap_utils.beam 83lib/erlang/lib/${PKGNAME}/ebin/eldap_utils.beam
81lib/erlang/lib/${PKGNAME}/ebin/elixir_logger_backend.beam 84lib/erlang/lib/${PKGNAME}/ebin/elixir_logger_backend.beam
82lib/erlang/lib/${PKGNAME}/ebin/ext_mod.beam 85lib/erlang/lib/${PKGNAME}/ebin/ext_mod.beam
83lib/erlang/lib/${PKGNAME}/ebin/extauth.beam 86lib/erlang/lib/${PKGNAME}/ebin/extauth.beam
84lib/erlang/lib/${PKGNAME}/ebin/gen_iq_handler.beam 87lib/erlang/lib/${PKGNAME}/ebin/gen_iq_handler.beam
85lib/erlang/lib/${PKGNAME}/ebin/gen_mod.beam 88lib/erlang/lib/${PKGNAME}/ebin/gen_mod.beam
86lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam 89lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_node.beam
87lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam 90lib/erlang/lib/${PKGNAME}/ebin/gen_pubsub_nodetree.beam
88lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam 91lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
89lib/erlang/lib/${PKGNAME}/ebin/jid.beam 
90lib/erlang/lib/${PKGNAME}/ebin/jlib.beam 92lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
91lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam 93lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
92lib/erlang/lib/${PKGNAME}/ebin/mod_admin_extra.beam 94lib/erlang/lib/${PKGNAME}/ebin/mod_admin_extra.beam
93lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam 95lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
94lib/erlang/lib/${PKGNAME}/ebin/mod_announce_mnesia.beam 96lib/erlang/lib/${PKGNAME}/ebin/mod_announce_mnesia.beam
95lib/erlang/lib/${PKGNAME}/ebin/mod_announce_riak.beam 97lib/erlang/lib/${PKGNAME}/ebin/mod_announce_riak.beam
96lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.beam 98lib/erlang/lib/${PKGNAME}/ebin/mod_announce_sql.beam
97lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam 99lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
98lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_mnesia.beam 100lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_mnesia.beam
99lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_riak.beam 101lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_riak.beam
100lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_sql.beam 102lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_sql.beam
 103lib/erlang/lib/${PKGNAME}/ebin/mod_bosh.beam
101lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam 104lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
102lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam 105lib/erlang/lib/${PKGNAME}/ebin/mod_caps_mnesia.beam
103lib/erlang/lib/${PKGNAME}/ebin/mod_caps_riak.beam 106lib/erlang/lib/${PKGNAME}/ebin/mod_caps_riak.beam
104lib/erlang/lib/${PKGNAME}/ebin/mod_caps_sql.beam 107lib/erlang/lib/${PKGNAME}/ebin/mod_caps_sql.beam
105lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam 108lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy.beam
106lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam 109lib/erlang/lib/${PKGNAME}/ebin/mod_carboncopy_mnesia.beam
107lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam 110lib/erlang/lib/${PKGNAME}/ebin/mod_client_state.beam
108lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam 111lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
109lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam 
110lib/erlang/lib/${PKGNAME}/ebin/mod_delegation.beam 112lib/erlang/lib/${PKGNAME}/ebin/mod_delegation.beam
111lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam 113lib/erlang/lib/${PKGNAME}/ebin/mod_disco.beam
112lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam 114lib/erlang/lib/${PKGNAME}/ebin/mod_echo.beam
113lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam 115lib/erlang/lib/${PKGNAME}/ebin/mod_fail2ban.beam
114lib/erlang/lib/${PKGNAME}/ebin/mod_http_api.beam 116lib/erlang/lib/${PKGNAME}/ebin/mod_http_api.beam
115lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam 117lib/erlang/lib/${PKGNAME}/ebin/mod_http_bind.beam
116lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam 118lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.beam
117lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload.beam 119lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload.beam
118lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload_quota.beam 120lib/erlang/lib/${PKGNAME}/ebin/mod_http_upload_quota.beam
119lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam 121lib/erlang/lib/${PKGNAME}/ebin/mod_ip_blacklist.beam
120lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam 122lib/erlang/lib/${PKGNAME}/ebin/mod_irc.beam
121lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam 123lib/erlang/lib/${PKGNAME}/ebin/mod_irc_connection.beam
122lib/erlang/lib/${PKGNAME}/ebin/mod_irc_mnesia.beam 124lib/erlang/lib/${PKGNAME}/ebin/mod_irc_mnesia.beam
@@ -206,66 +208,66 @@ lib/erlang/lib/${PKGNAME}/ebin/node_pep_ @@ -206,66 +208,66 @@ lib/erlang/lib/${PKGNAME}/ebin/node_pep_
206lib/erlang/lib/${PKGNAME}/ebin/node_private.beam 208lib/erlang/lib/${PKGNAME}/ebin/node_private.beam
207lib/erlang/lib/${PKGNAME}/ebin/node_public.beam 209lib/erlang/lib/${PKGNAME}/ebin/node_public.beam
208lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam 210lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
209lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam 211lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
210lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_sql.beam 212lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_sql.beam
211lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam 213lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
212lib/erlang/lib/${PKGNAME}/ebin/prosody2ejabberd.beam 214lib/erlang/lib/${PKGNAME}/ebin/prosody2ejabberd.beam
213lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_sql.beam 215lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_sql.beam
214lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam 216lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
215lib/erlang/lib/${PKGNAME}/ebin/pubsub_migrate.beam 217lib/erlang/lib/${PKGNAME}/ebin/pubsub_migrate.beam
216lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam 218lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
217lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_sql.beam 219lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_sql.beam
218lib/erlang/lib/${PKGNAME}/ebin/randoms.beam 220lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
 221lib/erlang/lib/${PKGNAME}/ebin/rest.beam
219lib/erlang/lib/${PKGNAME}/ebin/scram.beam 222lib/erlang/lib/${PKGNAME}/ebin/scram.beam
220lib/erlang/lib/${PKGNAME}/ebin/shaper.beam 223lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
221lib/erlang/lib/${PKGNAME}/ebin/sql_queries.beam 224lib/erlang/lib/${PKGNAME}/ebin/sql_queries.beam
222lib/erlang/lib/${PKGNAME}/ebin/str.beam 225lib/erlang/lib/${PKGNAME}/ebin/str.beam
223lib/erlang/lib/${PKGNAME}/ebin/translate.beam 226lib/erlang/lib/${PKGNAME}/ebin/translate.beam
224lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam 227lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
225lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl 228lib/erlang/lib/${PKGNAME}/include/ELDAPv3.hrl
226lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl 229lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
227lib/erlang/lib/${PKGNAME}/include/adhoc.hrl 230lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
 231lib/erlang/lib/${PKGNAME}/include/bosh.hrl
228lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl 232lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
229lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl 233lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
230lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl 234lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
231lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl 235lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
232lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl 236lib/erlang/lib/${PKGNAME}/include/ejabberd_http.hrl
233lib/erlang/lib/${PKGNAME}/include/ejabberd_oauth.hrl 237lib/erlang/lib/${PKGNAME}/include/ejabberd_oauth.hrl
234lib/erlang/lib/${PKGNAME}/include/ejabberd_service.hrl 
235lib/erlang/lib/${PKGNAME}/include/ejabberd_sm.hrl 238lib/erlang/lib/${PKGNAME}/include/ejabberd_sm.hrl
236lib/erlang/lib/${PKGNAME}/include/ejabberd_sql_pt.hrl 239lib/erlang/lib/${PKGNAME}/include/ejabberd_sql_pt.hrl
237lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl 240lib/erlang/lib/${PKGNAME}/include/ejabberd_web_admin.hrl
238lib/erlang/lib/${PKGNAME}/include/eldap.hrl 241lib/erlang/lib/${PKGNAME}/include/eldap.hrl
239lib/erlang/lib/${PKGNAME}/include/http_bind.hrl 242lib/erlang/lib/${PKGNAME}/include/http_bind.hrl
240lib/erlang/lib/${PKGNAME}/include/jlib.hrl 243lib/erlang/lib/${PKGNAME}/include/jlib.hrl
241lib/erlang/lib/${PKGNAME}/include/logger.hrl 244lib/erlang/lib/${PKGNAME}/include/logger.hrl
242lib/erlang/lib/${PKGNAME}/include/mod_announce.hrl 245lib/erlang/lib/${PKGNAME}/include/mod_announce.hrl
243lib/erlang/lib/${PKGNAME}/include/mod_caps.hrl 246lib/erlang/lib/${PKGNAME}/include/mod_caps.hrl
244lib/erlang/lib/${PKGNAME}/include/mod_carboncopy.hrl 247lib/erlang/lib/${PKGNAME}/include/mod_carboncopy.hrl
245lib/erlang/lib/${PKGNAME}/include/mod_irc.hrl 248lib/erlang/lib/${PKGNAME}/include/mod_irc.hrl
246lib/erlang/lib/${PKGNAME}/include/mod_last.hrl 249lib/erlang/lib/${PKGNAME}/include/mod_last.hrl
247lib/erlang/lib/${PKGNAME}/include/mod_mam.hrl 250lib/erlang/lib/${PKGNAME}/include/mod_mam.hrl
248lib/erlang/lib/${PKGNAME}/include/mod_muc.hrl 251lib/erlang/lib/${PKGNAME}/include/mod_muc.hrl
249lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl 252lib/erlang/lib/${PKGNAME}/include/mod_muc_room.hrl
250lib/erlang/lib/${PKGNAME}/include/mod_offline.hrl 253lib/erlang/lib/${PKGNAME}/include/mod_offline.hrl
251lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl 254lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
252lib/erlang/lib/${PKGNAME}/include/mod_private.hrl 255lib/erlang/lib/${PKGNAME}/include/mod_private.hrl
253lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl 256lib/erlang/lib/${PKGNAME}/include/mod_proxy65.hrl
254lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl 257lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
255lib/erlang/lib/${PKGNAME}/include/mod_shared_roster.hrl 258lib/erlang/lib/${PKGNAME}/include/mod_shared_roster.hrl
256lib/erlang/lib/${PKGNAME}/include/mod_vcard.hrl 259lib/erlang/lib/${PKGNAME}/include/mod_vcard.hrl
257lib/erlang/lib/${PKGNAME}/include/mod_vcard_xupdate.hrl 260lib/erlang/lib/${PKGNAME}/include/mod_vcard_xupdate.hrl
258lib/erlang/lib/${PKGNAME}/include/ns.hrl 
259lib/erlang/lib/${PKGNAME}/include/pubsub.hrl 261lib/erlang/lib/${PKGNAME}/include/pubsub.hrl
260lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh 262lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
261lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg 263lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
262lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg 264lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
263lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg 265lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
264lib/erlang/lib/${PKGNAME}/priv/msgs/el.msg 266lib/erlang/lib/${PKGNAME}/priv/msgs/el.msg
265lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg 267lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg
266lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg 268lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg
267lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg 269lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg
268lib/erlang/lib/${PKGNAME}/priv/msgs/gl.msg 270lib/erlang/lib/${PKGNAME}/priv/msgs/gl.msg
269lib/erlang/lib/${PKGNAME}/priv/msgs/he.msg 271lib/erlang/lib/${PKGNAME}/priv/msgs/he.msg
270lib/erlang/lib/${PKGNAME}/priv/msgs/id.msg 272lib/erlang/lib/${PKGNAME}/priv/msgs/id.msg
271lib/erlang/lib/${PKGNAME}/priv/msgs/it.msg 273lib/erlang/lib/${PKGNAME}/priv/msgs/it.msg
@@ -284,13 +286,14 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/uk.m @@ -284,13 +286,14 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/uk.m
284lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg 286lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg
285lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg 287lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
286lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg 288lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
287lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql 289lib/erlang/lib/${PKGNAME}/priv/sql/lite.sql
288lib/erlang/lib/${PKGNAME}/priv/sql/mssql.sql 290lib/erlang/lib/${PKGNAME}/priv/sql/mssql.sql
289lib/erlang/lib/${PKGNAME}/priv/sql/mysql.sql 291lib/erlang/lib/${PKGNAME}/priv/sql/mysql.sql
290lib/erlang/lib/${PKGNAME}/priv/sql/pg.sql 292lib/erlang/lib/${PKGNAME}/priv/sql/pg.sql
291sbin/ejabberdctl 293sbin/ejabberdctl
292share/bash-completion.d/ejabberd 294share/bash-completion.d/ejabberd
293share/doc/ejabberd/COPYING 295share/doc/ejabberd/COPYING
294share/examples/ejabberd/ejabberd.yml 296share/examples/ejabberd/ejabberd.yml
295share/examples/ejabberd/ejabberdctl.cfg 297share/examples/ejabberd/ejabberdctl.cfg
296share/examples/ejabberd/inetrc 298share/examples/ejabberd/inetrc
 299@pkgdir bin
cvs diff -r1.45 -r1.46 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2016/10/02 12:17:40 1.45
+++ pkgsrc/chat/ejabberd/distinfo 2017/01/03 18:52:33 1.46
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1$NetBSD: distinfo,v 1.45 2016/10/02 12:17:40 fhajny Exp $ 1$NetBSD: distinfo,v 1.46 2017/01/03 18:52:33 fhajny Exp $
2 2
3SHA1 (ejabberd-16.09.tgz) = cc8d7b21dab64cb1a4dd35641b619016b3d98e3a 3SHA1 (ejabberd-16.12.tgz) = f2b407fa86d41ee7a4cfe2886529c77e413088e7
4RMD160 (ejabberd-16.09.tgz) = 6e9fa3ad81e94fc0d5145f636212b0ebb84511c9 4RMD160 (ejabberd-16.12.tgz) = 74bb9f86d60336d26c1605ab376eb2030988b559
5SHA512 (ejabberd-16.09.tgz) = 506365eff83f9ab97c9a632c4b8b2428aacbfc570c34ca65a78903d95c64755489ff7327be3efa2172c9d05d7891f83986b1ff3928a7ce806c0ab2aa5dbb647f 5SHA512 (ejabberd-16.12.tgz) = 1b08301497655479bb1cf442b0da889058c82af5c9fc074d8249cc5e9e4f74c68093d7e36491b4f9db9ff940721ad9f82faa3bf466b119f933197eb97edaf5a7
6Size (ejabberd-16.09.tgz) = 1687485 bytes 6Size (ejabberd-16.12.tgz) = 1646370 bytes
7SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88 7SHA1 (patch-aa) = a9197c75afa9ea4a2fbad70aec894f1b28c7bc88
8SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8 8SHA1 (patch-ad) = 6a7cfbabb22cf362cf21791656be454f10ac5de8
9SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49 9SHA1 (patch-ae) = c61e6662420745ff029418c26ac6211e04f27d49
10SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe 10SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
11SHA1 (patch-rebar.config) = b7cc78a8bb8a53dad511e47f0c87cb94144a0e4d 11SHA1 (patch-rebar.config) = 15170e7e5de66cc88d0e3975dc5fc5d9c8bae55d
12SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 12SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
cvs diff -r1.5 -r1.6 pkgsrc/chat/ejabberd/patches/Attic/patch-rebar.config (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/Attic/patch-rebar.config 2016/10/02 12:17:40 1.5
+++ pkgsrc/chat/ejabberd/patches/Attic/patch-rebar.config 2017/01/03 18:52:33 1.6
@@ -1,57 +1,64 @@ @@ -1,57 +1,64 @@
1$NetBSD: patch-rebar.config,v 1.5 2016/10/02 12:17:40 fhajny Exp $ 1$NetBSD: patch-rebar.config,v 1.6 2017/01/03 18:52:33 fhajny Exp $
2 2
3Deps are handled by pkgsrc. 3Deps are handled by pkgsrc.
4 4
5--- rebar.config.orig 2016-09-13 12:31:39.000000000 +0000 5--- rebar.config.orig 2016-12-22 19:41:01.000000000 +0000
6+++ rebar.config 6+++ rebar.config
7@@ -7,50 +7,6 @@ 7@@ -7,46 +7,6 @@
8 %%% Created : 1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net> 8 %%% Created : 1 May 2013 by Evgeniy Khramtsov <ekhramtsov@process-one.net>
9 %%%------------------------------------------------------------------- 9 %%%-------------------------------------------------------------------
10  10
11-{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}}, 11-{deps, [{lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.2.1"}}},
12- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.5"}}}, 12- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.6"}}},
13- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.4"}}}, 13- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.5"}}},
14- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.7"}}}, 14- {fast_tls, ".*", {git, "https://github.com/processone/fast_tls", {tag, "1.0.9"}}},
15- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.6"}}}, 15- {stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.7"}}},
16- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.15"}}}, 16- {fast_xml, ".*", {git, "https://github.com/processone/fast_xml", {tag, "1.1.18"}}},
17- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.7"}}}, 17- {xmpp, ".*", {git, "https://github.com/processone/xmpp", {tag, "1.1.4"}}},
18- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.8"}}}, 18- {stun, ".*", {git, "https://github.com/processone/stun", {tag, "1.0.9"}}},
19- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.6"}}}, 19- {esip, ".*", {git, "https://github.com/processone/esip", {tag, "1.0.10"}}},
20- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.7"}}}, 20- {fast_yaml, ".*", {git, "https://github.com/processone/fast_yaml", {tag, "1.0.7"}}},
 21- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.8"}}},
21- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}}, 22- {p1_oauth2, ".*", {git, "https://github.com/processone/p1_oauth2", {tag, "0.6.1"}}},
22- {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}}, 23- {luerl, ".*", {git, "https://github.com/rvirding/luerl", {tag, "v0.2"}}},
23- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql", 24- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/p1_mysql",
24- {tag, "1.0.1"}}}}, 25- {tag, "1.0.2"}}}},
25- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql", 26- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/p1_pgsql",
26- {tag, "1.1.0"}}}}, 27- {tag, "1.1.1"}}}},
27- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3", 28- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/processone/erlang-sqlite3",
28- {tag, "1.1.5"}}}}, 29- {tag, "1.1.5"}}}},
29- {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", 30- {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam",
30- {tag, "1.0.0"}}}}, 31- {tag, "1.0.0"}}}},
31- {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib", 32- {if_var_true, zlib, {ezlib, ".*", {git, "https://github.com/processone/ezlib",
32- {tag, "1.0.1"}}}}, 33- {tag, "1.0.1"}}}},
33- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", 34- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client",
34- "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, 35- {tag, "2.4.1"}}}},
35- %% Forces correct dependency for riakc and allow using newer meck version) 
36- {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", 
37- "13f9bfb9b27d216e8e033b0e0a9a29097ed923dd"}}}, % for riak_pb-2.1.0.7 
38- {if_var_true, riak, {protobuffs, ".*", {git, "https://github.com/basho/erlang_protobuffs", 
39- "6e7fc924506e2dc166a6170e580ce1d95ebbd5bd"}}}, % for riak_pb-2.1.0.7 with correct meck dependency 
40- %% Elixir support, needed to run tests 36- %% Elixir support, needed to run tests
41- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", 37- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir",
42- {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}}, 38- {tag, {if_version_above, "17", "v1.2.6", "v1.1.1"}}}}},
43- %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin 39- %% TODO: When modules are fully migrated to new structure and mix, we will not need anymore rebar_elixir_plugin
44- {if_var_true, elixir, {rebar_elixir_plugin, ".*", 40- {if_var_true, elixir, {rebar_elixir_plugin, ".*",
45- {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, 41- {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}},
46- {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv", 42- {if_var_true, iconv, {iconv, ".*", {git, "https://github.com/processone/iconv",
47- {tag, "1.0.2"}}}}, 43- {tag, "1.0.3"}}}},
48- {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck", 44- {if_var_true, tools, {meck, "0.8.*", {git, "https://github.com/eproxus/meck",
49- {tag, "0.8.4"}}}}, 45- {tag, "0.8.4"}}}},
50- {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git", 46- {if_var_true, tools, {moka, ".*", {git, "https://github.com/processone/moka.git",
51- {tag, "1.0.5c"}}}}, 47- {tag, "1.0.5c"}}}},
52- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", 48- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis",
53- {tag, "v1.0.8"}}}}]}. 49- {tag, "v1.0.8"}}}}]}.
54- 50-
55 {if_var_true, latest_deps, 51 {if_var_true, latest_deps,
56 {floating_deps, [cache_tab, 52 {floating_deps, [cache_tab,
57 fast_tls, 53 fast_tls,
 54@@ -68,8 +28,8 @@
 55
 56 {erl_opts, [nowarn_deprecated_function,
 57 {i, "include"},
 58- {i, "deps/fast_xml/include"},
 59- {i, "deps/xmpp/include"},
 60+ {i, "@LOCALBASE@/lib/erlang/lib/fast_xml/include"},
 61+ {i, "@LOCALBASE@/lib/erlang/lib/xmpp/include"},
 62 {if_var_false, debug, no_debug_info},
 63 {if_var_true, debug, debug_info},
 64 {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}},