Update ejabberd to 2.1.12

Changes since 2.1.10:

* Core ejabberd
- Make terms serialization faster
- Reduce size of XML stream state

* Administration
- Add SCRAM and remove MD5 support to ejabberd commands auth verification
- Added command to list all the vhosts registered in an ejabberd node
- Added export2odbc command, copied from mod_admin_extra.erl
- Fix ejabberdctl number of arguments error report with R15
- Check node name is available before starting ejabberd (EJAB-1572)
- Fix ejabberd_xmlrpc commands authentication with SCRAM
- Fix mod_offline:store_offline_msg argument (EJAB-1581)
- Log IP address when auth attempt fails
- Make sure update_info returns atoms only (EJAB-1595)
- On shutdown, first stop listeners, then modules

* Encryption
- Detect OpenSSL version at runtime, not at compile time
- Fixed signedness issue in tls_drv GET_DESCRYPTED_INPUT (EJAB-1591)
- Enable DHE key exchange in TLS driver
- Enable ECDHE key exchange in TSL driver
- Disable old and unsecure ciphers in TLS driver
- Disable SSL 2.0 in TLS driver

* HTTP-Bind
- Do not trigger item-not-found errors in mod_http_bind
- Repeated http-bind request should abort only requests with same rid
- Receiving missing request shouldn't close waiting out-ouf-order request

* XMPP
- Allow multiple fqdn values in configuration (EJAB-1578)
- Fix get_subscription_lists/4
- Fix account registration
- Send announce Message stanzas as Headline type instead of Normal

* Other
- Guide: Fix file name of Name Service Switch
- Guide: Document the db_type modules option (EJAB-1560)
- LDAP: Fix broken JPEG photo (EJAB-1526)
- LDAP: Fix compatibility with Erlang R16A (EJAB-1612)
- MUC: Fix angle brackets handle in plaintext log (EJAB-1610)
- MUC: Fix MUC start when Mnesia tables don't exist yet
- MUC: New mod_muc_log option file_permissions (EJAB-1588)
- ODBC: Merge SQL and Mnesia code into one module (EJAB-1560)
- Translation: New Hebrew
- Translation: Update Slovak

3 files changed, 11 insertions, 22 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 75baab415c1..d331cb120ea 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2013/02/06 23:21:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.32 2013/05/31 20:01:30 fhajny Exp $
 
-DISTNAME=	ejabberd-2.1.11
-PKGREVISION=	1
+DISTNAME=	ejabberd-2.1.12
 CATEGORIES=	chat
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tgz
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index e35d6db832e..896e91ee9f4 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2012/09/30 21:38:04 tron Exp $
+@comment $NetBSD: PLIST,v 1.19 2013/05/31 20:01:30 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -77,9 +77,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_announce_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_blocking.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_blocking_odbc.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
@@ -90,21 +88,15 @@ lib/erlang/lib/${PKGNAME}/ebin/mod_http_fileserver.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_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_last.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_last_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_muc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_muc_log.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_muc_odbc.beam
 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
-lib/erlang/lib/${PKGNAME}/ebin/mod_private_odbc.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
@@ -115,19 +107,15 @@ 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_shared_roster_odbc.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
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_ldap.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate.beam
-lib/erlang/lib/${PKGNAME}/ebin/mod_vcard_xupdate_odbc.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
@@ -199,6 +187,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/he.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
@@ -244,6 +233,9 @@ share/doc/ejabberd/release_notes_2.0.4.txt
 share/doc/ejabberd/release_notes_2.0.5.txt
 share/doc/ejabberd/release_notes_2.1.0.txt
 share/doc/ejabberd/release_notes_2.1.1.txt
+share/doc/ejabberd/release_notes_2.1.10.txt
+share/doc/ejabberd/release_notes_2.1.11.txt
+share/doc/ejabberd/release_notes_${PKGVERSION}.txt
 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
@@ -252,8 +244,6 @@ 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/release_notes_2.1.10.txt
-share/doc/ejabberd/release_notes_2.1.11.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 c734604b110..d2e6bcf8876 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2012/09/30 21:38:05 tron Exp $
+$NetBSD: distinfo,v 1.20 2013/05/31 20:01:30 fhajny Exp $
 
-SHA1 (ejabberd-2.1.11.tgz) = ae2c521d5e93fbd5bc826052c5524b5222dcfae6
-RMD160 (ejabberd-2.1.11.tgz) = d714aa744f7181b8c96f228787e4a1c32594be3f
-Size (ejabberd-2.1.11.tgz) = 2014232 bytes
+SHA1 (ejabberd-2.1.12.tgz) = 5610a944afb8ac07e68ca87d14ef398a0d42d633
+RMD160 (ejabberd-2.1.12.tgz) = 90b1e209c9b1e8070447d0b017337d9819aed986
+Size (ejabberd-2.1.12.tgz) = 1999224 bytes
 SHA1 (patch-aa) = 81bffd072f179713989cde0c1efc3cce8cf10944
 SHA1 (patch-ad) = ea92f93624b5d6d8fa3760d426a967a499721fe7
 SHA1 (patch-ae) = e518cb5eb67ae8feef7617ad52799af3b8e81179