[hobbit] 4.2 and Patches question

[Rob Munsch]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Ralph Mitchell wrote:
> On 9/21/06, Nicolas Dorfsman <ndo at unikservice.com> wrote:
>>
>> I did use this list.  Bad result :
>>
> 
>> patching file web/hobbit-confreport.c
>> Hunk #1 FAILED at 600.
>> Hunk #2 succeeded at 649 (offset 12 lines).
>> 1 out of 2 hunks FAILED -- saving rejects to file web/hobbit-
>> confreport.c.rej
> 

Identical results for me.

> I got the same, but I was applying only one patch at a time, so I was
> able to eyeball the reject file, web/hobbit-confreport.c.rej, and make
> manual updates.  In your case, the second patch failure probably

I did a batch like Nick.  My (second) .rej has only:

- -----
# cat web/hobbit-confreport.c.rej
***************
*** 8,14 ****
  /*
        */

/*----------------------------------------------------------------------------*/

- - static char rcsid[] = "$Id: hobbit-confreport.c,v 1.17 2006/08/14
20:46:24 henrik Exp henrik $";

  #include <sys/types.h>
  #include <sys/stat.h>
- --- 8,14 ----
  /*
        */

/*----------------------------------------------------------------------------*/

+ static char rcsid[] = "$Id: hobbit-confreport.c,v 1.18 2006/08/18
20:37:26 henrik Exp henrik $";

  #include <sys/types.h>
  #include <sys/stat.h>
- -----

So i can see why this fails; the hobbit-confreport.c i have, even after
the patch batch, is 1.15!


> overwrote the first reject file, but you may still be able to correct
> it because both failures happen around line 600 of
> hobbit-confreport.c, if I recall correctly.
> 
> Anyway, after manual corrections, the compile worked just fine.

Since this seems consistent, mind hinting at what the first failure was?
  The second seems to be just... the version line... expecting to change
1.17 to 1.18, it finds 1.15.  Okay.  But what's the line ~600 correction..?

I went over the .patches and the web/ files manually, and i can't find
what's missing.  Configure runs, make bombs:

- -----
gcc -g -O2 -Wall -Wno-unused -D_REENTRANT -D_LARGEFILE_SOURCE
- -D_FILE_OFFSET_BITS=64 -DLINUX -I. -I/home/rmunsch/hobbit-4.2.0/include
- -I/usr/include -c -o hobbit-confreport.o hobbit-confreport.c
hobbit-confreport.c: In function 'print_host':
hobbit-confreport.c:271: warning: pointer targets in assignment differ
in signedness
hobbit-confreport.c:473: warning: pointer targets in assignment differ
in signedness
hobbit-confreport.c: In function 'main':
hobbit-confreport.c:683: error: incompatible types in assignment
hobbit-confreport.c:684: error: incompatible types in assignment
hobbit-confreport.c:685: error: incompatible types in assignment
hobbit-confreport.c:695: error: incompatible types in assignment
hobbit-confreport.c:696: error: incompatible types in assignment
hobbit-confreport.c:697: error: incompatible types in assignment
hobbit-confreport.c:704: error: incompatible types in assignment
hobbit-confreport.c:705: error: incompatible types in assignment
hobbit-confreport.c:706: error: incompatible types in assignment
make[1]: *** [hobbit-confreport.o] Error 1
make[1]: Leaving directory `/home/rmunsch/hobbit-4.2.0/web'
make: *** [web-build] Error 2
- -----


- --
Rob Munsch
Solutions For Progress IT
www.solutionsforprogress.com
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFFEuadBvBcJFK6xYURAr+WAJ93yXc9m5DimahCcIxYZhWuM2FkUgCfXlRU
G1kzKqWgrqWvFg7a2Z6wtnY=
=Q0k0
-----END PGP SIGNATURE-----