Re: Broken nbpatch on Solaris?

[Joerg Sonnenberger <joerg%britannica.bec.de@localhost>]

On Mon, Oct 19, 2009 at 12:56:38PM +0100, raymond.meyer%rambler.ru@localhost 
wrote:
> I'm using pretty recent pkgsrc tree on Sparc Solaris with GCC-4.4.1, I
> keep seeing the following error messages with various packages:
> 
> => Applying pkgsrc patches for kdelibs-3.5.10nb4
> mmap failed: Invalid argument
> No such line 864 in input file, ignoring
> 
> Any idea what's going here?

Can you try the attached patch?

Joerg

Index: inp.c
===================================================================
RCS file: /home/joerg/repo/netbsd/pkgsrc/devel/nbpatch/files/inp.c,v
retrieving revision 1.5
diff -u -p -r1.5 inp.c
--- inp.c       5 Jun 2009 20:00:26 -0000       1.5
+++ inp.c       19 Oct 2009 12:20:47 -0000
@@ -269,7 +269,7 @@ plan_a(const char *filename)
        if ((ifd = open(filename, O_RDONLY)) < 0)
                pfatal("can't open file %s", filename);
 
-       i_womp = mmap(NULL, i_size, PROT_READ, MAP_PRIVATE, ifd, 0);
+       i_womp = mmap(NULL, i_size, PROT_READ, MAP_FILE | MAP_PRIVATE, ifd, 0);
        if (i_womp == MAP_FAILED) {
                perror("mmap failed");
                i_womp = NULL;