rpms/glibc/devel glibc-fedora.patch,1.264,1.265

[Jakub Jelinek (jakub)]

Author: jakub

Update of /cvs/pkgs/rpms/glibc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9382

Modified Files:
	glibc-fedora.patch 
Log Message:
2.7.90-14

glibc-fedora.patch:

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -r1.264 -r1.265
--- glibc-fedora.patch	8 Apr 2008 09:26:11 -0000	1.264
+++ glibc-fedora.patch	8 Apr 2008 15:17:07 -0000	1.265
@@ -2481,3 +2481,20 @@
  
  	cfi_startproc;
  PSEUDO_END (BP_SYM (__clone))
+--- libc/locale/programs/ld-collate.c	19 Mar 2008 06:43:32 -0000	1.127
++++ libc/locale/programs/ld-collate.c	8 Apr 2008 15:03:46 -0000	1.128
+@@ -3195,6 +3195,14 @@ error while adding equivalent collating 
+ 	  break;
+ 
+ 	case tok_script:
++	  /* Ignore the rest of the line if we don't need the input of
++	     this line.  */
++	  if (ignore_content)
++	    {
++	      lr_ignore_rest (ldfile, 0);
++	      break;
++	    }
++
+ 	  /* We get told about the scripts we know.  */
+ 	  arg = lr_token (ldfile, charmap, result, repertoire, verbose);
+ 	  if (arg->tok != tok_bsymbol)