Added LDAP shared roster module, fixed some typos, thank krigstask for this job.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog
index e86d6946b765d463fbe5c0e70812c18596a3c149..f0e6d34a96b973742a1401f34eb64ce5c3ea33cd 100644 (file)
--- a/net-im/ejabberd/ChangeLog
+++ b/net-im/ejabberd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/ejabberd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.72 2010/05/28 10:52:20 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.73 2010/06/01 07:20:02 pva Exp $
+
+  01 Jun 2010; Peter Volkov <pva@gentoo.org> ejabberd-2.1.3.ebuild,
+  metadata.xml:
+  Added LDAP shared roster module, fixed some typos, thank krigstask for
+  this job.
 
   28 May 2010; Peter Volkov <pva@gentoo.org> files/ejabberd-3.initd:
   Make init script a bit more resistant, e.g. restart should now work, thank

diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index 6fdeb7f5e4c885a4195dba41e957eadd452a828e..bf7c70a886fb271ec088c5cc47cd424d4dd5f801 100644 (file)
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -9,7 +9,8 @@ AUX self-cert-v2.sh 1017 RMD160 3beb0f05e8cc3041abd2f689d31d410bc7d5088d SHA1 1f
 AUX ssl.cnf 1042 RMD160 47d2542942fb21f4be1e827d47eb4e0468e73910 SHA1 7347bae5a195ad158881fe5313f55ee41e85cb81 SHA256 ed066f7720fd9f4c2d57ffb2ebcbc4b2810d2b7ca22b67ec8c1dc1227baaa635
 DIST ejabberd-2.0.5.tar.gz 1796737 RMD160 5ec0210b3995004c708180a66a096e0b9be5f1ba SHA1 e5b8c4b742fdcc439da9458f94f530604abdfdd5 SHA256 37ef90e2afa2b73a620bf71a096df48d5fde8f1cd669fac83d8c143a1295198c
 DIST ejabberd-2.1.3.tar.gz 2243874 RMD160 c57672928e30f71ec66636dd5e76adb802f17b03 SHA1 77fdf18c0bb3b25cf9045e0c833ba4d82f180469 SHA256 602c6e4e742c4cab8594e9f049f08d0bf2125fa84af491e0ceb6d6f2f3854ef6
+DIST mod_shared_roster_ldap-0.5.1.tgz 607758 RMD160 5669a3d16fbca4d399e85a7d0dfda71643e6e2c7 SHA1 a9498d26e17752b882b3341b633d1804075d74ef SHA256 60e4ba0921d1ac65f9cca04fa2a7a3bbe3a9af52a26ad1a4fca4a3c6f1f0cc19
 EBUILD ejabberd-2.0.5-r3.ebuild 4901 RMD160 1f7a17a51e3310a0619ed37d3defb34380d637f4 SHA1 608359d5a2a4889326b9afa43883104653689134 SHA256 02bf31c731eb7f72ace9fa5092421b2dd96700ca82d7eccc034aaa256c2b04fd
-EBUILD ejabberd-2.1.3.ebuild 7874 RMD160 c9bbbd82f817d2d59acd18236b9c18abd43d7c85 SHA1 5f41a8aa44baf22d237a957073e63be3fc816b1a SHA256 3e4fa6dc7e64c970342533ef03e679bbe029794d5220a4f480a162eb68a1d051
-MISC ChangeLog 15797 RMD160 e9e32158b747ded88da374b454fdb92420c561f6 SHA1 9c6d11ba2ea42ccb4141314efc98c4baec97ab86 SHA256 50802e9513ea5e944361ed92ed93bbc63c3eb73444347e34d4bd213223fdee40
-MISC metadata.xml 875 RMD160 ac2ab791694cf3feae91eb66053273fce29367b1 SHA1 7e5be5bd376801e9b0fbeaa08d8ca720f44b5c5b SHA256 2d8cf45269a75ebf3b07dbd06f74caef0bd2caf33a9dcf22466db6a6960115ef
+EBUILD ejabberd-2.1.3.ebuild 8095 RMD160 ecb1d6a4d7b3346185ba178edf0c1263a1b01b4e SHA1 655d0c0b7baebf58d4e6cd084a08d05bcab88534 SHA256 e1836a84d883fa5dbfd14a437f6a4f008634ad6d292bf372b0d4046c87556dc2
+MISC ChangeLog 15967 RMD160 e1eedb9381ae54b02f1d6b033777687536eb828e SHA1 8852418bd6d713c8ed8aa29194381594dcc2946e SHA256 5e6946bfcbc6565476538ec4ade7736c7c1ebb37f978bad4a508dc805cfd64c2
+MISC metadata.xml 990 RMD160 ebada1c9f87e04b685a2b441adda6caa7f0c0bdb SHA1 abbe1cd7e95c89dfcab3c8a8cd2f12588599ea35 SHA256 a8a06ebd560d7d1f75fcfad43fe9af9075862d00b49826e5896a320202d18158

diff --git a/net-im/ejabberd/ejabberd-2.1.3.ebuild b/net-im/ejabberd/ejabberd-2.1.3.ebuild
index e3e67c0903af9f9331838e3f0378053310b2e088..d210c7715830503cfe6cdda2ed28751f06c35f41 100644 (file)
--- a/net-im/ejabberd/ejabberd-2.1.3.ebuild
+++ b/net-im/ejabberd/ejabberd-2.1.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v 1.3 2010/05/27 16:15:39 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v 1.4 2010/06/01 07:20:02 pva Exp $
 
 EAPI=3
 
@@ -8,12 +8,13 @@ inherit eutils multilib pam ssl-cert
 
 DESCRIPTION="The Erlang Jabber Daemon"
 HOMEPAGE="http://www.ejabberd.im/"
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz"
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz
+               mod_srl? ( https://alioth.debian.org/frs/download.php/3283/mod_shared_roster_ldap-0.5.1.tgz )"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86"
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx"
+EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_srl mod_statsdx"
 IUSE="captcha debug ldap odbc pam ssl +web zlib ${EJABBERD_MODULES}"
 
 DEPEND=">=net-im/jabber-base-0.01
@@ -32,7 +33,7 @@ PROVIDE="virtual/jabber-server"
 
 S=${WORKDIR}/${P}/src
 
-# pathes in net-im/jabber-base
+# paths in net-im/jabber-base
 JABBER_ETC="${EPREFIX}/etc/jabber"
 #JABBER_RUN="/var/run/jabber"
 JABBER_SPOOL="${EPREFIX}/var/spool/jabber"
@@ -48,7 +49,7 @@ src_prepare() {
 
        # don't install release notes (we'll do this manually)
        sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die
-       # Set correct pathes
+       # Set correct paths
        sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \
                -e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \
                -e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \
@@ -77,11 +78,15 @@ src_prepare() {
        sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \
                        -i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example"
 
-       # disable mod_irc
+       # disable mod_irc in ejabberd.cfg
        if ! use mod_irc; then
                sed -i -e "s/{mod_irc,/%{mod_irc,/" \
                        -i ejabberd.cfg.example || die "Failed to disable mod_irc"
        fi
+
+       if use mod_srl; then
+               cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die
+       fi
 }
 
 src_configure() {
@@ -152,10 +157,10 @@ pkg_postinst() {
                source "${EROOT}/etc/conf.d/ejabberd"
                ewarn
                ewarn "!!! WARNING !!!  WARNING !!!  WARNING !!!  WARNING !!!"
-               ewarn "Starting with 2.1.x some pathes and configuration files were"
-               ewarn "changed to better reflect upstream intentions. Notable changes are:"
+               ewarn "Starting with 2.1.x some paths and configuration files were"
+               ewarn "changed to reflect upstream intentions better. Notable changes are:"
                ewarn
-               ewarn "1. Everything (even init scripts) are now handled by ejabberdctl script."
+               ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script."
                ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg"
                ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE"
                ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start."

diff --git a/net-im/ejabberd/metadata.xml b/net-im/ejabberd/metadata.xml
index 48f6cfa8c659925eaef1d456d39dec4b831e4709..c339c8b8411449771c2b952e9e020a56aa025ef2 100644 (file)
--- a/net-im/ejabberd/metadata.xml
+++ b/net-im/ejabberd/metadata.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
 <herd>net-im</herd>
 <maintainer>
@@ -9,6 +10,8 @@
     <use>
        <flag name='mod_irc'>Build irc gateway </flag>
        <flag name='mod_muc'>Build Multi User Chat module</flag>
+       <flag name='mod_srl'>Build LDAP shared roster module
+       (https://alioth.debian.org/projects/ejabberd-msrl/)</flag>
        <flag name='mod_pubsub'>Build Pubsub module</flag>
        <flag name='web'>Enable web admin interface</flag>
        <flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag>