Bad xattrs.diff [was: Re: patches/ dir missing in pre8 ?]

[Simo Sorce]

On Sat, 2008-02-02 at 22:31 +0100, Vitorio Machado wrote:
> How did you proceed to patch?
> 
> Here:
> iMac:~ lag$ mv  /Users/lag/Desktop/rsync-3.0.0pre8\ 2/patches/ /Users/ 
> lag/Desktop/rsync-3.0.0pre8/
> iMac:~ lag$ cd Desktop/rsync-3.0.0pre8
> iMac:~/Desktop/rsync-3.0.0pre8 lag$ patch -p1 <patches/acls.diff
> patching file acls.c
> patching file compat.c
> patching file proto.h
> iMac:~/Desktop/rsync-3.0.0pre8 lag$ patch -p1 <patches/xattrs.diff
> patching file compat.c
> patching file xattrs.c
> patching file proto.h
> Reversed (or previously applied) patch detected!  Assume -R? [n] n
> Apply anyway? [n] n
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file proto.h.rej
> iMac:~/Desktop/rsync-3.0.0pre8 lag$ ./configure
> configure.sh: Configuring rsync 3.0.0pre8
> 
> And it goes fine... As you said both acl and xattr try to patch  
> proto, just skip the second one and everything is ok.
> Dunno if this should be considered a bug or something wanted.

I know it goes fine if you ignore the errors, but it forces me to do
something like this in the .spec file:

patch -N -p1 -i patches/xattrs.diff || :

because patch will return an error anyway (even with -N)

And this is not only ugly  but dangerous (a rebuild later on may not
catch other errors that should not be ignored).

If it is considered normal that xattrs.diff conflicts with acls.diff I
will add a local patch to patch xattrs.diff before applying it ...

Simo.

-- 
Simo Sorce * Red Hat, Inc * New York