pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/ejabberd Update ejabberd to 2.1.0.

details:   https://anonhg.NetBSD.org/pkgsrc/rev/990a49018d61
branches:  trunk
changeset: 568540:990a49018d61
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Tue Dec 15 13:30:54 2009 +0000

description:
Update ejabberd to 2.1.0.

Very brief list of additions:
  * Erlang/OTP R13 support
  * HTTP-Bind (BOSH) optimization and clean-up
  * LDAPS support
  * MUC rooms can require a CAPTCHA to join the room
  * PubSub: major improvements. Update to XEP version 1.12
  * PEP and Caps: many improvements
  * Run commands with ejabberdctl or other frontends (XML-RPC, HTTP)
  * STUN server
  * XEPs like: XMPP Ping, Roster Versioning, Import/Export Format

See full release note:

  http://www.process-one.net/en/ejabberd/release_notes/release_note_ejabberd_2.1.0

diffstat:

 chat/ejabberd/Makefile         |   14 +-
 chat/ejabberd/PLIST            |   76 +++++++++-
 chat/ejabberd/distinfo         |   19 +-
 chat/ejabberd/patches/patch-aa |  173 ++++++++++++++++++++++---
 chat/ejabberd/patches/patch-ac |  276 -----------------------------------------
 chat/ejabberd/patches/patch-ad |   76 ++--------
 chat/ejabberd/patches/patch-ae |   56 +++-----
 chat/ejabberd/patches/patch-af |   25 ---
 chat/ejabberd/patches/patch-ag |  205 ------------------------------
 chat/ejabberd/patches/patch-ah |   50 -------
 chat/ejabberd/patches/patch-ai |  158 -----------------------
 11 files changed, 271 insertions(+), 857 deletions(-)

diffs (truncated from 1349 to 300 lines):

diff -r 7f7d70bcd627 -r 990a49018d61 chat/ejabberd/Makefile
--- a/chat/ejabberd/Makefile    Tue Dec 15 13:28:25 2009 +0000
+++ b/chat/ejabberd/Makefile    Tue Dec 15 13:30:54 2009 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2009/05/19 08:59:05 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/12/15 13:30:54 fhajny Exp $
 
-DISTNAME=      ejabberd-2.0.5
-#PKGREVISION=  1
+DISTNAME=      ejabberd-2.1.0
 CATEGORIES=    chat
-MASTER_SITES=  http://www.process-one.net/downloads/ejabberd/2.0.5/
+MASTER_SITES=  http://www.process-one.net/downloads/ejabberd/2.1.0/
 
 MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.ejabberd.im/
@@ -26,7 +25,6 @@
 CONFIGURE_ARGS+=       --enable-eldap
 CONFIGURE_ARGS+=       --enable-web
 CONFIGURE_ARGS+=       --enable-tls
-CONFIGURE_ARGS+=       --enable-odbc
 CONFIGURE_ARGS+=       --enable-ejabberd_zlib
 CONFIGURE_ARGS+=       --with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=       --with-zlib=${BUILDLINK_PREFIX.zlib}
@@ -75,6 +73,8 @@
 
 PKG_GROUPS+=           ${EJABBERD_GROUP}
 PKG_USERS+=            ${EJABBERD_USER}:${EJABBERD_GROUP}
+PKG_GECOS.${EJABBERD_USER}=    ejabberd user
+PKG_HOME.${EJABBERD_USER}=     ${EJABBERD_DB}
 
 EGDIR=                 ${PREFIX}/${EJABBERD_EXDIR}
 
@@ -86,6 +86,8 @@
 CONF_FILES+=           ${EGDIR}/ejabberdctl.cfg ${PKG_SYSCONFDIR}/ejabberdctl.cfg
 CONF_FILES+=           ${EGDIR}/inetrc ${PKG_SYSCONFDIR}/inetrc
 
+REPLACE_SH=            src/ejabberdctl.template tools/captcha.sh
+
 post-patch:
        ${RM} -f ${WRKSRC}/doc/guide.tex.orig
 
@@ -99,12 +101,14 @@
 SUBST_MESSAGE.paths=   Localizing paths
 SUBST_STAGE.paths=     pre-configure
 SUBST_FILES.paths=     src/Makefile.in
+SUBST_FILES.paths+=    src/ejabberd.cfg.example
 SUBST_FILES.paths+=    src/ejabberdctl.template
 SUBST_FILES.paths+=    doc/guide.tex
 SUBST_SED.paths+=      -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
 SUBST_SED.paths+=      -e 's,@JABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
 SUBST_SED.paths+=      -e 's,@EJABBERD_LOGDIR@,${EJABBERD_LOGDIR},g'
 SUBST_SED.paths+=      -e 's,@EJABBERD_DB@,${EJABBERD_DB},g'
+SUBST_SED.paths+=      -e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.paths+=      -e 's,@DISTNAME@,${DISTNAME},g'
 SUBST_SED.paths+=      -e 's,@EJABBERD_VARDIR@,${VARBASE},g'
 
diff -r 7f7d70bcd627 -r 990a49018d61 chat/ejabberd/PLIST
--- a/chat/ejabberd/PLIST       Tue Dec 15 13:28:25 2009 +0000
+++ b/chat/ejabberd/PLIST       Tue Dec 15 13:30:54 2009 +0000
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:28:43 joerg Exp $
-${EJABBERD_EXDIR}/ejabberd.cfg
-${EJABBERD_EXDIR}/ejabberdctl.cfg
-${EJABBERD_EXDIR}/inetrc
+@comment $NetBSD: PLIST,v 1.9 2009/12/15 13:30:54 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -10,6 +7,7 @@
 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/dynamic_compile.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.app
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_admin.beam
@@ -23,9 +21,12 @@
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_auth_pam.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_c2s_config.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_captcha.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_check.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_commands.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_config.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_ctl.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_debug.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_frontend_socket.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_hooks.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_http.beam
@@ -38,6 +39,7 @@
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_node_groups.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_odbc_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_piefxis.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_rdbms.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_receiver.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_router.beam
@@ -47,6 +49,7 @@
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_service.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sm.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_socket.beam
+lib/erlang/lib/${PKGNAME}/ebin/ejabberd_stun.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_sup.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_system_monitor.beam
 lib/erlang/lib/${PKGNAME}/ebin/ejabberd_tmp_sup.beam
@@ -87,6 +90,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_privacy.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_privacy_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_private.beam
@@ -97,6 +101,7 @@
 lib/erlang/lib/${PKGNAME}/ebin/mod_proxy65_sm.beam
 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_roster.beam
 lib/erlang/lib/${PKGNAME}/ebin/mod_roster_odbc.beam
@@ -110,28 +115,57 @@
 lib/erlang/lib/${PKGNAME}/ebin/mod_version.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_buddy.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_club.beam
-lib/erlang/lib/${PKGNAME}/ebin/node_default.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_dag.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_dispatch.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_flat.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_flat_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_hometree.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_hometree_odbc.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_mb.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_pep.beam
+lib/erlang/lib/${PKGNAME}/ebin/node_pep_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_private.beam
 lib/erlang/lib/${PKGNAME}/ebin/node_public.beam
-lib/erlang/lib/${PKGNAME}/ebin/nodetree_default.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_dag.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree.beam
+lib/erlang/lib/${PKGNAME}/ebin/nodetree_tree_odbc.beam
 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/ram_file_io_server.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
+lib/erlang/lib/${PKGNAME}/ebin/pubsub_subscription_odbc.beam
 lib/erlang/lib/${PKGNAME}/ebin/randoms.beam
 lib/erlang/lib/${PKGNAME}/ebin/sha.beam
 lib/erlang/lib/${PKGNAME}/ebin/shaper.beam
 lib/erlang/lib/${PKGNAME}/ebin/stringprep.beam
 lib/erlang/lib/${PKGNAME}/ebin/stringprep_sup.beam
+lib/erlang/lib/${PKGNAME}/ebin/stun_codec.beam
 lib/erlang/lib/${PKGNAME}/ebin/tls.beam
 lib/erlang/lib/${PKGNAME}/ebin/translate.beam
 lib/erlang/lib/${PKGNAME}/ebin/treap.beam
 lib/erlang/lib/${PKGNAME}/ebin/win32_dns.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml.beam
 lib/erlang/lib/${PKGNAME}/ebin/xml_stream.beam
+lib/erlang/lib/${PKGNAME}/include/XmppAddr.hrl
+lib/erlang/lib/${PKGNAME}/include/adhoc.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_commands.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_config.hrl
+lib/erlang/lib/${PKGNAME}/include/ejabberd_ctl.hrl
+lib/erlang/lib/${PKGNAME}/include/eldap/ELDAPv3.hrl
+lib/erlang/lib/${PKGNAME}/include/eldap/eldap.hrl
+lib/erlang/lib/${PKGNAME}/include/jlib.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_muc/mod_muc_room.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_privacy.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_proxy65/mod_proxy65.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_pubsub/pubsub.hrl
+lib/erlang/lib/${PKGNAME}/include/mod_roster.hrl
+lib/erlang/lib/${PKGNAME}/include/web/ejabberd_http.hrl
+lib/erlang/lib/${PKGNAME}/include/web/ejabberd_web_admin.hrl
+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
@@ -140,6 +174,7 @@
 lib/erlang/lib/${PKGNAME}/priv/msgs/ca.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/cs.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/de.msg
+lib/erlang/lib/${PKGNAME}/priv/msgs/el.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/eo.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/es.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/fr.msg
@@ -178,9 +213,6 @@
 share/doc/${PKGNAME}/guide.tex
 share/doc/${PKGNAME}/introduction.tex
 share/doc/${PKGNAME}/logo.png
-share/doc/${PKGNAME}/mod_http_bind.tex
-share/doc/${PKGNAME}/mod_http_fileserver.tex
-share/doc/${PKGNAME}/release_notes_${PKGVERSION}.txt
 share/doc/${PKGNAME}/release_notes_0.9.1.txt
 share/doc/${PKGNAME}/release_notes_0.9.8.txt
 share/doc/${PKGNAME}/release_notes_0.9.txt
@@ -195,10 +227,34 @@
 share/doc/${PKGNAME}/release_notes_2.0.2.txt
 share/doc/${PKGNAME}/release_notes_2.0.3.txt
 share/doc/${PKGNAME}/release_notes_2.0.4.txt
+share/doc/${PKGNAME}/release_notes_2.0.5.txt
+share/doc/${PKGNAME}/release_notes_${PKGVERSION}.txt
 share/doc/${PKGNAME}/version.tex
 share/doc/${PKGNAME}/webadmmain.png
 share/doc/${PKGNAME}/webadmmainru.png
 share/doc/${PKGNAME}/yozhikheader.png
+share/doc/ejabberd/discorus.png
+share/doc/ejabberd/guide.html
+share/doc/ejabberd/logo.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
+share/doc/ejabberd/release_notes_1.0.0.txt
+share/doc/ejabberd/release_notes_1.1.0.txt
+share/doc/ejabberd/release_notes_1.1.1.txt
+share/doc/ejabberd/release_notes_1.1.2.txt
+share/doc/ejabberd/release_notes_1.1.3.txt
+share/doc/ejabberd/release_notes_1.1.4.txt
+share/doc/ejabberd/release_notes_2.0.0.txt
+share/doc/ejabberd/release_notes_2.0.1.txt
+share/doc/ejabberd/release_notes_2.0.2.txt
+share/doc/ejabberd/release_notes_2.0.3.txt
+share/doc/ejabberd/release_notes_2.0.4.txt
+share/doc/ejabberd/release_notes_2.0.5.txt
+share/doc/ejabberd/release_notes_${PKGVERSION}.txt
+share/doc/ejabberd/webadmmain.png
+share/doc/ejabberd/webadmmainru.png
+share/doc/ejabberd/yozhikheader.png
 share/examples/ejabberd/ejabberd.cfg
 share/examples/ejabberd/ejabberdctl.cfg
 share/examples/ejabberd/inetrc
diff -r 7f7d70bcd627 -r 990a49018d61 chat/ejabberd/distinfo
--- a/chat/ejabberd/distinfo    Tue Dec 15 13:28:25 2009 +0000
+++ b/chat/ejabberd/distinfo    Tue Dec 15 13:30:54 2009 +0000
@@ -1,13 +1,8 @@
-$NetBSD: distinfo,v 1.8 2009/05/12 18:36:19 martti Exp $
+$NetBSD: distinfo,v 1.9 2009/12/15 13:30:54 fhajny Exp $
 
-SHA1 (ejabberd-2.0.5.tar.gz) = e5b8c4b742fdcc439da9458f94f530604abdfdd5
-RMD160 (ejabberd-2.0.5.tar.gz) = 5ec0210b3995004c708180a66a096e0b9be5f1ba
-Size (ejabberd-2.0.5.tar.gz) = 1796737 bytes
-SHA1 (patch-aa) = b3cc3c7eaffeada40f322303f6b8d7ee4624f205
-SHA1 (patch-ac) = 54bf662dfeaa45bcf8443507033664d729e4b47f
-SHA1 (patch-ad) = 0aa1652ec464c1c995ae81a7ea6b00d0d9e1cd0d
-SHA1 (patch-ae) = c1c615a1d2e28d05d069f2bafa30179437922536
-SHA1 (patch-af) = 908ebaaea76de53cc22a53289d3b93189767d40c
-SHA1 (patch-ag) = c6620ce3018e4c01d8c9edf6242a8cb52a55395d
-SHA1 (patch-ah) = 29703bddcc89df1c7b8d85cebcd3efb273b14e89
-SHA1 (patch-ai) = a764916c2c9c396bc55ed4244dc7afcd14208cd3
+SHA1 (ejabberd-2.1.0.tar.gz) = 003d921d98b16ac1f9b750e700d0e1ceb5f8ce1d
+RMD160 (ejabberd-2.1.0.tar.gz) = 2b9b1e9c3702b5476e2fc10352f2dfc310199f01
+Size (ejabberd-2.1.0.tar.gz) = 2219822 bytes
+SHA1 (patch-aa) = f0c8f884f43d31e77456f273d2037595432b10ea
+SHA1 (patch-ad) = 64e4795488cb21ee343f35e43aab08a713d5e65b
+SHA1 (patch-ae) = 362f19c23338154f0683cb2e97e6fc66fdae68a4
diff -r 7f7d70bcd627 -r 990a49018d61 chat/ejabberd/patches/patch-aa
--- a/chat/ejabberd/patches/patch-aa    Tue Dec 15 13:28:25 2009 +0000
+++ b/chat/ejabberd/patches/patch-aa    Tue Dec 15 13:30:54 2009 +0000
@@ -1,34 +1,159 @@
-$NetBSD: patch-aa,v 1.4 2009/02/09 23:05:02 joerg Exp $
-
-Modified for pkgsrc
+$NetBSD: patch-aa,v 1.5 2009/12/15 13:30:54 fhajny Exp $
 
---- src/Makefile.in.orig       2008-08-27 12:37:52.000000000 +0300
+--- src/Makefile.in.orig       2009-11-06 19:53:19.000000000 +0000
 +++ src/Makefile.in
-@@ -58,15 +58,15 @@ BEAMS = $(SOURCES:.erl=.beam)
+@@ -59,7 +59,7 @@ endif
  
+ INSTALL_EPAM=
+ ifeq (@pam@, pam)
+-  INSTALL_EPAM=install -m 750 $(O_USER) epam $(PBINDIR)
++  INSTALL_EPAM=$(BSD_INSTALL_DATA) -m 750 $(O_USER) epam $(PBINDIR)
+ endif
+ 
+ prefix = @prefix@
+@@ -76,13 +76,13 @@ BEAMS = $(SOURCES:.erl=.beam)
  DESTDIR =
  
--EJABBERDDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
-+EJABBERDDIR = $(DESTDIR)@prefix@/lib/erlang/lib/@DISTNAME@
- BEAMDIR = $(EJABBERDDIR)/ebin
--SPOOLDIR = $(EJABBERDDIR)/db
-+SPOOLDIR = @EJABBERD_VARDIR@/spool/ejabberd/db/$NODE
- PRIVDIR = $(EJABBERDDIR)/priv
- SODIR = $(PRIVDIR)/lib
- PBINDIR = $(PRIVDIR)/bin
- MSGSDIR = $(PRIVDIR)/msgs
--LOGDIR = $(DESTDIR)@localstatedir@/log/ejabberd
+ # /etc/ejabberd/
 -ETCDIR = $(DESTDIR)@sysconfdir@/ejabberd
-+LOGDIR = $(DESTDIR)/@JABBERD_LOGDIR@
 +ETCDIR = $(DESTDIR)@prefix@/share/examples/ejabberd
+
Home | Main Index | Thread Index | Old Index