This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, release/2.14/master, updated. glibc-2.14-52-g4f2b767
- From: schwab at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 7 Oct 2011 13:50:02 -0000
- Subject: GNU C Library master sources branch, release/2.14/master, updated. glibc-2.14-52-g4f2b767
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, release/2.14/master has been updated
via 4f2b767fef50f5f5c356c0c0e424fccc893a4ae6 (commit)
via a882ce88c5f5e391e0e31d55642d09d1c947226b (commit)
via 2ae6256336c3604b245094ef6e07ca52414b8a7e (commit)
from 8bd683657e8ab1e6e0e787d6c00e763d8393f5e5 (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=4f2b767fef50f5f5c356c0c0e424fccc893a4ae6
commit 4f2b767fef50f5f5c356c0c0e424fccc893a4ae6
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Oct 7 11:47:14 2011 +0200
glibc 2.14.1 release
diff --git a/ChangeLog b/ChangeLog
index 4b46b64..3263122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-10-07 Andreas Schwab <schwab@redhat.com>
+
+ * version.h (VERSION): Bump for 2.14.1 release.
+
2011-09-27 Andreas Schwab <schwab@redhat.com>
* nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn):
diff --git a/version.h b/version.h
index a5408b3..3b53b5a 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
/* This file just defines the current version number of libc. */
#define RELEASE "stable"
-#define VERSION "2.14"
+#define VERSION "2.14.1"
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a882ce88c5f5e391e0e31d55642d09d1c947226b
commit a882ce88c5f5e391e0e31d55642d09d1c947226b
Author: Andreas Schwab <schwab@redhat.com>
Date: Fri Oct 7 11:47:02 2011 +0200
NEWS for 2.14.1
diff --git a/NEWS b/NEWS
index a6b3832..bb517c2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,17 @@
-GNU C Library NEWS -- history of user-visible changes. 2011-6-4
+GNU C Library NEWS -- history of user-visible changes. 2011-10-07
Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
See the end for copying conditions.
Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
using `glibc' in the "product" field.
+Version 2.14.1
+
+* The following bugs are resolved with this release:
+
+ 9696, 11724, 12841, 12849, 12852, 12868, 12885, 12922, 12935, 13007,
+ 13114
+
Version 2.14
* The following bugs are resolved with this release:
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=2ae6256336c3604b245094ef6e07ca52414b8a7e
commit 2ae6256336c3604b245094ef6e07ca52414b8a7e
Author: Andreas Schwab <schwab@redhat.com>
Date: Mon Sep 26 17:49:14 2011 +0200
Correctly reparse group line after enlarging the buffer
(cherry picked from commit 32c76b63be605d12314e0c6ac2bd702c883d1423)
diff --git a/ChangeLog b/ChangeLog
index 1ee1880..4b46b64 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-27 Andreas Schwab <schwab@redhat.com>
+
+ * nss/nss_files/files-initgroups.c (_nss_files_initgroups_dyn):
+ Reread the line before reparsing it.
+
2011-08-29 Jiri Olsa <jolsa@redhat.com>
* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Fix cfi
diff --git a/nss/nss_files/files-initgroups.c b/nss/nss_files/files-initgroups.c
index 113abf2..c343b35 100644
--- a/nss/nss_files/files-initgroups.c
+++ b/nss/nss_files/files-initgroups.c
@@ -52,8 +52,10 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
gid_t *groups = *groupsp;
/* We have to iterate over the entire file. */
- while (!feof_unlocked (stream))
+ while (1)
{
+ fpos_t pos;
+ fgetpos (stream, &pos);
ssize_t n = getline (&line, &linelen, stream);
if (n < 0)
{
@@ -64,9 +66,8 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
}
struct group grp;
- int res;
- while ((res = _nss_files_parse_grent (line, &grp, buffer, buflen,
- errnop)) == -1)
+ int res = _nss_files_parse_grent (line, &grp, buffer, buflen, errnop);
+ if (res == -1)
{
size_t newbuflen = 2 * buflen;
if (buffer_use_malloc || ! __libc_use_alloca (buflen + newbuflen))
@@ -85,6 +86,9 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
}
else
buffer = extend_alloca (buffer, buflen, newbuflen);
+ /* Reread current line, the parser has clobbered it. */
+ fsetpos (stream, &pos);
+ continue;
}
if (res > 0 && grp.gr_gid != group)
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 9 +++++++++
NEWS | 9 ++++++++-
nss/nss_files/files-initgroups.c | 12 ++++++++----
version.h | 2 +-
4 files changed, 26 insertions(+), 6 deletions(-)
hooks/post-receive
--
GNU C Library master sources