GNU C Library master sources branch, fedora/master, updated. fedora/glibc-2.11.90-18-2-g1ef1727

schwab@sourceware.org schwab@sourceware.org
Tue Apr 13 14:35:00 GMT 2010


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, fedora/master has been updated
       via  1ef17274decb5381a50a2146cb3444630f67b527 (commit)
       via  4f7ee9b3d798442cdd85b8223df80272af9507cd (commit)
      from  973dc1b24b6e0ee01d3e90b17f9b6d53ee1baa68 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=1ef17274decb5381a50a2146cb3444630f67b527

commit 1ef17274decb5381a50a2146cb3444630f67b527
Author: Andreas Schwab <schwab@redhat.com>
Date:   Tue Apr 13 12:09:56 2010 +0200

    2.11.90-19

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index e2cb1c4..70aeea5 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -20,7 +20,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 18
+Release: 19
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -1026,6 +1026,9 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Apr 13 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-19
+- Avoid multiarch memcmp in tzdata-update (#581677)
+
 * Mon Apr 12 2010 Andreas Schwab <schwab@redhat.com> - 2.11.90-18
 - Update from master
   - Implement interfaces to set and get names of threads (BZ#11390)

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=4f7ee9b3d798442cdd85b8223df80272af9507cd

commit 4f7ee9b3d798442cdd85b8223df80272af9507cd
Author: H.J. Lu <hongjiu.lu@intel.com>
Date:   Tue Apr 13 10:36:21 2010 +0200

    Avoid multiarch memcmp in tzdata-update

diff --git a/fedora/tzdata-update.c b/fedora/tzdata-update.c
index 988fb55..33bb8c6 100644
--- a/fedora/tzdata-update.c
+++ b/fedora/tzdata-update.c
@@ -397,6 +397,16 @@ char buffer[32768], data[32768];
 size_t datasize;
 char zonename[1024];
 
+static int
+simple_memcmp (const char *s1, const char *s2, size_t n)
+{
+  int ret = 0;
+
+  while (n--
+	 && (ret = *(unsigned char *) s1++ - *(unsigned char *) s2++) == 0);
+  return ret;
+}
+
 ssize_t
 readall (int fd, void *buf, size_t len)
 {
@@ -455,7 +465,8 @@ update (const char *filename)
   if (ret <= 0 || (size_t) ret == sizeof (buffer))
     return;
   /* Don't update the file unnecessarily.  */
-  if ((size_t) ret == datasize && memcmp (buffer, data, datasize) == 0)
+  if ((size_t) ret == datasize
+      && simple_memcmp (buffer, data, datasize) == 0)
     return;
   size_t len = strlen (filename);
   char tempfilename[len + sizeof (".tzupdate")];
@@ -507,7 +518,7 @@ main (int argc, char **argv)
   while (p != NULL)
     {
       while (*p == ' ' || *p == '\t') p++;
-      if (memcmp (p, "ZONE", 4) == 0)
+      if (simple_memcmp (p, "ZONE", 4) == 0)
 	{
 	  p += 4;
 	  while (*p == ' ' || *p == '\t') p++;

-----------------------------------------------------------------------

Summary of changes:
 fedora/glibc.spec.in   |    5 ++++-
 fedora/tzdata-update.c |   15 +++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list