FYI...
I found the stream.c version I was looking for on sourceforge:
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/amanda/amanda/common-src/stream.c

I just replaced the 1.10.2.7 version with the 1.10.2.8 version before 
applying the patch and it seems to be working (at least amrecover runs 
now).  Now I just need to try some restores...

Please let me know if this was the incorrect thing to do.

Hope it helps someone else searching the archives.
Jason Upton
[EMAIL PROTECTED]

Jason Upton wrote:

> I have compiled amanda 2.4.2p2 with the --with-port-range option and 
> am getting the "amrecover: did not get a reserved port" message.  
> Amanda has been backing up fine as far as I can tell, but I wanted to 
> test the restore capabilities before I actually needed them and found 
> that I have this problem.
>
> So I searched the yahoo groups archive for amanda-users and found a 
> patch located at www.amanda.org/patches.html (real location of patch 
> file is http://www.amanda.org/patches/2.4.2p2/stream_client.diff) and 
> tried to apply it, but it appears the patch was generated against a 
> different version of common-src/stream.c than what I have downloaded 
> with the 2.4.2p2 tar file release.
>
> Here is what I see when applying the patch:
> # patch -p0 < stream_client.diff
> patching file common-src/stream.c
> Hunk #1 succeeded at 145 (offset 2 lines).
> Hunk #2 succeeded at 159 with fuzz 1 (offset 3 lines).
> Hunk #3 succeeded at 180 (offset 3 lines).
> Hunk #4 succeeded at 198 (offset 3 lines).
> Hunk #5 succeeded at 213 (offset 3 lines).
> Hunk #6 succeeded at 263 (offset 3 lines).
> Hunk #7 succeeded at 275 (offset 3 lines).
> Hunk #8 FAILED at 285.
> Hunk #9 succeeded at 307 (offset 5 lines).
> 1 out of 9 hunks FAILED -- saving rejects to file common-src/stream.c.rej
> patching file common-src/stream.h
> patching file recover-src/amrecover.c
> Hunk #1 succeeded at 513 (offset -11 lines).
> patching file recover-src/extract_list.c
>
> I checked the patch file and see that stream.c was diff'd with version 
> 1.10.2.8:
> diff -u -r1.10.2.8
> --- common-src/stream.c 2001/06/18 22:23:19     1.10.2.8
> +++ common-src/stream.c 2001/07.30 19:13:19
>
> My amanda 2.4.2p2 tar ball has the 1.10.2.7 version of 
> common-src/stream.c:
> $Id: stream.c,v 1.10.2.7 2001/02/28 00:53:15 jrjackson Exp $
>
> Is this why the patch is failing?  If so, how do I patch my 1.10.2.7 
> to be 1.10.2.8 before I apply the stream_client.diff patch?
>
> Thanks for any help,
> Jason Upton
> [EMAIL PROTECTED]
>
>
>


Reply via email to