Updated chat/ejabberd to 2.1.7.

Small list of changes:

2.1.7
* BOSH: Keep the order of stanzas when BOSH sends several
* CAPTCHA in MUC: New whitelist option
* CAPTCHA: New captcha_limit option
* Core: Disable all entity expansions
* Core: Do not accept XML with undefined prefixes
* ejabberdctl: New DIST_USE_INTERFACE restricts IP erlang listen
* ejabberdctl: New ERL_EPMD_ADDRESS that works since Erlang/OTP R14B03
* extauth: If script crashes, ejabberd should restart it
* If a module start fails during server start, stop erlang
* mod_blocking: New XEP-0191 Simple Communications Blocking
* mod_pres_counter: Prevent subscription flood
* mod_register: Access now also controls account unregistrations
* mod_shared_roster: Fix support for anonymous accounts in @all@
* mod_shared_roster: New @online@ directive
* New Indonesian translation
* Pubsub: Apply filtered notification to PEP last items
* Pubsub: Owner can delete any items from its own node

2.1.6
* BOSH: Fix rare loop, support vhosts, allow module restart
* Config: Default configuration allows registrations only from localhost
* Config: Support to change loglevel per module at runtime
* Erlang/OTP: Fix compatibility from R10B-9 to R14B01
* ODBC: Compatibility with PostgreSQL 9.0
* Privacy lists: Fix to allow block by group and subscription again
* Pubsub: Fix cross domain eventing
* Register: Added CAPTCHA, password strength and ip_access to mod_register
* Register: New mod_register_web, with CAPTCHA support
* S2S: New options to require encryption, and verify certificates
* Shared Rosters: Added mod_shared_roster_ldap
* Bind listener ports early and start accepting connections later

5 files changed, 37 insertions, 23 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 6ca271c3ec7..4b1b565a5b9 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2010/09/03 10:31:43 fhajny Exp $
+# $NetBSD: Makefile,v 1.22 2011/06/06 13:45:37 fhajny Exp $
 
-DISTNAME=	ejabberd-2.1.5
+DISTNAME=	ejabberd-2.1.7
 CATEGORIES=	chat
-MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/2.1.5/
+MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION}/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ejabberd.im/
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 82cc7bd401d..702a1da5c1e 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,8 +1,10 @@
-@comment $NetBSD: PLIST,v 1.13 2010/09/03 10:31:43 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/06/06 13:45:37 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
 lib/erlang/lib/${PKGNAME}/ebin/adhoc.beam
+lib/erlang/lib/${PKGNAME}/ebin/cache_tab.beam
+lib/erlang/lib/${PKGNAME}/ebin/cache_tab_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
@@ -73,6 +75,7 @@ lib/erlang/lib/${PKGNAME}/ebin/jd2ejd.beam
 lib/erlang/lib/${PKGNAME}/ebin/jlib.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_adhoc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_announce.beam
+lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_caps.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_configure.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_configure2.beam
@@ -91,6 +94,7 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_muc_room.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_offline.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_offline_odbc.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_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam
@@ -103,10 +107,12 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_stream.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_pubsub_odbc.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_odbc.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_sic.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_stats.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_time.beam
@@ -135,6 +141,7 @@ lib/erlang/lib/${PKGNAME}/ebin/nodetree_virtual.beam
 lib/erlang/lib/${PKGNAME}/ebin/odbc_queries.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_fsm.beam
 lib/erlang/lib/${PKGNAME}/ebin/p1_mnesia.beam
+lib/erlang/lib/${PKGNAME}/ebin/pg2_backport.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_db_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
@@ -183,6 +190,7 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/gl.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/id.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/it.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/ja.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/nl.msg
@@ -208,6 +216,10 @@ share/doc/ejabberd/features.pdf
 share/doc/ejabberd/guide.html
 share/doc/ejabberd/guide.pdf
 share/doc/ejabberd/logo.png
+share/doc/ejabberd/msrl-dit-deep.png
+share/doc/ejabberd/msrl-dit-flat.png
+share/doc/ejabberd/msrl-roster-deep.png
+share/doc/ejabberd/msrl-roster-flat.png
 share/doc/ejabberd/release_notes_0.9.1.txt
 share/doc/ejabberd/release_notes_0.9.8.txt
 share/doc/ejabberd/release_notes_0.9.txt
@@ -229,6 +241,8 @@ share/doc/ejabberd/release_notes_2.1.2.txt
 share/doc/ejabberd/release_notes_2.1.3.txt
 share/doc/ejabberd/release_notes_2.1.4.txt
 share/doc/ejabberd/release_notes_2.1.5.txt
+share/doc/ejabberd/release_notes_2.1.6.txt
+share/doc/ejabberd/release_notes_2.1.7.txt
 share/doc/ejabberd/webadmmain.png
 share/doc/ejabberd/webadmmainru.png
 share/doc/ejabberd/yozhikheader.png
diff --git a/chat/ejabberd/distinfo b/chat/ejabberd/distinfo
index 374880183e7..4caef5b56a1 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2010/09/03 10:31:43 fhajny Exp $
+$NetBSD: distinfo,v 1.15 2011/06/06 13:45:38 fhajny Exp $
 
-SHA1 (ejabberd-2.1.5.tar.gz) = 8966d6752219c9386f48a5b8e1f2f8fb0e7477ae
-RMD160 (ejabberd-2.1.5.tar.gz) = 7abd6bc4a03f68d03e13ee8c1ff3a5fee6098dc6
-Size (ejabberd-2.1.5.tar.gz) = 2278008 bytes
-SHA1 (patch-aa) = 86b2457a695c70bfdc68d7bea99b7d6d238c8cc5
-SHA1 (patch-ad) = 9108a39e78c57b78202eabc9ee7036baf1a3b144
+SHA1 (ejabberd-2.1.7.tar.gz) = e41b42adadc8c9f94cfa2e2365b47f34d6343664
+RMD160 (ejabberd-2.1.7.tar.gz) = 4294cb0edee4328cc1e17e30d01f58016e0e8b7a
+Size (ejabberd-2.1.7.tar.gz) = 2904762 bytes
+SHA1 (patch-aa) = 81bffd072f179713989cde0c1efc3cce8cf10944
+SHA1 (patch-ad) = ea92f93624b5d6d8fa3760d426a967a499721fe7
 SHA1 (patch-ae) = e518cb5eb67ae8feef7617ad52799af3b8e81179
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index 672f61f2fdc..e98c7cf9154 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
+$NetBSD: patch-aa,v 1.9 2011/06/06 13:45:38 fhajny Exp $
 
---- src/Makefile.in.orig	2010-08-02 16:33:20.000000000 +0000
+--- src/Makefile.in.orig	2011-06-06 13:25:51.841507950 +0000
 +++ src/Makefile.in
-@@ -65,7 +65,7 @@ endif
+@@ -71,7 +71,7 @@ endif
  
  INSTALL_EPAM=
  ifeq (@pam@, pam)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
  endif
  
  prefix = @prefix@
-@@ -83,13 +83,13 @@ BEAMS = $(SOURCES:.erl=.beam)
+@@ -89,13 +89,13 @@ BEAMS = $(SOURCES:.erl=.beam)
  DESTDIR =
  
  # /etc/ejabberd/
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -115,16 +115,16 @@ SODIR = $(PRIVDIR)/lib
+@@ -121,16 +121,16 @@ SODIR = $(PRIVDIR)/lib
  MSGSDIR = $(PRIVDIR)/msgs
  
  # /var/lib/ejabberd/
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
  
  # Assume Linux-style dynamic library flags
  DYNAMIC_LIB_CFLAGS = -fpic -shared
-@@ -177,10 +177,10 @@ translations:
+@@ -183,10 +183,10 @@ translations:
  install: all
  	#
  	# Configuration files
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
  	sed -e "s*@rootdir@*@prefix@*" \
  		-e "s*@installuser@*@INSTALLUSER@*" \
  		-e "s*@LIBDIR@*@libdir@*" \
-@@ -190,13 +190,13 @@ install: all
+@@ -196,13 +196,13 @@ install: all
  		-e "s*@erl@*@ERL@*" ejabberdctl.template \
  		> ejabberdctl.example
  	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
@@ -80,8 +80,8 @@ $NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
  	#
  	# Init script
  	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-@@ -204,64 +204,58 @@ install: all
- 		> ejabberd.init
+@@ -211,64 +211,58 @@ install: all
+ 	chmod 755 ejabberd.init
  	#
  	# Binary Erlang files
 -	install -d $(BEAMDIR)
diff --git a/chat/ejabberd/patches/patch-ad b/chat/ejabberd/patches/patch-ad
index 4720b1c4f52..7eda4c80c9b 100644
--- a/chat/ejabberd/patches/patch-ad
+++ b/chat/ejabberd/patches/patch-ad
@@ -1,6 +1,6 @@
-$NetBSD: patch-ad,v 1.5 2010/03/13 21:05:49 fhajny Exp $
+$NetBSD: patch-ad,v 1.6 2011/06/06 13:45:38 fhajny Exp $
 
---- src/ejabberd.cfg.example.orig	2010-03-12 10:40:41.000000000 +0000
+--- src/ejabberd.cfg.example.orig	2011-06-01 09:03:36.000000000 +0000
 +++ src/ejabberd.cfg.example
 @@ -109,7 +109,6 @@
   [
@@ -42,7 +42,7 @@ $NetBSD: patch-ad,v 1.5 2010/03/13 21:05:49 fhajny Exp $
    %%			    {hosts, ["icq.example.org", "sms.example.org"],
    %%			     [{password, "secret"}]
    %%			    }
-@@ -471,7 +470,7 @@
+@@ -472,7 +471,7 @@
  %%
  %% Full path to a script that generates the image.
  %%
@@ -50,4 +50,4 @@ $NetBSD: patch-ad,v 1.5 2010/03/13 21:05:49 fhajny Exp $
 +%%{captcha_cmd, "@PREFIX@/lib/erlang/lib/@DISTNAME@/priv/bin/captcha.sh"}.
  
  %%
- %% Host part of the URL sent to the user.
+ %% Host for the URL and port where ejabberd listens for CAPTCHA requests.