CVS: src/si/patches glibc-2.2.5.lsb.patch,1.1,1.2

Mats Wichmann <[email protected]> Tue, 24 Jun 2003 12:48:51 -0700
Newsgroups gmane.linux.lsb.implementation
Message-ID <[email protected]>
Update of /cvsroot/lsb/src/si/patches
In directory sc8-pr-cvs1:/tmp/cvs-serv27894/patches

Modified Files:
	glibc-2.2.5.lsb.patch 
Log Message:
SOme final 1.3.1 changes: commit glibc glob change; build pam and xfree86
in phase2/intermediate (comment out of package-build.xml if this doesn't
work out right)


Index: glibc-2.2.5.lsb.patch
===================================================================
RCS file: /cvsroot/lsb/src/si/patches/glibc-2.2.5.lsb.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** glibc-2.2.5.lsb.patch	30 Aug 2002 20:05:13 -0000	1.1
--- glibc-2.2.5.lsb.patch	24 Jun 2003 19:48:49 -0000	1.2
***************
*** 10,13 ****
--- 10,16 ----
  - fix decimal format with 'h' flag and positional argument
  
+     sysdeps/generic/glob.c
+ - fix core dump in certain tests on non-x86 platforms
+ 
      sysdeps/posix/readv.c
      sysdeps/posix/writev.c
***************
*** 68,71 ****
--- 71,94 ----
   	  is_negative = signed_number < 0;				      \
   	  number.word = is_negative ? (- signed_number) : signed_number;      \
+ diff -Naurw glibc-2.2.5/sysdeps/generic/glob.c glibc-2.2.5.lsb/sysdeps/generic/glob.c
+ --- glibc-2.2.5/sysdeps/generic/glob.c
+ +++ glibc-2.2.5.lsb/sysdeps/generic/glob.c
+ @@ -1056,7 +1056,7 @@
+  globfree (pglob)
+       register glob_t *pglob;
+  {
+ -  if (pglob->gl_pathv != NULL)
+ +  if (pglob->gl_pathc && pglob->gl_pathv != NULL)
+      {
+        size_t i;
+        for (i = 0; i < pglob->gl_pathc; ++i)
+ @@ -1064,6 +1064,7 @@
+  	  free ((__ptr_t) pglob->gl_pathv[pglob->gl_offs + i]);
+        free ((__ptr_t) pglob->gl_pathv);
+      }
+ +  pglob->gl_pathc = 0;
+  }
+  
+  
  diff -Naurw glibc-2.2.5/sysdeps/posix/readv.c glibc-2.2.5.lsb/sysdeps/posix/readv.c
  --- glibc-2.2.5/sysdeps/posix/readv.c	Thu Jul  5 22:56:01 2001