pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/chat/ejabberd Updated ejabberd to 2.1.1.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6b945330042
branches:  trunk
changeset: 568894:c6b945330042
user:      fhajny <fhajny%pkgsrc.org@localhost>
date:      Wed Dec 23 21:02:20 2009 +0000

description:
Updated ejabberd to 2.1.1.

Bugfix release:
  * Fix connection if starttls_required and zlib are set
  * S2S: fix allow_host/2 on subdomains. added hook s2s_allow_host
  * MUC: Add support for serving a Unique Room Name
  * MUC: Route vCard request to the occupant bare JID
  * MUC: Support converting one-to-one chat to MUC
  * PubSub: Receive same last published PEP items at reconnect if several resources online
  * PubSub: Typo in mod_pubsub_odbc breaks Service Discovery and more
  * Web: Fix memory and port leak when TLS is enabled in HTTP
  * WebAdmin: report correct last activity with odbc backends
  * Change captcha.sh to not depend on bash
  * Generate main XML file also when exporting only a vhost
  * Fix last newline in ejabberdctl result
  * Guide: fix -setcookie, mod_pubsub_odbc host, content_types

Pkgsrc changes:
  * Fixed documentation install

diffstat:

 chat/ejabberd/Makefile |  17 ++++++++---------
 chat/ejabberd/PLIST    |  46 +++++++---------------------------------------
 chat/ejabberd/distinfo |   8 ++++----
 3 files changed, 19 insertions(+), 52 deletions(-)

diffs (125 lines):

diff -r 8b3e0bf5e107 -r c6b945330042 chat/ejabberd/Makefile
--- a/chat/ejabberd/Makefile    Wed Dec 23 19:25:22 2009 +0000
+++ b/chat/ejabberd/Makefile    Wed Dec 23 21:02:20 2009 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2009/12/15 13:30:54 fhajny Exp $
+# $NetBSD: Makefile,v 1.15 2009/12/23 21:02:20 fhajny Exp $
 
-DISTNAME=      ejabberd-2.1.0
+DISTNAME=      ejabberd-2.1.1
 CATEGORIES=    chat
-MASTER_SITES=  http://www.process-one.net/downloads/ejabberd/2.1.0/
+MASTER_SITES=  http://www.process-one.net/downloads/ejabberd/2.1.1/
 
 MAINTAINER=    martti%NetBSD.org@localhost
 HOMEPAGE=      http://www.ejabberd.im/
@@ -78,8 +78,7 @@
 
 EGDIR=                 ${PREFIX}/${EJABBERD_EXDIR}
 
-INSTALLATION_DIRS+=    ${PREFIX}/share/doc/${PKGNAME_NOREV}
-INSTALLATION_DIRS+=    ${PREFIX}/share/doc/${PKGNAME_NOREV}/api
+INSTALLATION_DIRS+=    ${PREFIX}/share/doc/${PKGBASE}
 INSTALLATION_DIRS+=    ${EGDIR}
 
 CONF_FILES=            ${EGDIR}/ejabberd.cfg ${PKG_SYSCONFDIR}/ejabberd.cfg
@@ -92,10 +91,10 @@
        ${RM} -f ${WRKSRC}/doc/guide.tex.orig
 
 post-install:
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
-       ${INSTALL_DATA} ${WRKSRC}/doc/Makefile ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
-       ${INSTALL_DATA} ${WRKSRC}/doc/COPYING ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}
-       ${INSTALL_DATA} ${WRKSRC}/doc/api/* ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV}/api
+       ${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}
 
 SUBST_CLASSES+=                paths
 SUBST_MESSAGE.paths=   Localizing paths
diff -r 8b3e0bf5e107 -r c6b945330042 chat/ejabberd/PLIST
--- a/chat/ejabberd/PLIST       Wed Dec 23 19:25:22 2009 +0000
+++ b/chat/ejabberd/PLIST       Wed Dec 23 21:02:20 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/12/15 13:30:54 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/12/23 21:02:20 fhajny Exp $
 lib/erlang/lib/${PKGNAME}/ebin/ELDAPv3.beam
 lib/erlang/lib/${PKGNAME}/ebin/XmppAddr.beam
 lib/erlang/lib/${PKGNAME}/ebin/acl.beam
@@ -196,45 +196,12 @@
 lib/erlang/lib/${PKGNAME}/priv/msgs/wa.msg
 lib/erlang/lib/${PKGNAME}/priv/msgs/zh.msg
 sbin/ejabberdctl
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/Makefile
-share/doc/${PKGNAME}/api/Makefile
-share/doc/${PKGNAME}/api/overview.edoc
-share/doc/${PKGNAME}/api/process-one.css
-share/doc/${PKGNAME}/dev.html
-share/doc/${PKGNAME}/dev.tex
-share/doc/${PKGNAME}/discorus.png
-share/doc/${PKGNAME}/features.html
-share/doc/${PKGNAME}/features.pdf
-share/doc/${PKGNAME}/features.tex
-share/doc/${PKGNAME}/flow.dot
-share/doc/${PKGNAME}/guide.html
-share/doc/${PKGNAME}/guide.pdf
-share/doc/${PKGNAME}/guide.tex
-share/doc/${PKGNAME}/introduction.tex
-share/doc/${PKGNAME}/logo.png
-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
-share/doc/${PKGNAME}/release_notes_1.0.0.txt
-share/doc/${PKGNAME}/release_notes_1.1.0.txt
-share/doc/${PKGNAME}/release_notes_1.1.1.txt
-share/doc/${PKGNAME}/release_notes_1.1.2.txt
-share/doc/${PKGNAME}/release_notes_1.1.3.txt
-share/doc/${PKGNAME}/release_notes_1.1.4.txt
-share/doc/${PKGNAME}/release_notes_2.0.0.txt
-share/doc/${PKGNAME}/release_notes_2.0.1.txt
-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/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/release_notes_0.9.1.txt
 share/doc/ejabberd/release_notes_0.9.8.txt
@@ -251,7 +218,8 @@
 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/release_notes_2.1.0.txt
+share/doc/ejabberd/release_notes_2.1.1.txt
 share/doc/ejabberd/webadmmain.png
 share/doc/ejabberd/webadmmainru.png
 share/doc/ejabberd/yozhikheader.png
diff -r 8b3e0bf5e107 -r c6b945330042 chat/ejabberd/distinfo
--- a/chat/ejabberd/distinfo    Wed Dec 23 19:25:22 2009 +0000
+++ b/chat/ejabberd/distinfo    Wed Dec 23 21:02:20 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2009/12/15 13:30:54 fhajny Exp $
+$NetBSD: distinfo,v 1.10 2009/12/23 21:02:20 fhajny Exp $
 
-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 (ejabberd-2.1.1.tar.gz) = 09cf5a151a7ed5c550939549b8de2c7d9519e4c2
+RMD160 (ejabberd-2.1.1.tar.gz) = d3566425ab18744ad28e520d40766d047d2bad95
+Size (ejabberd-2.1.1.tar.gz) = 2224808 bytes
 SHA1 (patch-aa) = f0c8f884f43d31e77456f273d2037595432b10ea
 SHA1 (patch-ad) = 64e4795488cb21ee343f35e43aab08a713d5e65b
 SHA1 (patch-ae) = 362f19c23338154f0683cb2e97e6fc66fdae68a4



Home | Main Index | Thread Index | Old Index