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.19/master updated. glibc-2.19-6-g5ed2072
- From: allan at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 4 May 2014 04:18:38 -0000
- Subject: GNU C Library master sources branch release/2.19/master updated. glibc-2.19-6-g5ed2072
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.19/master has been updated
via 5ed20724012043e91683bcd5fcea197f59ae4120 (commit)
via 526fbebbbe7ceaf16230fe7a7ebf37c8849a835e (commit)
from 092976fd2ff67b074ff14fd4ad8bd8abb8a9dcac (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=5ed20724012043e91683bcd5fcea197f59ae4120
commit 5ed20724012043e91683bcd5fcea197f59ae4120
Author: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Mon Mar 10 23:17:07 2014 -0500
misc/sys/xattr.h: guard against linux uapi header inclusion
If the glibc xattr.h header is included after the uapi header,
compilation fails due to an enum re-using a #define from the
uapi header. Protect against this by guarding the define and
enum inclusions against each other.
(A corresponding kernel patch has been sent here:
http://lkml.org/lkml/2014/3/7/331 )
(See https://lists.debian.org/debian-glibc/2014/03/msg00029.html
and https://sourceware.org/glibc/wiki/Synchronizing_Headers
for more information.)
Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
(cherry picked from commit fdbe8eae2b9aed74dabba1b0a189c5d7d61bf032)
diff --git a/misc/sys/xattr.h b/misc/sys/xattr.h
index 929cd87..796df90 100644
--- a/misc/sys/xattr.h
+++ b/misc/sys/xattr.h
@@ -26,6 +26,7 @@ __BEGIN_DECLS
/* The following constants should be used for the fifth parameter of
`*setxattr'. */
+#ifndef __USE_KERNEL_XATTR_DEFS
enum
{
XATTR_CREATE = 1, /* set value, fail if attr already exists. */
@@ -33,6 +34,7 @@ enum
XATTR_REPLACE = 2 /* set value, fail if attr does not exist. */
#define XATTR_REPLACE XATTR_REPLACE
};
+#endif
/* Set the attribute NAME of the file pointed to by PATH to VALUE (which
is SIZE bytes long). Return 0 on success, -1 for errors. */
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=526fbebbbe7ceaf16230fe7a7ebf37c8849a835e
commit 526fbebbbe7ceaf16230fe7a7ebf37c8849a835e
Author: Allan McRae <allan@archlinux.org>
Date: Sun May 4 13:35:16 2014 +1000
Update Esperanto translations
(cherry picked from commit d69aeb123961252ddd2a23acc7dc9ce0ae2cfa5f)
diff --git a/ChangeLog b/ChangeLog
index 766382d..32b0dae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-05-04 Allan McRae <allan@archlinux.org>
+
+ * po/eo.po: Update Esperanto translation from translation project.
+
2014-05-01 David S. Miller <davem@davemloft.net>
[BZ #16885]
diff --git a/po/eo.po b/po/eo.po
index d01582d..f6ea766 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: libc 2.18.90.20140105\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-01-05 17:40+1000\n"
-"PO-Revision-Date: 2014-01-08 21:23+0100\n"
+"PO-Revision-Date: 2014-04-22 22:50+0200\n"
"Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n"
"Language: eo\n"
@@ -967,7 +967,7 @@ msgstr "mankas dosieraj argumentoj"
#. TRANS expected to already exist.
#: elf/ldd.bash.in:147 sysdeps/gnu/errlist.c:36
msgid "No such file or directory"
-msgstr "Dosiero aü dosierujo ne ekzistas"
+msgstr "Dosiero aÅ dosierujo ne ekzistas"
#: elf/ldd.bash.in:150 inet/rcmd.c:488
msgid "not regular file"
@@ -992,7 +992,7 @@ msgstr "eraro: vi ne havas permeson legi"
#: elf/pldd-xx.c:105
#, c-format
msgid "cannot find program header of process"
-msgstr ""
+msgstr "ne eblas trovi programÄ?apon de procezo"
#: elf/pldd-xx.c:110
#, c-format
@@ -1055,7 +1055,7 @@ msgstr "ne eblas malfermi %s/task"
#: elf/pldd.c:145
#, c-format
msgid "cannot prepare reading %s/task"
-msgstr ""
+msgstr "ne eblas prepari legado de %s/task"
#: elf/pldd.c:158
#, c-format
@@ -1070,7 +1070,7 @@ msgstr ""
#: elf/pldd.c:261
#, c-format
msgid "cannot get information about process %lu"
-msgstr ""
+msgstr "ne eblas ekhavi informon pri procezo %lu"
#: elf/pldd.c:274
#, c-format
@@ -1080,7 +1080,7 @@ msgstr "procezo %lu ne estas ELF-programo"
#: elf/readelflib.c:34
#, c-format
msgid "file %s is truncated\n"
-msgstr ""
+msgstr "dosiero %s trunkiÄ?is\n"
#: elf/readelflib.c:66
#, c-format
@@ -1105,7 +1105,7 @@ msgstr ""
#: elf/readelflib.c:108
#, c-format
msgid "more than one dynamic segment\n"
-msgstr ""
+msgstr "pli ol unu dinamika segmento\n"
#: elf/readlib.c:96
#, c-format
@@ -1191,7 +1191,7 @@ msgstr ""
#: elf/sotruss.ksh:46
msgid "Mandatory arguments to long options are also mandatory for any corresponding\\nshort options.\\n"
-msgstr ""
+msgstr "Endaj argumentoj por longaj opcioj ankaÅ endas por korespondaj mallongaj opcioj.\\n"
#: elf/sotruss.ksh:55
msgid "%s: option requires an argument -- '%s'\\n"
@@ -1576,7 +1576,7 @@ msgstr "malsukcesis eltrovi statinformon"
#: inet/rcmd.c:493
msgid "cannot open"
-msgstr ""
+msgstr "ne eblas malfermi"
#: inet/rcmd.c:495
msgid "fstat failed"
@@ -5788,7 +5788,7 @@ msgstr "Eraro de en-eligo"
#. TRANS computer.
#: sysdeps/gnu/errlist.c:82
msgid "No such device or address"
-msgstr "Tiu aparato aü adreso ne ekzistas"
+msgstr "Tiu aparato aÅ adreso ne ekzistas"
#. TRANS Argument list too long; used when the arguments passed to a new program
#. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
@@ -6311,7 +6311,7 @@ msgstr "Ne subtenatas"
#. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
#: sysdeps/gnu/errlist.c:931
msgid "Invalid or incomplete multibyte or wide character"
-msgstr "Nevalida aü nekompleta plurbajta aü larÄ?a signo"
+msgstr "Nevalida aÅ nekompleta plurbajta aÅ larÄ?a signo"
#. TRANS On @gnuhurdsystems{}, servers supporting the @code{term} protocol return
#. TRANS this error for certain operations when the caller is not in the
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
misc/sys/xattr.h | 2 ++
po/eo.po | 22 +++++++++++-----------
3 files changed, 17 insertions(+), 11 deletions(-)
hooks/post-receive
--
GNU C Library master sources