[ejabberd] RES: mod_roster

Marcio Luciano Donada mdonada at auroraalimentos.com.br
Mon Nov 18 21:03:50 MSK 2013


Thanks... is perfect:

root at jabber:/usr/ports/net-im/ejabberd/work/ejabberd-2.1.13 # patch -p1 < ejab72-roster-access.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|From d7a0e8de237d8e425687a35adadc829729ed6a81 Mon Sep 17 00:00:00 2001
|From: Badlop <badlop at process-one.net>
|Date: Mon, 18 Nov 2013 16:48:21 +0100
|Subject: [PATCH] Add access rule to mod_roster (EJAB-72)
|
|---
| doc/guide.tex        | 24 ++++++++++++++++++++++++
| src/ejabberd_c2s.erl | 28 ++++++++++++++++++----------
| src/mod_roster.erl   | 14 ++++++++++++--
| 3 files changed, 54 insertions(+), 12 deletions(-)
|
|diff --git a/doc/guide.tex b/doc/guide.tex
|index 6b8e456..2607d2a 100644
|--- a/doc/guide.tex
|+++ b/doc/guide.tex
--------------------------
Patching file doc/guide.tex using Plan A...
Hunk #1 succeeded at 4030.
Hunk #2 succeeded at 4049.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
|index ed26400..0a62b33 100644
|--- a/src/ejabberd_c2s.erl
|+++ b/src/ejabberd_c2s.erl
--------------------------
Patching file src/ejabberd_c2s.erl using Plan A...
Hunk #1 succeeded at 1840.
Hunk #2 succeeded at 1850.
Hunk #3 succeeded at 1899.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/mod_roster.erl b/src/mod_roster.erl
|index b15497f..1a90adc 100644
|--- a/src/mod_roster.erl
|+++ b/src/mod_roster.erl
--------------------------
Patching file src/mod_roster.erl using Plan A...
Hunk #1 succeeded at 146 (offset 2 lines).
Hunk #2 succeeded at 445 (offset 2 lines).
Hunk #3 succeeded at 1515 (offset 34 lines).
Hmm...  Ignoring the trailing garbage.
done

__
Márcio Luciano Donada
Analista de Suporte
Depto de TI – Chapecó(SC)
Tel. (49) 33213262
VOIP: 66 16 3262
Cooperativa Central Aurora Alimentos

-----Mensagem original-----
De: ejabberd-bounces at jabber.ru [mailto:ejabberd-bounces at jabber.ru] Em nome de Badlop
Enviada em: segunda-feira, 18 de novembro de 2013 13:52
Para: ejabberd at jabber.ru
Assunto: Re: [ejabberd] mod_roster

No idea why applying that patch complains about another unrelated file.

Anyway, I've updated the patch in the ticket.


--
Badlop
ProcessOne



On 28 October 2013 21:03, Marcio Luciano Donada <mdonada at auroraalimentos.com.br> wrote:
> Im using patch for mod_roster, but last version in website [1] is date 
> 21/09/2010. I am trying to apply this patch in version 2.1.13 of the 
> ejabberd but am having dificultades as shown below, i'm using FreeBSD. 
> I see this patch is not right to version 2.1.13
>
> --------------------------
> |diff --git src/mod_muc/mod_muc_room.erl src/mod_muc/mod_muc_room.erl 
> |index 02c83ed..7693b66 100644
> |--- src/mod_muc/mod_muc_room.erl
> |+++ src/mod_muc/mod_muc_room.erl
> --------------------------
> File to patch:
>
> Can you help me?
>
> [1]. https://support.process-one.net/browse/EJAB-72
> __
> Márcio Luciano Donada
>
>
>
>
> _______________________________________________
> ejabberd mailing list
> ejabberd at jabber.ru
> http://lists.jabber.ru/mailman/listinfo/ejabberd
_______________________________________________
ejabberd mailing list
ejabberd at jabber.ru
http://lists.jabber.ru/mailman/listinfo/ejabberd


More information about the ejabberd mailing list