[ejabberd] applying s2s_proxying.patch

Manuel Mely mmelyp at gmail.com
Wed Mar 7 05:22:06 MSK 2007


Can somebody help me to patch this?

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

ejabberd at 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 at 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érez
2do Año Ingeniería en Telecomunicaciones. CUJAE
Email1: mmelyp at gmail.com
Email2: manuel.mp at feestudiantes.cujae.edu.cu
Jabber ID1: mely at softwarelibre.cu
Jabber ID2: mely at jabber.cujae.edu.cu
Registered Linux User: #312357
Registered Ubuntu User: #4750
My Blog: http://mmelyp.blogspot.com
Site: http://www.minbas.cu/
-----------------------------------------------

...pero dos no es igual que uno mas uno ...
JSabina

-- 
This message has been scanned on mx1.home.cu for viruses and
dangerous content by MailScanner, and is
believed to be clean.



More information about the ejabberd mailing list