Wed Mar 28 21:51:09 2018 UTC ()
chat/ejabberd: Update to 18.03.

Admin
- Avoid logging IP addresses in mod_register when it's not desired
- Command 'reload-config' allows to reload certificates
- Get rid of 'fs' package dependency
- Improve log message when module startup has failed
- mod_muc_admin: New command get_room_affiliation
- prosody2ejabberd: Report meaningful error when luerl is not
  available

Configure
- Accept atoms in api_permission command lists and commands with
  numbers in them
- Validate additional listen opts: inet, inet6, backlog
- Remove 'iqdisc' option
- New option 窶兎nable-group=xxx
- New option 'negotiation_timeout'
- New option 'new_sql_schema'
- New option 'validate_stream'
- ejabberd_service: New option 'global_routes' for
- mod_avatar: New 'rate_limit' option
- mod_block_strangers: New 'access' option
- mod_block_strangers: New 'captcha' option
- mod_pubsub: New option 'force_node_config'

Miscelanea
- Simplify ejabberd_sup code
- New gen_mod mod_options/1 callback to provide known options and
  defaults
- Replace ?MYLANG with connection's language wherever possible
- sql/*: Add username to peer indexes
- cyrsasl: Simplify code for splitting auth string in cyrsasl
- ejabberd_auth: Cache 'isuser' queries to external auth program
- ejabberd_web_admin: Hardcode required ACL rules
- mod_admin_extra: Command check_password_hash supports all hash
  methods
- mod_admin_extra: Fix srg_get_info command with @all@ and @online@
- mod_avatar: Fulfill all requirements of XEP-0398 v0.2.0
- mod_avatar: Improve validation of 'convert' option
- mod_block_strangers: Bounce groupchat to bare JID
- mod_block_strangers: Fix a typo in call to create_captcha()
- mod_caps: Only store CAPS if contact is subscribed
- mod_carboncopy: Copy outgoing MUC PMs
- mod_mam: Really run use_cache/1 and cache_nodes/1 callbacks
- mod_pubsub: Remove items of unregistered user
- mod_push_keepalive: Preserve timeout on resumption
- mod_shared_roster: Try to fix ejabberd_c2s:process_info: got
  unexpected info
- mod_shared_roster_ldap: Fix processing of ldap_memberattr_format_re
  option
- mod_stream_mgmt: Abort connection on count error
- mod_stream_mgmt: Clean up on timed out resumption


(fhajny)
diff -r1.82 -r1.83 pkgsrc/chat/ejabberd/Makefile
diff -r1.51 -r1.52 pkgsrc/chat/ejabberd/PLIST
diff -r1.55 -r1.56 pkgsrc/chat/ejabberd/distinfo
diff -r1.5 -r1.6 pkgsrc/chat/ejabberd/options.mk
diff -r1.14 -r1.15 pkgsrc/chat/ejabberd/patches/patch-aa
cvs diff -r1.82 -r1.83 pkgsrc/chat/ejabberd/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/Makefile 2018/01/16 12:28:56 1.82
+++ pkgsrc/chat/ejabberd/Makefile 2018/03/28 21:51:09 1.83
@@ -1,62 +1,64 @@ @@ -1,62 +1,64 @@
1# $NetBSD: Makefile,v 1.82 2018/01/16 12:28:56 fhajny Exp $ 1# $NetBSD: Makefile,v 1.83 2018/03/28 21:51:09 fhajny Exp $
2 2
3DISTNAME= ejabberd-18.01 3DISTNAME= ejabberd-18.03
4CATEGORIES= chat 4CATEGORIES= chat
5MASTER_SITES= https://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/ 5MASTER_SITES= https://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= https://www.ejabberd.im/ 9HOMEPAGE= https://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.12:../../devel/erlang-cache_tab 13DEPENDS+= erlang-cache_tab>=1.0.13:../../devel/erlang-cache_tab
14DEPENDS+= erlang-epam>=1.0.3:../../security/erlang-epam 14DEPENDS+= erlang-epam>=1.0.4:../../security/erlang-epam
15DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis 15DEPENDS+= erlang-eredis>=1.0.8.20150910:../../databases/erlang-eredis
16DEPENDS+= erlang-eimp>=1.0.2:../../graphics/erlang-eimp 16DEPENDS+= erlang-eimp>=1.0.3:../../graphics/erlang-eimp
17DEPENDS+= erlang-esip>=1.0.21:../../net/erlang-esip 17DEPENDS+= erlang-esip>=1.0.22:../../net/erlang-esip
18DEPENDS+= erlang-ezlib>=1.0.3:../../devel/erlang-ezlib 18DEPENDS+= erlang-ezlib>=1.0.4:../../devel/erlang-ezlib
19DEPENDS+= erlang-fast_tls>=1.0.20:../../security/erlang-fast_tls 19DEPENDS+= erlang-fast_tls>=1.0.21:../../security/erlang-fast_tls
20DEPENDS+= erlang-fast_xml>=1.1.28:../../textproc/erlang-fast_xml 20DEPENDS+= erlang-fast_xml>=1.1.29:../../textproc/erlang-fast_xml
21DEPENDS+= erlang-fast_yaml>=1.0.12:../../textproc/erlang-fast_yaml 21DEPENDS+= erlang-fast_yaml>=1.0.13:../../textproc/erlang-fast_yaml
22DEPENDS+= erlang-fs>=2.12.0:../../devel/erlang-fs 22DEPENDS+= erlang-iconv>=1.0.7:../../converters/erlang-iconv
23DEPENDS+= erlang-iconv>=1.0.6:../../converters/erlang-iconv 
24DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy 23DEPENDS+= erlang-jiffy>=0.14.8:../../textproc/erlang-jiffy
25DEPENDS+= erlang-jose>=1.8.4:../../security/erlang-jose 24DEPENDS+= erlang-jose>=1.8.4:../../security/erlang-jose
26DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager 25DEPENDS+= erlang-lager>=3.4.2.:../../sysutils/erlang-lager
27DEPENDS+= erlang-luerl>=0.2:../../lang/erlang-luerl 26DEPENDS+= erlang-luerl>=0.3:../../lang/erlang-luerl
28DEPENDS+= erlang-p1_mysql>=1.0.4:../../databases/erlang-p1_mysql 27DEPENDS+= erlang-p1_mysql>=1.0.5:../../databases/erlang-p1_mysql
29DEPENDS+= erlang-p1_oauth2>=0.6.2:../../security/erlang-p1_oauth2 28DEPENDS+= erlang-p1_oauth2>=0.6.2:../../security/erlang-p1_oauth2
30DEPENDS+= erlang-p1_pgsql>=1.1.4:../../databases/erlang-p1_pgsql 29DEPENDS+= erlang-p1_pgsql>=1.1.5:../../databases/erlang-p1_pgsql
31DEPENDS+= erlang-p1_utils>=1.0.10:../../misc/erlang-p1_utils 30DEPENDS+= erlang-p1_utils>=1.0.11:../../misc/erlang-p1_utils
32DEPENDS+= erlang-stringprep>=1.0.10:../../textproc/erlang-stringprep 31DEPENDS+= erlang-stringprep>=1.0.11:../../textproc/erlang-stringprep
33DEPENDS+= erlang-stun>=1.0.20:../../net/erlang-stun 32DEPENDS+= erlang-stun>=1.0.21:../../net/erlang-stun
34DEPENDS+= erlang-xmpp>=1.1.19:../../net/erlang-xmpp 33DEPENDS+= erlang-xmpp>=1.1.20:../../net/erlang-xmpp
35 34
36GNU_CONFIGURE= yes 35GNU_CONFIGURE= yes
37USE_GCC_RUNTIME= yes 36USE_GCC_RUNTIME= yes
38USE_TOOLS+= bash:run gmake patch 37USE_TOOLS+= bash:run gmake patch
39 38
40CONFIGURE_ARGS+= --disable-debug 39CONFIGURE_ARGS+= --disable-debug
41CONFIGURE_ARGS+= --enable-system-deps 40CONFIGURE_ARGS+= --enable-system-deps
42CONFIGURE_ARGS+= --enable-graphics 
43CONFIGURE_ARGS+= --enable-iconv 41CONFIGURE_ARGS+= --enable-iconv
44CONFIGURE_ARGS+= --enable-mysql 42CONFIGURE_ARGS+= --enable-mysql
45CONFIGURE_ARGS+= --enable-odbc 43CONFIGURE_ARGS+= --enable-odbc
46CONFIGURE_ARGS+= --enable-pam 44CONFIGURE_ARGS+= --enable-pam
47CONFIGURE_ARGS+= --enable-pgsql 45CONFIGURE_ARGS+= --enable-pgsql
 46CONFIGURE_ARGS+= --enable-redis
 47CONFIGURE_ARGS+= --enable-sip
 48CONFIGURE_ARGS+= --enable-stun
48CONFIGURE_ARGS+= --enable-zlib 49CONFIGURE_ARGS+= --enable-zlib
49CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER} 50CONFIGURE_ARGS+= --enable-user=${EJABBERD_USER}
 51CONFIGURE_ARGS+= --enable-group=${EJABBERD_GROUP}
50CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 52CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
51 53
52MAKE_ENV+= USE_GLOBAL_DEPS=true 54MAKE_ENV+= USE_GLOBAL_DEPS=true
53 55
54RCD_SCRIPTS= ejabberd 56RCD_SCRIPTS= ejabberd
55 57
56BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR 58BUILD_DEFS+= EJABBERD_USER EJABBERD_GROUP EJABBERD_LOGDIR
57BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR 59BUILD_DEFS+= EJABBERD_PIDDIR EJABBERD_DB EJABBERD_TRANSDIR
58BUILD_DEFS+= VARBASE 60BUILD_DEFS+= VARBASE
59PKG_SYSCONFSUBDIR= ejabberd 61PKG_SYSCONFSUBDIR= ejabberd
60 62
61.include "../../mk/bsd.prefs.mk" 63.include "../../mk/bsd.prefs.mk"
62.include "options.mk" 64.include "options.mk"
cvs diff -r1.51 -r1.52 pkgsrc/chat/ejabberd/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/PLIST 2018/01/03 22:51:30 1.51
+++ pkgsrc/chat/ejabberd/PLIST 2018/03/28 21:51:09 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.51 2018/01/03 22:51:30 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.52 2018/03/28 21:51:09 fhajny Exp $
2lib/${PKGNAME}/COPYING 2lib/${PKGNAME}/COPYING
3lib/${PKGNAME}/ebin/ELDAPv3.beam 3lib/${PKGNAME}/ebin/ELDAPv3.beam
4lib/${PKGNAME}/ebin/XmppAddr.beam 4lib/${PKGNAME}/ebin/XmppAddr.beam
5lib/${PKGNAME}/ebin/acl.beam 5lib/${PKGNAME}/ebin/acl.beam
6lib/${PKGNAME}/ebin/acme_challenge.beam 6lib/${PKGNAME}/ebin/acme_challenge.beam
7lib/${PKGNAME}/ebin/cyrsasl.beam 7lib/${PKGNAME}/ebin/cyrsasl.beam
8lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam 8lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
9lib/${PKGNAME}/ebin/cyrsasl_digest.beam 9lib/${PKGNAME}/ebin/cyrsasl_digest.beam
10lib/${PKGNAME}/ebin/cyrsasl_oauth.beam 10lib/${PKGNAME}/ebin/cyrsasl_oauth.beam
11lib/${PKGNAME}/ebin/cyrsasl_plain.beam 11lib/${PKGNAME}/ebin/cyrsasl_plain.beam
12lib/${PKGNAME}/ebin/cyrsasl_scram.beam 12lib/${PKGNAME}/ebin/cyrsasl_scram.beam
13lib/${PKGNAME}/ebin/ejabberd.app 13lib/${PKGNAME}/ebin/ejabberd.app
14lib/${PKGNAME}/ebin/ejabberd.beam 14lib/${PKGNAME}/ebin/ejabberd.beam
@@ -26,41 +26,39 @@ lib/${PKGNAME}/ebin/ejabberd_auth_pam.be @@ -26,41 +26,39 @@ lib/${PKGNAME}/ebin/ejabberd_auth_pam.be
26lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam 26lib/${PKGNAME}/ebin/ejabberd_auth_riak.beam
27lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam 27lib/${PKGNAME}/ebin/ejabberd_auth_sql.beam
28lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam 28lib/${PKGNAME}/ebin/ejabberd_backend_sup.beam
29lib/${PKGNAME}/ebin/ejabberd_bosh.beam 29lib/${PKGNAME}/ebin/ejabberd_bosh.beam
30lib/${PKGNAME}/ebin/ejabberd_c2s.beam 30lib/${PKGNAME}/ebin/ejabberd_c2s.beam
31lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam 31lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
32lib/${PKGNAME}/ebin/ejabberd_captcha.beam 32lib/${PKGNAME}/ebin/ejabberd_captcha.beam
33lib/${PKGNAME}/ebin/ejabberd_cluster.beam 33lib/${PKGNAME}/ebin/ejabberd_cluster.beam
34lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam 34lib/${PKGNAME}/ebin/ejabberd_cluster_mnesia.beam
35lib/${PKGNAME}/ebin/ejabberd_commands.beam 35lib/${PKGNAME}/ebin/ejabberd_commands.beam
36lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam 36lib/${PKGNAME}/ebin/ejabberd_commands_doc.beam
37lib/${PKGNAME}/ebin/ejabberd_config.beam 37lib/${PKGNAME}/ebin/ejabberd_config.beam
38lib/${PKGNAME}/ebin/ejabberd_ctl.beam 38lib/${PKGNAME}/ebin/ejabberd_ctl.beam
39lib/${PKGNAME}/ebin/ejabberd_db_modules.beam 
40lib/${PKGNAME}/ebin/ejabberd_hooks.beam 39lib/${PKGNAME}/ebin/ejabberd_hooks.beam
41lib/${PKGNAME}/ebin/ejabberd_http.beam 40lib/${PKGNAME}/ebin/ejabberd_http.beam
42lib/${PKGNAME}/ebin/ejabberd_http_ws.beam 41lib/${PKGNAME}/ebin/ejabberd_http_ws.beam
43lib/${PKGNAME}/ebin/ejabberd_idna.beam 42lib/${PKGNAME}/ebin/ejabberd_idna.beam
44lib/${PKGNAME}/ebin/ejabberd_iq.beam 43lib/${PKGNAME}/ebin/ejabberd_iq.beam
45lib/${PKGNAME}/ebin/ejabberd_listener.beam 44lib/${PKGNAME}/ebin/ejabberd_listener.beam
46lib/${PKGNAME}/ebin/ejabberd_local.beam 45lib/${PKGNAME}/ebin/ejabberd_local.beam
47lib/${PKGNAME}/ebin/ejabberd_logger.beam 46lib/${PKGNAME}/ebin/ejabberd_logger.beam
48lib/${PKGNAME}/ebin/ejabberd_mnesia.beam 47lib/${PKGNAME}/ebin/ejabberd_mnesia.beam
49lib/${PKGNAME}/ebin/ejabberd_oauth.beam 48lib/${PKGNAME}/ebin/ejabberd_oauth.beam
50lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam 49lib/${PKGNAME}/ebin/ejabberd_oauth_mnesia.beam
51lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam 50lib/${PKGNAME}/ebin/ejabberd_oauth_rest.beam
52lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam 51lib/${PKGNAME}/ebin/ejabberd_oauth_sql.beam
53lib/${PKGNAME}/ebin/ejabberd_options.beam 
54lib/${PKGNAME}/ebin/ejabberd_piefxis.beam 52lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
55lib/${PKGNAME}/ebin/ejabberd_pkix.beam 53lib/${PKGNAME}/ebin/ejabberd_pkix.beam
56lib/${PKGNAME}/ebin/ejabberd_rdbms.beam 54lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
57lib/${PKGNAME}/ebin/ejabberd_redis.beam 55lib/${PKGNAME}/ebin/ejabberd_redis.beam
58lib/${PKGNAME}/ebin/ejabberd_redis_sup.beam 56lib/${PKGNAME}/ebin/ejabberd_redis_sup.beam
59lib/${PKGNAME}/ebin/ejabberd_regexp.beam 57lib/${PKGNAME}/ebin/ejabberd_regexp.beam
60lib/${PKGNAME}/ebin/ejabberd_riak.beam 58lib/${PKGNAME}/ebin/ejabberd_riak.beam
61lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam 59lib/${PKGNAME}/ebin/ejabberd_riak_sup.beam
62lib/${PKGNAME}/ebin/ejabberd_router.beam 60lib/${PKGNAME}/ebin/ejabberd_router.beam
63lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam 61lib/${PKGNAME}/ebin/ejabberd_router_mnesia.beam
64lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam 62lib/${PKGNAME}/ebin/ejabberd_router_multicast.beam
65lib/${PKGNAME}/ebin/ejabberd_router_redis.beam 63lib/${PKGNAME}/ebin/ejabberd_router_redis.beam
66lib/${PKGNAME}/ebin/ejabberd_router_riak.beam 64lib/${PKGNAME}/ebin/ejabberd_router_riak.beam
@@ -325,27 +323,27 @@ lib/${PKGNAME}/priv/msgs/nl.msg @@ -325,27 +323,27 @@ lib/${PKGNAME}/priv/msgs/nl.msg
325lib/${PKGNAME}/priv/msgs/no.msg 323lib/${PKGNAME}/priv/msgs/no.msg
326lib/${PKGNAME}/priv/msgs/pl.msg 324lib/${PKGNAME}/priv/msgs/pl.msg
327lib/${PKGNAME}/priv/msgs/pt-br.msg 325lib/${PKGNAME}/priv/msgs/pt-br.msg
328lib/${PKGNAME}/priv/msgs/pt.msg 326lib/${PKGNAME}/priv/msgs/pt.msg
329lib/${PKGNAME}/priv/msgs/ru.msg 327lib/${PKGNAME}/priv/msgs/ru.msg
330lib/${PKGNAME}/priv/msgs/sk.msg 328lib/${PKGNAME}/priv/msgs/sk.msg
331lib/${PKGNAME}/priv/msgs/sv.msg 329lib/${PKGNAME}/priv/msgs/sv.msg
332lib/${PKGNAME}/priv/msgs/th.msg 330lib/${PKGNAME}/priv/msgs/th.msg
333lib/${PKGNAME}/priv/msgs/tr.msg 331lib/${PKGNAME}/priv/msgs/tr.msg
334lib/${PKGNAME}/priv/msgs/uk.msg 332lib/${PKGNAME}/priv/msgs/uk.msg
335lib/${PKGNAME}/priv/msgs/vi.msg 333lib/${PKGNAME}/priv/msgs/vi.msg
336lib/${PKGNAME}/priv/msgs/wa.msg 334lib/${PKGNAME}/priv/msgs/wa.msg
337lib/${PKGNAME}/priv/msgs/zh.msg 335lib/${PKGNAME}/priv/msgs/zh.msg
338lib/${PKGNAME}/priv/sql/lite.sql 
339lib/${PKGNAME}/priv/sql/lite.new.sql 336lib/${PKGNAME}/priv/sql/lite.new.sql
 337lib/${PKGNAME}/priv/sql/lite.sql
340lib/${PKGNAME}/priv/sql/mssql.sql 338lib/${PKGNAME}/priv/sql/mssql.sql
341lib/${PKGNAME}/priv/sql/mysql.new.sql 339lib/${PKGNAME}/priv/sql/mysql.new.sql
342lib/${PKGNAME}/priv/sql/mysql.sql 340lib/${PKGNAME}/priv/sql/mysql.sql
343lib/${PKGNAME}/priv/sql/pg.new.sql 341lib/${PKGNAME}/priv/sql/pg.new.sql
344lib/${PKGNAME}/priv/sql/pg.sql 342lib/${PKGNAME}/priv/sql/pg.sql
345sbin/ejabberdctl 343sbin/ejabberdctl
346share/bash-completion.d/ejabberd 344share/bash-completion.d/ejabberd
347share/doc/ejabberd/COPYING 345share/doc/ejabberd/COPYING
348share/examples/ejabberd/ejabberd.yml 346share/examples/ejabberd/ejabberd.yml
349share/examples/ejabberd/ejabberdctl.cfg 347share/examples/ejabberd/ejabberdctl.cfg
350share/examples/ejabberd/inetrc 348share/examples/ejabberd/inetrc
351@pkgdir bin 349@pkgdir bin
cvs diff -r1.55 -r1.56 pkgsrc/chat/ejabberd/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/distinfo 2018/01/16 12:28:56 1.55
+++ pkgsrc/chat/ejabberd/distinfo 2018/03/28 21:51:09 1.56
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.55 2018/01/16 12:28:56 fhajny Exp $ 1$NetBSD: distinfo,v 1.56 2018/03/28 21:51:09 fhajny Exp $
2 2
3SHA1 (ejabberd-18.01.tgz) = a95d243845cd44d487bb5131a3cf94e334da68e5 3SHA1 (ejabberd-18.03.tgz) = 27557bab45027823147972a254ba3521a94572d0
4RMD160 (ejabberd-18.01.tgz) = c4df350ba3fd41c4103039cd1a363b0943625d52 4RMD160 (ejabberd-18.03.tgz) = b72d4dc86c03fcd2a708e18a6d7e5b821c1f95b7
5SHA512 (ejabberd-18.01.tgz) = 7b54410be6b5b20147d94209758ae2b9e265229cd0770c86b479255598b2ba85578e309f009b076dda37b0cfef9517d5554ca7070ef670ae12fefc51fc1deb6e 5SHA512 (ejabberd-18.03.tgz) = 49a25e4a0ba27975eb4e998be3323bc8de8814808e41fbba46baf37035219c1ee6c907c0f22dd5b926af426287252b56e87c3ff9d93a8815816323c2fc5d16b4
6Size (ejabberd-18.01.tgz) = 1863311 bytes 6Size (ejabberd-18.03.tgz) = 1864193 bytes
7SHA1 (patch-aa) = 1210ab42871db158fff7311d5552ca916cf30a39 7SHA1 (patch-aa) = b36ab8e2a189e07dc09186fdea0599d99294e0e5
8SHA1 (patch-ad) = de437722779c823a68f576ec587f5bc3a05e6fbc 8SHA1 (patch-ad) = de437722779c823a68f576ec587f5bc3a05e6fbc
9SHA1 (patch-ae) = d8d1ca7072f35a5652673cf461860e0f585ecd5b 9SHA1 (patch-ae) = d8d1ca7072f35a5652673cf461860e0f585ecd5b
10SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe 10SHA1 (patch-configure) = 8cf03f571ef13ed825b445e0f1664d387895b8fe
11SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569 11SHA1 (patch-tools_ejabberdctl.bc) = 3c7bc0ad14d5b266a192b29e4d075e8f93103569
cvs diff -r1.5 -r1.6 pkgsrc/chat/ejabberd/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/options.mk 2017/04/13 19:04:53 1.5
+++ pkgsrc/chat/ejabberd/options.mk 2018/03/28 21:51:09 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.5 2017/04/13 19:04:53 fhajny Exp $ 1# $NetBSD: options.mk,v 1.6 2018/03/28 21:51:09 fhajny Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.ejabberd 3PKG_OPTIONS_VAR= PKG_OPTIONS.ejabberd
4PKG_SUPPORTED_OPTIONS= sqlite 4PKG_SUPPORTED_OPTIONS= sqlite
5PKG_SUGGESTED_OPTIONS= # 5PKG_SUGGESTED_OPTIONS= #
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9# 9#
10# Add SQLite 3 support 10# Add SQLite 3 support
11# 11#
12.if !empty(PKG_OPTIONS:Msqlite) 12.if !empty(PKG_OPTIONS:Msqlite)
13DEPENDS+= erlang-sqlite3>=1.1.5:../../databases/erlang-sqlite3 13DEPENDS+= erlang-sqlite3>=1.1.6:../../databases/erlang-sqlite3
14.endif 14.endif
cvs diff -r1.14 -r1.15 pkgsrc/chat/ejabberd/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/chat/ejabberd/patches/patch-aa 2018/01/03 22:51:30 1.14
+++ pkgsrc/chat/ejabberd/patches/patch-aa 2018/03/28 21:51:09 1.15
@@ -1,59 +1,65 @@ @@ -1,59 +1,65 @@
1$NetBSD: patch-aa,v 1.14 2018/01/03 22:51:30 fhajny Exp $ 1$NetBSD: patch-aa,v 1.15 2018/03/28 21:51:09 fhajny Exp $
2 2
3Fix locations; don't mess with ownership. 3Fix locations; don't mess with ownership.
4 4
5--- Makefile.in.orig 2017-12-28 18:37:19.000000000 +0000 5--- Makefile.in.orig 2018-03-23 13:48:17.000000000 +0000
6+++ Makefile.in 6+++ Makefile.in
7@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@ 7@@ -9,7 +9,7 @@ exec_prefix = @exec_prefix@
8 DESTDIR = 8 DESTDIR =
9  9
10 # /etc/ejabberd/ 10 # /etc/ejabberd/
11-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd 11-ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
12+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd 12+ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
13  13
14 # /bin/ 14 # /bin/
15 BINDIR = $(DESTDIR)@bindir@ 15 BINDIR = $(DESTDIR)@bindir@
16@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@ 16@@ -21,7 +21,7 @@ SBINDIR = $(DESTDIR)@sbindir@
17 LIBDIR = $(DESTDIR)@libdir@ 17 LIBDIR = $(DESTDIR)@libdir@
18  18
19 # /lib/ejabberd/ 19 # /lib/ejabberd/
20-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd 20-EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
21+EJABBERDDIR = $(LIBDIR)/ejabberd 21+EJABBERDDIR = $(LIBDIR)/ejabberd
22  22
23 # /share/doc/ejabberd 23 # /share/doc/ejabberd
24 PACKAGE_TARNAME = @PACKAGE_TARNAME@ 24 PACKAGE_TARNAME = @PACKAGE_TARNAME@
25@@ -59,16 +59,16 @@ JSDIR = $(PRIVDIR)/js 25@@ -59,37 +59,24 @@ JSDIR = $(PRIVDIR)/js
26 SQLDIR = $(PRIVDIR)/sql 26 SQLDIR = $(PRIVDIR)/sql
27  27
28 # /var/lib/ejabberd/ 28 # /var/lib/ejabberd/
29-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd 29-SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
30+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@ 30+SPOOLDIR = $(DESTDIR)@EJABBERD_DB@
31  31
32 # /var/lock/ejabberdctl 32 # /var/lock/ejabberdctl
33-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl 33-CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
34+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@ 34+CTLLOCKDIR = $(DESTDIR)@EJABBERD_PIDDIR@
35  35
36 # /var/lib/ejabberd/.erlang.cookie 36 # /var/lib/ejabberd/.erlang.cookie
37 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie 37 COOKIEFILE = $(SPOOLDIR)/.erlang.cookie
38  38
39 # /var/log/ejabberd/ 39 # /var/log/ejabberd/
40-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd 40-LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
41+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@ 41+LOGDIR = $(DESTDIR)@EJABBERD_LOGDIR@
42  42
43 INSTALLUSER=@INSTALLUSER@ 43 INSTALLUSER=@INSTALLUSER@
44 # if no user was enabled, don't set privileges or ownership 44-# if no user was enabled, don't set privileges or ownership
45@@ -79,10 +79,10 @@ ifeq ($(INSTALLUSER),) 45-ifeq ($(INSTALLUSER),)
 46 O_USER=
 47 G_USER=
 48 CHOWN_COMMAND=echo
46 CHOWN_OUTPUT=/dev/null 49 CHOWN_OUTPUT=/dev/null
47 INIT_USER=root 50 INIT_USER=root
48 else 51-else
49- O_USER=-o $(INSTALLUSER) 52- O_USER=-o $(INSTALLUSER)
50- G_USER=-g $(INSTALLUSER) 53- G_USER=-g $(INSTALLUSER)
51- CHOWN_COMMAND=chown 54- CHOWN_COMMAND=chown
52- CHOWN_OUTPUT=&1 55- CHOWN_OUTPUT=&1
53+ O_USER= 56- INIT_USER=$(INSTALLUSER)
54+ G_USER= 57-endif
55+ CHOWN_COMMAND=echo 58-# if no group was enabled, don't set privileges or ownership
56+ CHOWN_OUTPUT=/dev/null 59 INSTALLGROUP=@INSTALLGROUP@
57 INIT_USER=$(INSTALLUSER) 60-ifneq ($(INSTALLGROUP),)
58 endif 61- G_USER=-g $(INSTALLGROUP)
 62-endif
 63
 64 all: deps src
59  65