Updated chat/ejabberd to 2.1.5.

Short list of changes:
* Erlang/OTP R12 support fixed
* Erlang/OTP R14A support added
* OpenSSL 0.9.8 or higher is required
* BOSH: New optional connection attribute process-delay
* C2S: Don't ask for client certificate when using tls
* C2S: Inform client that SSL session caching is disabled
* CTL: Fix problem when FIREWALL_WINDOW options for erl kernel were used
* CTL: Some systems delete the lock dir; in such case don't use Flock at all
* Caps: Support all the hash functions required by XEP-0115
* Config: Fix typo in --enable-transient_supervisors
* Config: New configure option: --enable-nif
* Extauth: Support parallel script running
* MUC: Allow admins to see private rooms in disco
* ODBC: Correct handling of SQL boolean types
* ODBC: Discard too old queued requests (the caller has already got a timeout)
* ODBC: Fixes wrong SQL escaping when --enable-full-xml is set
* ODBC: Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1
* Pubsub: Enforce disco features results
* S2S: When logging s2s out connection attempt or success, log if TLS is used
* Shared Rosters: When account is deleted, delete also member
  of stored rosters

5 files changed, 37 insertions, 26 deletions

diff --git a/chat/ejabberd/Makefile b/chat/ejabberd/Makefile
index 64677ccbc36..6ca271c3ec7 100644
--- a/chat/ejabberd/Makefile
+++ b/chat/ejabberd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2010/06/09 13:53:53 fhajny Exp $
+# $NetBSD: Makefile,v 1.21 2010/09/03 10:31:43 fhajny Exp $
 
-DISTNAME=	ejabberd-2.1.4
+DISTNAME=	ejabberd-2.1.5
 CATEGORIES=	chat
-MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/2.1.4/
+MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/2.1.5/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ejabberd.im/
diff --git a/chat/ejabberd/PLIST b/chat/ejabberd/PLIST
index b642aba0f92..82cc7bd401d 100644
--- a/chat/ejabberd/PLIST
+++ b/chat/ejabberd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/06/09 13:53:53 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.13 2010/09/03 10:31:43 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -172,6 +172,7 @@ lib/erlang/lib/${PKGNAME}/priv/bin/captcha.sh
 lib/erlang/lib/${PKGNAME}/priv/lib/ejabberd_zlib_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/expat_erl.so
 lib/erlang/lib/${PKGNAME}/priv/lib/iconv_erl.so
+lib/erlang/lib/${PKGNAME}/priv/lib/sha_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/stringprep_drv.so
 lib/erlang/lib/${PKGNAME}/priv/lib/tls_drv.so
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
@@ -199,6 +200,7 @@ lib/erlang/lib/${PKGNAME}/priv/msgs/vi.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
 sbin/ejabberdctl
+share/doc/ejabberd/COPYING
 share/doc/ejabberd/dev.html
 share/doc/ejabberd/discorus.png
 share/doc/ejabberd/features.html
@@ -226,6 +228,7 @@ share/doc/ejabberd/release_notes_2.1.1.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
+share/doc/ejabberd/release_notes_2.1.5.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 51fd49959a1..374880183e7 100644
--- a/chat/ejabberd/distinfo
+++ b/chat/ejabberd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2010/06/09 13:53:53 fhajny Exp $
+$NetBSD: distinfo,v 1.14 2010/09/03 10:31:43 fhajny Exp $
 
-SHA1 (ejabberd-2.1.4.tar.gz) = 00b1b121f687ba8284dbeb40ff97915d9e1be355
-RMD160 (ejabberd-2.1.4.tar.gz) = 6dcc2bc1be25093a4f99b0e350f0af123f0473df
-Size (ejabberd-2.1.4.tar.gz) = 2267300 bytes
-SHA1 (patch-aa) = 9bedb8f7ba32ad940ada86d00565a5dd521c7b16
+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 (patch-ae) = ca6c8e35b3a72924eb8844f0a0111e87278285fa
+SHA1 (patch-ae) = e518cb5eb67ae8feef7617ad52799af3b8e81179
diff --git a/chat/ejabberd/patches/patch-aa b/chat/ejabberd/patches/patch-aa
index b2fcd8a24a5..672f61f2fdc 100644
--- a/chat/ejabberd/patches/patch-aa
+++ b/chat/ejabberd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
+$NetBSD: patch-aa,v 1.8 2010/09/03 10:31:43 fhajny Exp $
 
---- src/Makefile.in.orig	2010-03-12 10:40:41.000000000 +0000
+--- src/Makefile.in.orig	2010-08-02 16:33:20.000000000 +0000
 +++ src/Makefile.in
-@@ -59,7 +59,7 @@ endif
+@@ -65,7 +65,7 @@ endif
  
  INSTALL_EPAM=
  ifeq (@pam@, pam)
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  endif
  
  prefix = @prefix@
-@@ -76,13 +76,13 @@ BEAMS = $(SOURCES:.erl=.beam)
+@@ -83,13 +83,13 @@ BEAMS = $(SOURCES:.erl=.beam)
  DESTDIR =
  
  # /etc/ejabberd/
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -108,16 +108,16 @@ SODIR = $(PRIVDIR)/lib
+@@ -115,16 +115,16 @@ SODIR = $(PRIVDIR)/lib
  MSGSDIR = $(PRIVDIR)/msgs
  
  # /var/lib/ejabberd/
@@ -47,7 +47,7 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  
  # Assume Linux-style dynamic library flags
  DYNAMIC_LIB_CFLAGS = -fpic -shared
-@@ -170,10 +170,10 @@ translations:
+@@ -177,10 +177,10 @@ translations:
  install: all
  	#
  	# Configuration files
@@ -61,7 +61,7 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  	sed -e "s*@rootdir@*@prefix@*" \
  		-e "s*@installuser@*@INSTALLUSER@*" \
  		-e "s*@LIBDIR@*@libdir@*" \
-@@ -183,13 +183,13 @@ install: all
+@@ -190,13 +190,13 @@ install: all
  		-e "s*@erl@*@ERL@*" ejabberdctl.template \
  		> ejabberdctl.example
  	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
@@ -80,7 +80,7 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  	#
  	# Init script
  	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
-@@ -197,59 +197,53 @@ install: all
+@@ -204,64 +204,58 @@ install: all
  		> ejabberd.init
  	#
  	# Binary Erlang files
@@ -145,7 +145,7 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  	#
  	# ejabberdctl lock directory
 -	install -d -m 750 $(O_USER) $(CTLLOCKDIR)
-+	$(BSD_INSTALL_DATA_DIR) -m 750 ${O_USER} ${CTLLOCKDIR}
++	$(BSD_INSTALL_DATA_DIR) -m 750 $(O_USER) $(CTLLOCKDIR)
  	$(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT)
  	chmod -R 750 $(CTLLOCKDIR)
  	#
@@ -157,13 +157,21 @@ $NetBSD: patch-aa,v 1.7 2010/03/13 21:05:49 fhajny Exp $
  	#
  	# Documentation
 -	install -d $(DOCDIR)
+-	install -m 644 ../doc/dev.html $(DOCDIR)
 -	install -m 644 ../doc/guide.html $(DOCDIR)
 -	install -m 644 ../doc/*.png $(DOCDIR)
 -	install -m 644 ../doc/*.txt $(DOCDIR)
 +	$(BSD_INSTALL_DATA_DIR) $(DOCDIR)
-+	$(BSD_INSTALL_DATA) ../doc/guide.html $(DOCDIR)
-+	$(BSD_INSTALL_DATA) ../doc/*.png $(DOCDIR)
-+	$(BSD_INSTALL_DATA) ../doc/*.txt $(DOCDIR)
++	$(BSD_INSTALL_DATA) -m 644 ../doc/dev.html $(DOCDIR)
++	$(BSD_INSTALL_DATA) -m 644 ../doc/guide.html $(DOCDIR)
++	$(BSD_INSTALL_DATA) -m 644 ../doc/*.png $(DOCDIR)
++	$(BSD_INSTALL_DATA) -m 644 ../doc/*.txt $(DOCDIR)
+ 	[ -f ../doc/guide.pdf ] \
+-		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
++		&& $(BSD_INSTALL_DATA) -m 644 ../doc/guide.pdf $(DOCDIR) \
+ 		|| echo "No ../doc/guide.pdf was built"
+-	install -m 644 ../COPYING $(DOCDIR)
++	$(BSD_INSTALL_DATA) -m 644 ../COPYING $(DOCDIR)
  
  uninstall: uninstall-binary
  
diff --git a/chat/ejabberd/patches/patch-ae b/chat/ejabberd/patches/patch-ae
index aa6a1f8b6ed..cfa491edec1 100644
--- a/chat/ejabberd/patches/patch-ae
+++ b/chat/ejabberd/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.5 2010/03/13 21:05:49 fhajny Exp $
+$NetBSD: patch-ae,v 1.6 2010/09/03 10:31:43 fhajny Exp $
 
---- src/ejabberdctl.template.orig	2010-03-12 10:40:41.000000000 +0000
+--- src/ejabberdctl.template.orig	2010-08-02 16:33:20.000000000 +0000
 +++ src/ejabberdctl.template
 @@ -43,10 +43,10 @@ if [ "$EJABBERDCTL_CONFIG_PATH" = "" ] ;
  fi
@@ -24,12 +24,12 @@ $NetBSD: patch-ae,v 1.5 2010/03/13 21:05:49 fhajny Exp $
  fi
  if [ "$EJABBERD_EBIN_PATH" = "" ]; then
      EJABBERD_EBIN_PATH=$EJABBERDDIR/ebin
-@@ -234,7 +234,7 @@ ctl ()
+@@ -237,7 +237,7 @@ ctl ()
      # using flock if available. Expects a linux-style
      # flock that can lock a file descriptor.
      MAXCONNID=100
 -    CONNLOCKDIR=@LOCALSTATEDIR@/lock/ejabberdctl
 +    CONNLOCKDIR=@EJABBERD_PIDDIR@
      FLOCK='/usr/bin/flock'
-     if [ ! -x "$FLOCK" ] ; then
+     if [ ! -x "$FLOCK" ] || [ ! -d "$CONNLOCKDIR" ] ; then
  	JOT='/usr/bin/jot'