Update ejabberd to 2.1.9.

Changes:

* Core ejabberd
- Decrease CPU usage caused by tls:send with large data
- Escape iolist correctly when NIFs are disabled (EJAB-1462)
- Fix code to satisfy Dialyzer warnings
- Fix compilation in Windows
- Replace calls of OTP’s Binary, since they would require R14

* LDAP
- Document ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
- Log an error when an LDAP filter is incorrect (EJAB-1395)
- New options: ldap_tls_cacertfile and ldap_tls_depth (EJAB-1299)
- New option: ldap_deref_aliases (EJAB-639)
- Match ldap_uidattr_format case-insensitively (EJAB-1449)

* MUC
- Support for multiple entry with same nick to MUC rooms (EJAB-305)
- Support voice request and approvement
- New room option: allow_private_messages_from_visitors
- New room options: allow_voice_requests and voice_request_min_interval
- Include status 110 in presence to new occupant (EJAB-740)
- Fix mod_muc_log crash when first log entry is room destroy (EJAB-1499)
- Many fixes and improvements in mod_muc

* Pubsub
- Enable pubsub#deliver_notification checking (EJAB-1453)
- Fix Denial of Service when user sends malformed publish stanza (EJAB-1498)

* ODBC
- Fix ODBC account counting (EJAB-1491)
- Optimized mod_roster_odbc:get_roster

* Miscellanea:
- New SASL SCRAM-SHA-1 authentication mechanism (EJAB-1196)
- New option: resource_conflict (EJAB-650)

3 files changed, 11 insertions, 11 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index e40c1f954f1..9aae346bf3d 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2011/06/11 20:27:12 mspo Exp $
+# $NetBSD: Makefile,v 1.24 2011/12/21 13:42:36 fhajny Exp $
 
-DISTNAME=	ejabberd-2.1.8
+DISTNAME=	ejabberd-2.1.9
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION}/
 
@@ -93,8 +93,7 @@ post-patch:
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/dev.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	${INSTALL_DATA} ${WRKSRC}/doc/features.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/doc/features.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
-	${INSTALL_DATA} ${WRKSRC}/doc/guide.pdf ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
+	${INSTALL_DATA} ${WRKSRC}/doc/guide.html ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 SUBST_CLASSES+=		paths
 SUBST_MESSAGE.paths=	Localizing paths
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index 685c62f9ef4..6391d993219 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2011/06/11 20:27:12 mspo Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/12/21 13:42:36 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -9,6 +9,7 @@ lib/erlang/lib/${PKGNAME}/ebin/cyrsasl.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_anonymous.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_digest.beam
 lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_plain.beam
+lib/erlang/lib/${PKGNAME}/ebin/cyrsasl_scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/dynamic_compile.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
@@ -147,6 +148,7 @@ lib/erlang/lib/${PKGNAME}/ebin/pubsub_index.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription.beam
 lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
+lib/erlang/lib/${PKGNAME}/ebin/scram.beam
 lib/erlang/lib/${PKGNAME}/ebin/sha.beam
 lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
 lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam
@@ -212,9 +214,7 @@ share/doc/ejabberd/COPYING
 share/doc/ejabberd/dev.html
 share/doc/ejabberd/discorus.png
 share/doc/ejabberd/features.html
-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
@@ -244,6 +244,7 @@ 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/release_notes_2.1.8.txt
+share/doc/ejabberd/release_notes_2.1.9.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 d8862d98a3d..216a51c8897 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2011/06/11 20:27:12 mspo Exp $
+$NetBSD: distinfo,v 1.17 2011/12/21 13:42:36 fhajny Exp $
 
-SHA1 (ejabberd-2.1.8.tar.gz) = 3f8ecc944e0719577bfc45a68e974b1945ffa296
-RMD160 (ejabberd-2.1.8.tar.gz) = 24d3042565a8631447bbf56f998f3a2377c23822
-Size (ejabberd-2.1.8.tar.gz) = 3382833 bytes
+SHA1 (ejabberd-2.1.9.tar.gz) = 7faff4252eb2a10c046f1e6a2fcb11fd4f500ea8
+RMD160 (ejabberd-2.1.9.tar.gz) = 6a6431a54999f5ca40273fef289ae7fd9b289476
+Size (ejabberd-2.1.9.tar.gz) = 1872544 bytes
 SHA1 (patch-aa) = 81bffd072f179713989cde0c1efc3cce8cf10944
 SHA1 (patch-ad) = ea92f93624b5d6d8fa3760d426a967a499721fe7
 SHA1 (patch-ae) = e518cb5eb67ae8feef7617ad52799af3b8e81179