r1275 - in glibc-package/branches/glibc-2.4/debian: . patches

[Clint Adams <schizo@costa.debian.org>]

Author: schizo
Date: 2006-03-09 01:15:06 +0000 (Thu, 09 Mar 2006)
New Revision: 1275

Removed:
   glibc-package/branches/glibc-2.4/debian/patches/regcomp_c.diff
Modified:
   glibc-package/branches/glibc-2.4/debian/changelog
   glibc-package/branches/glibc-2.4/debian/patches/series
Log:
    - Remove debian/patches/regcomp_c.diff (merged upstream).


Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog	2006-03-09 00:57:54 UTC (rev 1274)
+++ glibc-package/branches/glibc-2.4/debian/changelog	2006-03-09 01:15:06 UTC (rev 1275)
@@ -4,6 +4,7 @@
     - Remove sparc-socket-weakalias.diff (merged upstream).
     - Remove glibc235-dash.diff (merged upstream).
     - Remove glibc235-gcc4-sparc-inline.diff (merged upstream).
+    - Remove debian/patches/regcomp_c.diff (merged upstream).
 
  -- Clint Adams <schizo@debian.org>  Mon,  6 Mar 2006 16:49:38 -0500
 

Deleted: glibc-package/branches/glibc-2.4/debian/patches/regcomp_c.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/regcomp_c.diff	2006-03-09 00:57:54 UTC (rev 1274)
+++ glibc-package/branches/glibc-2.4/debian/patches/regcomp_c.diff	2006-03-09 01:15:06 UTC (rev 1275)
@@ -1,35 +0,0 @@
-CVSROOT:	/cvs/glibc
-Module name:	libc
-Changes by:	drepper@sources.redhat.com	2005-07-10 22:01:15
-
-Modified files:
-	posix          : regcomp.c 
-
-Log message:
-	(re_compile_internal): Call __libc_lock_init after init_dfa.
-
-===================================================================
-RCS file: /cvs/glibc/libc/posix/regcomp.c,v
-retrieving revision 1.95
-retrieving revision 1.96
-diff -u -r1.95 -r1.96
---- libc/posix/regcomp.c	2005/05/06 23:33:52	1.95
-+++ libc/posix/regcomp.c	2005/07/10 22:01:14	1.96
-@@ -774,8 +774,6 @@
-     }
-   preg->used = sizeof (re_dfa_t);
- 
--  __libc_lock_init (dfa->lock);
--
-   err = init_dfa (dfa, length);
-   if (BE (err != REG_NOERROR, 0))
-     {
-@@ -789,6 +787,8 @@
-   strncpy (dfa->re_str, pattern, length + 1);
- #endif
- 
-+  __libc_lock_init (dfa->lock);
-+
-   err = re_string_construct (&regexp, pattern, length, preg->translate,
- 			     syntax & RE_ICASE, dfa);
-   if (BE (err != REG_NOERROR, 0))

Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series	2006-03-09 00:57:54 UTC (rev 1274)
+++ glibc-package/branches/glibc-2.4/debian/patches/series	2006-03-09 01:15:06 UTC (rev 1275)
@@ -129,5 +129,4 @@
 #rtld.diff -p1
 #resource_h.diff -p1
 #hppa-inlining.diff -p1
-#regcomp_c.diff -p1
 #tst-setcontext_c.diff -p1