[ejabberd] administration of contacts

Márcio Luciano Donada mdonada at auroraalimentos.com.br
Wed Sep 15 17:24:51 MSD 2010


Em 14/9/2010 21:17, Konstantin Khomoutov escreveu:
> subdirectory is located.

Thanks,
I execute the patch successfully, but below follows some logs files that
the process failed, is this normal?

jabber# patch -p1 < ejab72-roster-access.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|commit 03526442cf5125e6e965d172e9390d6c71042eff
|Author: Badlop <badlop at process-one.net>
|Date:   Fri Aug 15 01:04:25 2008 +0200
|
|    Add access rules to mod_roster (EJAB-72)
|
|    Implement access option in mod_roster,
|    mod_roster_odbc and also used in ejabberd_c2s.
|    Includes documentation.
|
|diff --git a/doc/guide.html b/doc/guide.html
|index 572a5df..64f227e 100644
|--- a/doc/guide.html
|+++ b/doc/guide.html
--------------------------
Patching file doc/guide.html using Plan A...
Hunk #1 failed at 2470.
1 out of 1 hunks failed--saving rejects to doc/guide.html.rej
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/doc/guide.tex b/doc/guide.tex
|index e4bf8e7..f2584d1 100644
|--- a/doc/guide.tex
|+++ b/doc/guide.tex
--------------------------
Patching file doc/guide.tex using Plan A...
Hunk #1 failed at 3165.
1 out of 1 hunks failed--saving rejects to doc/guide.tex.rej
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 54ef21d..5d8795e 100644
|--- a/src/ejabberd_c2s.erl
|+++ b/src/ejabberd_c2s.erl
--------------------------
Patching file src/ejabberd_c2s.erl using Plan A...
Hunk #1 failed at 1573.
Hunk #2 failed at 1584.
Hunk #3 succeeded at 1814 with fuzz 2 (offset 198 lines).
2 out of 3 hunks failed--saving rejects to src/ejabberd_c2s.erl.rej
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 387bd7b..f6c5732 100644
|--- a/src/mod_roster.erl
|+++ b/src/mod_roster.erl
--------------------------
Patching file src/mod_roster.erl using Plan A...
Hunk #1 succeeded at 137 (offset 20 lines).
Hunk #2 succeeded at 261 (offset 74 lines).
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/src/mod_roster_odbc.erl b/src/mod_roster_odbc.erl
|index 94b45ea..aae8908 100644
|--- a/src/mod_roster_odbc.erl
|+++ b/src/mod_roster_odbc.erl
--------------------------
Patching file src/mod_roster_odbc.erl using Plan A...
Hunk #1 succeeded at 127 (offset 15 lines).
Hunk #2 succeeded at 291 (offset 79 lines).
done


-- 
Márcio Luciano Donada <mdonada -at- auroraalimentos -dot- com -dot- br>
Aurora Alimentos - Cooperativa Central Oeste Catarinense
Departamento de T.I.


More information about the ejabberd mailing list