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.25/master updated. glibc-2.25-8-gf035c8d
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 31 Mar 2017 08:00:42 -0000
- Subject: GNU C Library master sources branch release/2.25/master updated. glibc-2.25-8-gf035c8d
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.25/master has been updated
via f035c8d055f25eaf6c93772f308afac10ce31ef2 (commit)
from 27ab0d9518746dfb59ed2ba59daefc981dc10e38 (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://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=f035c8d055f25eaf6c93772f308afac10ce31ef2
commit f035c8d055f25eaf6c93772f308afac10ce31ef2
Author: Slava Barinov <v.barinov@samsung.com>
Date: Fri Mar 31 08:49:25 2017 +0200
fts: Fix symbol redirect for fts_set [BZ #21289]
In a 32-bit environment with _FILE_OFFSET_BITS=64, the __REDIRECT macro
combined with __THROW generates an invalid C++ declaration.
(cherry picked from commit ce39613205dc47ceaeea76710d49e7a483b503ab)
diff --git a/ChangeLog b/ChangeLog
index ef5388c..85d6fc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-31 Slava Barinov <v.barinov@samsung.com>
+
+ [BZ #21289]
+ * io/fts.h (fts_set): Replace __REDIRECT with __REDIRECT_NTH.
+
2017-03-20 Mike Frysinger <vapier@gentoo.org>
[BZ #21275]
diff --git a/NEWS b/NEWS
index 9bf8c10..fee1cf8 100644
--- a/NEWS
+++ b/NEWS
@@ -9,10 +9,11 @@ Version 2.25.1
The following bugs are resolved with this release:
- [21109] Tunables broken on big-endian
- [21115] sunrpc: Use-after-free in error path in clntudp_call
[20257] sunrpc: clntudp_call does not enforce timeout when receiving data
[21015] Document and fix --enable-bind-now
+ [21109] Tunables broken on big-endian
+ [21115] sunrpc: Use-after-free in error path in clntudp_call
+ [21289] Fix symbol redirect for fts_set
Version 2.25
diff --git a/io/fts.h b/io/fts.h
index b9cff53..ab15567 100644
--- a/io/fts.h
+++ b/io/fts.h
@@ -193,7 +193,7 @@ FTS *__REDIRECT (fts_open, (char * const *, int,
int (*)(const FTSENT **, const FTSENT **)),
fts64_open);
FTSENT *__REDIRECT (fts_read, (FTS *), fts64_read);
-int __REDIRECT (fts_set, (FTS *, FTSENT *, int), fts64_set) __THROW;
+int __REDIRECT_NTH (fts_set, (FTS *, FTSENT *, int), fts64_set);
# else
# define fts_children fts64_children
# define fts_close fts64_close
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 5 +++--
io/fts.h | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources