rpms/netpbm/devel netpbm-10.35-glibc.patch, 1.1, 1.2 netpbm.spec, 1.137, 1.138

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/netpbm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14228

Modified Files:
	netpbm-10.35-glibc.patch netpbm.spec 
Log Message:
- avoid clashes with getline() from glibc


netpbm-10.35-glibc.patch:

Index: netpbm-10.35-glibc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm-10.35-glibc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- netpbm-10.35-glibc.patch	23 Aug 2007 07:53:36 -0000	1.1
+++ netpbm-10.35-glibc.patch	14 Apr 2009 10:33:48 -0000	1.2
@@ -11,3 +11,41 @@
  
    while ( rt->in->hasMore( rt->in ) ) {
      if ( (err = rt->in->next( rt->in, &r, &g, &b )) ) goto exit ;
+diff -up netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc netpbm-10.35.62/converter/ppm/xvminitoppm.c
+--- netpbm-10.35.62/converter/ppm/xvminitoppm.c.glibc	2009-04-13 09:14:06.000000000 +0200
++++ netpbm-10.35.62/converter/ppm/xvminitoppm.c	2009-04-14 12:27:48.000000000 +0200
+@@ -52,7 +52,7 @@ parseCommandLine(int const argc,
+ 
+ 
+ static void
+-getline(FILE * const ifP,
++get_line(FILE * const ifP,
+         char * const buf,
+         size_t const size) {
+ 
+@@ -105,7 +105,7 @@ readXvHeader(FILE *         const ifP,
+     int rc;
+     bool endOfComments;
+     
+-    getline(ifP, buf, sizeof(buf));
++    get_line(ifP, buf, sizeof(buf));
+ 
+     if (!STRNEQ(buf, "P7 332", 6))
+         pm_error("Input is not a XV thumbnail picture.  It does not "
+@@ -113,14 +113,14 @@ readXvHeader(FILE *         const ifP,
+ 
+     endOfComments = FALSE;
+     while (!endOfComments) {
+-        getline(ifP, buf, sizeof(buf));
++        get_line(ifP, buf, sizeof(buf));
+         if (STRNEQ(buf, "#END_OF_COMMENTS", 16))
+             endOfComments = TRUE;
+         else if (STRNEQ(buf, "#BUILTIN", 8))
+             pm_error("This program does not know how to "
+                      "convert builtin XV thumbnail pictures");
+     }
+-    getline(ifP, buf, sizeof(buf));
++    get_line(ifP, buf, sizeof(buf));
+     rc = sscanf(buf, "%u %u %u", &cols, &rows, &maxval);
+     if (rc != 3)
+         pm_error("error parsing dimension info '%s'.  "


Index: netpbm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/netpbm/devel/netpbm.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- netpbm.spec	14 Apr 2009 10:05:35 -0000	1.137
+++ netpbm.spec	14 Apr 2009 10:33:48 -0000	1.138
@@ -238,6 +238,7 @@
 - upstream fixes pamstereogram
 - fix options in pamperspective, pbmtoepson, ppmpat, pamaddnoise
   so that they match their man pages (#483011, #483070, #483243, #483245)
+- avoid clashes with getline() from glibc
 
 * Tue Mar 31 2009 Jindrich Novy <jnovy at redhat.com> 10.35.61-2
 - remove two hunks from security patch breaking pbmclean and pbmlife (#493015)