diff options
Diffstat (limited to 'net-im/ejabberd')
| -rw-r--r-- | net-im/ejabberd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-im/ejabberd/ejabberd-2.1.4.ebuild | 5 | ||||
| -rw-r--r-- | net-im/ejabberd/files/ejabberd-2.1.4-mod_shared_roster_ldap.patch | 13 |
3 files changed, 23 insertions, 2 deletions
diff --git a/net-im/ejabberd/ChangeLog b/net-im/ejabberd/ChangeLog index b8e4566ffd94..9566434ef5f1 100644 --- 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.81 2010/07/12 17:34:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ChangeLog,v 1.82 2010/07/22 15:24:24 pva Exp $ + + 22 Jul 2010; Peter Volkov <pva@gentoo.org> ejabberd-2.1.4.ebuild, + +files/ejabberd-2.1.4-mod_shared_roster_ldap.patch: + Added patch for mod_shared_roster_ldap, thank Andrian Nord for report and + fix in bug #328533! 12 Jul 2010; Markos Chandras <hwoarang@gentoo.org> ejabberd-2.1.4.ebuild: Stable on amd64 wrt bug #308047 diff --git a/net-im/ejabberd/ejabberd-2.1.4.ebuild b/net-im/ejabberd/ejabberd-2.1.4.ebuild index 661a7df02c70..f1a15e61261c 100644 --- a/net-im/ejabberd/ejabberd-2.1.4.ebuild +++ b/net-im/ejabberd/ejabberd-2.1.4.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.4.ebuild,v 1.4 2010/07/12 17:34:58 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-im/ejabberd/ejabberd-2.1.4.ebuild,v 1.5 2010/07/22 15:24:24 pva Exp $ EAPI=3 @@ -86,7 +86,10 @@ src_prepare() { fi if use mod_srl; then + ewarn "mod_srl is not a part of upstream tarball but is a third-party module" + ewarn "taken from here: https://alioth.debian.org/projects/ejabberd-msrl/" cp "${WORKDIR}"/src/mod_shared_roster_ldap{.{e,h}rl,_helpers.erl} "${S}" || die + epatch "${FILESDIR}/ejabberd-2.1.4-mod_shared_roster_ldap.patch" #328533 fi } diff --git a/net-im/ejabberd/files/ejabberd-2.1.4-mod_shared_roster_ldap.patch b/net-im/ejabberd/files/ejabberd-2.1.4-mod_shared_roster_ldap.patch new file mode 100644 index 000000000000..5fbf3ee867ee --- /dev/null +++ b/net-im/ejabberd/files/ejabberd-2.1.4-mod_shared_roster_ldap.patch @@ -0,0 +1,13 @@ +diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl +index 8097385..44fd48e 100644 +--- a/src/mod_shared_roster_ldap.erl ++++ b/src/mod_shared_roster_ldap.erl +@@ -142,7 +142,7 @@ init([Host, Opts]) -> + State#state.port, + State#state.dn, + State#state.password, +- none); ++ []); + _ -> + eldap:start_link(State#state.eldap_id, + State#state.servers, |