rsync server over SSH [includes code patches]

[Jeremy Hansen]

On Mon, 26 Nov 2001, Martin Pool wrote:

> > Actually, right now I'm just a rej on main.c
> > 
> > cali:/usr/src/redhat/SOURCES/rsync-2.4.6# patch -p0 < 
> > ../rsync-ssh-over-daemon.patch 
> > patching file `authenticate.c'
> > patching file `clientserver.c'
> > patching file `main.c'
> > Hunk #2 FAILED at 166.
> > Hunk #8 FAILED at 763.
> > 2 out of 8 hunks FAILED -- saving rejects to main.c.rej
> 
> Possibly this patch is against CVS HEAD.  
> 
> So you can either build against CVS (more useful, possibly more
> exciting), or try to integrate the rejected changes yourself by
> opening main.c in an editor and trying to insert the corresponding
> changes at the right place.  If you use emacs you might like to use
> emerge.
> 
> See http://cvs.samba.org/ for instructions on getting an anonymous cvs
> checkout.

Actually, that bombs pretty bad:

cali:~/rsync/rsync# patch -p0 < ../rsync-ssh-over-daemon.patch 
patching file `authenticate.c'
Hunk #1 succeeded at 203 (offset 1 line).
patching file `clientserver.c'
Hunk #1 FAILED at 29.
Hunk #2 FAILED at 49.
Hunk #3 succeeded at 120 (offset 20 lines).
Hunk #4 FAILED at 132.
Hunk #5 succeeded at 138 with fuzz 1 (offset 8 lines).
Hunk #6 succeeded at 173 with fuzz 1 (offset 20 lines).
Hunk #7 FAILED at 241.
Hunk #8 FAILED at 251.
Hunk #9 FAILED at 275.
Hunk #10 FAILED at 297.
Hunk #11 succeeded at 390 with fuzz 2 (offset 24 lines).
Hunk #12 succeeded at 407 (offset 29 lines).
Hunk #13 succeeded at 423 with fuzz 1 (offset 28 lines).
Hunk #14 succeeded at 455 (offset 29 lines).
Hunk #15 succeeded at 514 (offset 28 lines).
7 out of 15 hunks FAILED -- saving rejects to clientserver.c.rej
patching file `main.c'
Hunk #1 FAILED at 126.
Hunk #2 FAILED at 166.
Hunk #3 FAILED at 558.
Hunk #4 succeeded at 656 (offset 71 lines).
Hunk #5 succeeded at 615 with fuzz 1 (offset 2 lines).
Hunk #6 succeeded at 740 (offset 76 lines).
Hunk #7 succeeded at 766 with fuzz 2 (offset 25 lines).
Hunk #8 FAILED at 788.
4 out of 8 hunks FAILED -- saving rejects to main.c.rej
patching file `options.c'
Hunk #1 FAILED at 53.
Hunk #2 succeeded at 91 with fuzz 1 (offset 6 lines).
Hunk #3 succeeded at 149 (offset 43 lines).
Hunk #4 succeeded at 175 (offset 6 lines).
Hunk #5 succeeded at 242 with fuzz 2 (offset 49 lines).
Hunk #6 FAILED at 303.
Hunk #7 FAILED at 626.
Hunk #8 succeeded at 496 (offset -134 lines).
3 out of 8 hunks FAILED -- saving rejects to options.c.rej
patching file `proto.h'
Hunk #1 succeeded at 1 with fuzz 1.
Hunk #2 succeeded at 37 (offset 20 lines).
Hunk #3 succeeded at 153 with fuzz 2 (offset 6 lines).
patching file `rsync.1'
Hunk #1 FAILED at 1.
Hunk #7 succeeded at 637 with fuzz 2 (offset 11 lines).
Hunk #8 succeeded at 783 (offset 2 lines).
1 out of 8 hunks FAILED -- saving rejects to rsync.1.rej
patching file `socket.c'
Hunk #1 succeeded at 305 with fuzz 1 (offset 83 lines).
Hunk #2 FAILED at 355.
1 out of 2 hunks FAILED -- saving rejects to socket.c.rej

so it's probably not again cvs.  I'll try and hand patch it.

THanks
-jeremy

-- 
The trouble with being poor is that it takes up all your time.