Erlang/OTP Forums

Author Message

<  Ejabberd mailing list  ~  applying s2s_proxying.patch

Guest
Posted: Wed Mar 07, 2007 3:22 am Reply with quote
Guest
Can somebody help me to patch this?

I'm doing this, but i can see the mod_s2s_proxy.erl

ejabberd@xanthe:~/ejabberd-1.1.3/src$ patch -p1 < s2s_proxy.patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ejabberd.orig/src/ejabberd_config.erl
ejabberd/src/ejabberd_config.erl
|--- ejabberd.orig/src/ejabberd_config.erl 2006-09-25
11:47:10.000000000 +1000
|+++ ejabberd/src/ejabberd_config.erl 2006-09-25 11:59:32.000000000 +1000
--------------------------
File to patch:
Skip this patch? [y]
ejabberd@xanthe:~/ejabberd-1.1.3/src$ patch -p0 -i s2s_proxy.patch
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ejabberd.orig/src/ejabberd_config.erl
ejabberd/src/ejabberd_config.erl
|--- ejabberd.orig/src/ejabberd_config.erl 2006-09-25
11:47:10.000000000 +1000
|+++ ejabberd/src/ejabberd_config.erl 2006-09-25 11:59:32.000000000 +1000
--------------------------
File to patch: ejabberd_config.erl
patching file ejabberd_config.erl
Reversed (or previously applied) patch detected! Assume -R? [n] R
Apply anyway? [n] y
Hunk #1 FAILED at 112.
1 out of 1 hunk FAILED -- saving rejects to file ejabberd_config.erl.rej
can't find file to patch at input line 16
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ejabberd.orig/src/ejabberd_s2s.erl ejabberd/src/ejabberd_s2s.erl
|--- ejabberd.orig/src/ejabberd_s2s.erl 2006-09-25 11:47:10.000000000 +1000
|+++ ejabberd/src/ejabberd_s2s.erl 2006-09-25 12:00:36.000000000 +1000
--------------------------
File to patch: ejabberd_s2s.erl
patching file ejabberd_s2s.erl
Hunk #1 FAILED at 19.
Hunk #2 FAILED at 209.
2 out of 2 hunks FAILED -- saving rejects to file ejabberd_s2s.erl.rej
can't find file to patch at input line 68
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Naur ejabberd.orig/src/ejabberd_s2s_in.erl
ejabberd/src/ejabberd_s2s_in.erl
|--- ejabberd.orig/src/ejabberd_s2s_in.erl 2006-09-25
11:47:10.000000000 +1000
|+++ ejabberd/src/ejabberd_s2s_in.erl 2006-09-25 11:59:32.000000000 +1000
--------------------------
File to patch: ejabberd_s2s_in.erl
patching file ejabberd_s2s_in.erl
Reversed (or previously applied) patch detected! Assume -R? [n] R
Apply anyway? [n] y
Hunk #1 FAILED at 45.
Hunk #2 FAILED at 117.
Hunk #3 FAILED at 357.
Hunk #4 FAILED at 399.
Hunk #5 succeeded at 542 with fuzz 2 (offset 29 lines).
4 out of 5 hunks FAILED -- saving rejects to file ejabberd_s2s_in.erl.rej
The next patch would create the file ejabberd/src/mod_s2s_proxy.erl,
which already exists! Assume -R? [n] y
patching file ejabberd/src/mod_s2s_proxy.erl

--
-----------------------------------------------
Manuel Mely P

Display posts from previous:  

All times are GMT
Page 1 of 1
This forum is locked: you cannot post, reply to, or edit topics.

Jump to:  

You cannot post new topics in this forum
You cannot reply to topics in this forum
You cannot edit your posts in this forum
You cannot delete your posts in this forum
You cannot vote in polls in this forum
You can attach files in this forum
You can download files in this forum