| 1 |
pva 10/06/01 07:20:02 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog ejabberd-2.1.3.ebuild |
| 4 |
Log: |
| 5 |
Added LDAP shared roster module, fixed some typos, thank krigstask for this job. |
| 6 |
(Portage version: 2.1.8.3/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.6 net-im/ejabberd/metadata.xml |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/metadata.xml?rev=1.6&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/metadata.xml?rev=1.6&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/metadata.xml?r1=1.5&r2=1.6 |
| 14 |
|
| 15 |
Index: metadata.xml |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/metadata.xml,v |
| 18 |
retrieving revision 1.5 |
| 19 |
retrieving revision 1.6 |
| 20 |
diff -u -r1.5 -r1.6 |
| 21 |
--- metadata.xml 26 May 2010 20:25:25 -0000 1.5 |
| 22 |
+++ metadata.xml 1 Jun 2010 07:20:02 -0000 1.6 |
| 23 |
@@ -1,5 +1,6 @@ |
| 24 |
<?xml version="1.0" encoding="UTF-8"?> |
| 25 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 26 |
+ |
| 27 |
<pkgmetadata> |
| 28 |
<herd>net-im</herd> |
| 29 |
<maintainer> |
| 30 |
@@ -9,6 +10,8 @@ |
| 31 |
<use> |
| 32 |
<flag name='mod_irc'>Build irc gateway </flag> |
| 33 |
<flag name='mod_muc'>Build Multi User Chat module</flag> |
| 34 |
+ <flag name='mod_srl'>Build LDAP shared roster module |
| 35 |
+ (https://alioth.debian.org/projects/ejabberd-msrl/)</flag> |
| 36 |
<flag name='mod_pubsub'>Build Pubsub module</flag> |
| 37 |
<flag name='web'>Enable web admin interface</flag> |
| 38 |
<flag name="captcha">Support for CAPTCHA Forms (XEP-158)</flag> |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.73 net-im/ejabberd/ChangeLog |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.73&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?rev=1.73&content-type=text/plain |
| 46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ChangeLog?r1=1.72&r2=1.73 |
| 47 |
|
| 48 |
Index: ChangeLog |
| 49 |
=================================================================== |
| 50 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v |
| 51 |
retrieving revision 1.72 |
| 52 |
retrieving revision 1.73 |
| 53 |
diff -u -r1.72 -r1.73 |
| 54 |
--- ChangeLog 28 May 2010 10:52:20 -0000 1.72 |
| 55 |
+++ ChangeLog 1 Jun 2010 07:20:02 -0000 1.73 |
| 56 |
@@ -1,6 +1,11 @@ |
| 57 |
# ChangeLog for net-im/ejabberd |
| 58 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 59 |
-# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.72 2010/05/28 10:52:20 pva Exp $ |
| 60 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.73 2010/06/01 07:20:02 pva Exp $ |
| 61 |
+ |
| 62 |
+ 01 Jun 2010; Peter Volkov <pva@g.o> ejabberd-2.1.3.ebuild, |
| 63 |
+ metadata.xml: |
| 64 |
+ Added LDAP shared roster module, fixed some typos, thank krigstask for |
| 65 |
+ this job. |
| 66 |
|
| 67 |
28 May 2010; Peter Volkov <pva@g.o> files/ejabberd-3.initd: |
| 68 |
Make init script a bit more resistant, e.g. restart should now work, thank |
| 69 |
|
| 70 |
|
| 71 |
|
| 72 |
1.4 net-im/ejabberd/ejabberd-2.1.3.ebuild |
| 73 |
|
| 74 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild?rev=1.4&view=markup |
| 75 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild?rev=1.4&content-type=text/plain |
| 76 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild?r1=1.3&r2=1.4 |
| 77 |
|
| 78 |
Index: ejabberd-2.1.3.ebuild |
| 79 |
=================================================================== |
| 80 |
RCS file: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v |
| 81 |
retrieving revision 1.3 |
| 82 |
retrieving revision 1.4 |
| 83 |
diff -u -r1.3 -r1.4 |
| 84 |
--- ejabberd-2.1.3.ebuild 27 May 2010 16:15:39 -0000 1.3 |
| 85 |
+++ ejabberd-2.1.3.ebuild 1 Jun 2010 07:20:02 -0000 1.4 |
| 86 |
@@ -1,6 +1,6 @@ |
| 87 |
# Copyright 1999-2010 Gentoo Foundation |
| 88 |
# Distributed under the terms of the GNU General Public License v2 |
| 89 |
-# $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 $ |
| 90 |
+# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.3.ebuild,v 1.4 2010/06/01 07:20:02 pva Exp $ |
| 91 |
|
| 92 |
EAPI=3 |
| 93 |
|
| 94 |
@@ -8,12 +8,13 @@ |
| 95 |
|
| 96 |
DESCRIPTION="The Erlang Jabber Daemon" |
| 97 |
HOMEPAGE="http://www.ejabberd.im/" |
| 98 |
-SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz" |
| 99 |
+SRC_URI="http://www.process-one.net/downloads/${PN}/${PV}/${P}.tar.gz |
| 100 |
+ mod_srl? ( https://alioth.debian.org/frs/download.php/3283/mod_shared_roster_ldap-0.5.1.tgz )" |
| 101 |
|
| 102 |
LICENSE="GPL-2" |
| 103 |
SLOT="0" |
| 104 |
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~x86" |
| 105 |
-EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_statsdx" |
| 106 |
+EJABBERD_MODULES="mod_irc mod_muc mod_proxy65 mod_pubsub mod_srl mod_statsdx" |
| 107 |
IUSE="captcha debug ldap odbc pam ssl +web zlib ${EJABBERD_MODULES}" |
| 108 |
|
| 109 |
DEPEND=">=net-im/jabber-base-0.01 |
| 110 |
@@ -32,7 +33,7 @@ |
| 111 |
|
| 112 |
S=${WORKDIR}/${P}/src |
| 113 |
|
| 114 |
-# pathes in net-im/jabber-base |
| 115 |
+# paths in net-im/jabber-base |
| 116 |
JABBER_ETC="${EPREFIX}/etc/jabber" |
| 117 |
#JABBER_RUN="/var/run/jabber" |
| 118 |
JABBER_SPOOL="${EPREFIX}/var/spool/jabber" |
| 119 |
@@ -48,7 +49,7 @@ |
| 120 |
|
| 121 |
# don't install release notes (we'll do this manually) |
| 122 |
sed '/install .* [.][.]\/doc\/[*][.]txt $(DOCDIR)/d' -i Makefile.in || die |
| 123 |
- # Set correct pathes |
| 124 |
+ # Set correct paths |
| 125 |
sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${PF}:}" \ |
| 126 |
-e "/^ETCDIR[[:space:]]*=/{s:@sysconfdir@/ejabberd:${JABBER_ETC}:}" \ |
| 127 |
-e "/^LOGDIR[[:space:]]*=/{s:@localstatedir@/log/ejabberd:${JABBER_LOG}:}" \ |
| 128 |
@@ -77,11 +78,15 @@ |
| 129 |
sed -e 's|\({captcha_cmd,[[:space:]]*"\).\+"}|\1/usr/'$(get_libdir)'/erlang/lib/'${P}'/priv/bin/captcha.sh"}|' \ |
| 130 |
-i ejabberd.cfg.example || die "Failed sed ejabberd.cfg.example" |
| 131 |
|
| 132 |
- # disable mod_irc |
| 133 |
+ # disable mod_irc in ejabberd.cfg |
| 134 |
if ! use mod_irc; then |
| 135 |
sed -i -e "s/{mod_irc,/%{mod_irc,/" \ |
| 136 |
-i ejabberd.cfg.example || die "Failed to disable mod_irc" |
| 137 |
fi |
| 138 |
+ |
| 139 |
+ if use mod_srl; then |
| 140 |
+ cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die |
| 141 |
+ fi |
| 142 |
} |
| 143 |
|
| 144 |
src_configure() { |
| 145 |
@@ -152,10 +157,10 @@ |
| 146 |
source "${EROOT}/etc/conf.d/ejabberd" |
| 147 |
ewarn |
| 148 |
ewarn "!!! WARNING !!! WARNING !!! WARNING !!! WARNING !!!" |
| 149 |
- ewarn "Starting with 2.1.x some pathes and configuration files were" |
| 150 |
- ewarn "changed to better reflect upstream intentions. Notable changes are:" |
| 151 |
+ ewarn "Starting with 2.1.x some paths and configuration files were" |
| 152 |
+ ewarn "changed to reflect upstream intentions better. Notable changes are:" |
| 153 |
ewarn |
| 154 |
- ewarn "1. Everything (even init scripts) are now handled by ejabberdctl script." |
| 155 |
+ ewarn "1. Everything (even init scripts) is now handled with ejabberdctl script." |
| 156 |
ewarn "Thus main configuration file became /etc/jabberd/ejabberdctl.cfg" |
| 157 |
ewarn "You must update ERLANG_NODE there with the value of EJABBERD_NODE" |
| 158 |
ewarn "from /etc/conf.d/ejebberd or ejabberd will refuse to start." |
Archives