summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-22 18:38:52 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:25:35 +0000
commit4fdec58c979bb9715a8ab92344ad05110aa57cc6 (patch)
treebde10ec6c162064f878eef36f1bd18ed78e561a8
parent4b39d90c84b1c1577b6744e7117502069c5bf719 (diff)
downloadopenembedded-core-4fdec58c979bb9715a8ab92344ad05110aa57cc6.tar.gz
openembedded-core-4fdec58c979bb9715a8ab92344ad05110aa57cc6.tar.bz2
openembedded-core-4fdec58c979bb9715a8ab92344ad05110aa57cc6.zip
eglibc: Backport upstream 2.17 patches
These two patches has been applied to eglibc 2.17 branch since we created our snapshot. Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-PR15003-r22243.patch207
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-r22178.patch9472
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.17.bb8
3 files changed, 9687 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-PR15003-r22243.patch b/meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-PR15003-r22243.patch
new file mode 100644
index 0000000000..a69302bb7d
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-PR15003-r22243.patch
@@ -0,0 +1,207 @@
+Index: libc/NEWS
+===================================================================
+--- libc/NEWS (revision 22242)
++++ libc/NEWS (revision 22243)
+@@ -23,7 +23,7 @@
+ 14767, 14783, 14784, 14785, 14793, 14796, 14797, 14801, 14803, 14805,
+ 14807, 14811, 14815, 14821, 14822, 14824, 14828, 14831, 14833, 14835,
+ 14838, 14856, 14863, 14865, 14866, 14868, 14869, 14871, 14872, 14879,
+- 14889, 14893, 14898, 14914.
++ 14889, 14893, 14898, 14914, 15003.
+
+ * Optimization of memcpy for MIPS.
+
+Index: libc/ChangeLog
+===================================================================
+--- libc/ChangeLog (revision 22242)
++++ libc/ChangeLog (revision 22243)
+@@ -1,3 +1,29 @@
++2013-01-11 Andreas Jaeger <aj@suse.de>
++
++ [BZ #15003]
++ * sysdeps/unix/sysv/linux/bits/socket.h (MSG_FASTOPEN): New
++ value. Sync with Linux 3.7.
++
++2013-01-09 David S. Miller <davem@davemloft.net>
++
++ [BZ# 15003]
++ * sysdeps/gnu/netinet/tcp.h (TCP_COOKIE_TRANSACTIONS,
++ TCP_THIN_LINEAR_TIMEOUTS, TCP_THIN_DUPACK, TCP_USER_TIMEOUT,
++ TCP_REPAIR, TCP_REPAIR_QUEUE, TCP_QUEUE_SEQ, TCP_REPAIR_OPTIONS,
++ TCP_FASTOPEN): Define.
++ (tcp_repair_opt): New structure.
++ (TCP_NO_QUEUE, TCP_RECV_QUEUE, TCP_SEND_QUEUE, TCP_QUEUES_NR): New
++ enum values.
++ (TCP_COOKIE_MIN, TCP_COOKIE_MAX, TCP_COOKIE_PAIR_SIZE,
++ TCP_COOKIE_IN_ALWAYS, TCP_COOKIE_OUT_NEVER, TCP_S_DATA_IN,
++ TCP_S_DATA_OUT, TCP_MSS_DEFAULT, TCP_MSS_DESIRED): Define.
++ (tcp_cookie_transactions): New structure.
++
++2013-01-09 Andreas Jaeger <aj@suse.de>
++
++ * sysdeps/gnu/netinet/tcp.h (TCPI_OPT_SYN_DATA)
++ (TCPI_OPT_ECN_SEEN): Define. Sync with Linux 3.7.
++
+ 2013-01-01 David S. Miller <davem@davemloft.net>
+
+ * po/fr.po: Update from translation team.
+Index: libc/sysdeps/unix/sysv/linux/bits/socket.h
+===================================================================
+--- libc/sysdeps/unix/sysv/linux/bits/socket.h (revision 22242)
++++ libc/sysdeps/unix/sysv/linux/bits/socket.h (revision 22243)
+@@ -1,6 +1,5 @@
+ /* System-specific socket constants and types. Linux version.
+- Copyright (C) 1991, 1992, 1994-2001, 2004, 2006-2010, 2011, 2012
+- Free Software Foundation, Inc.
++ Copyright (C) 1991-2013 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+@@ -208,6 +207,8 @@
+ #define MSG_MORE MSG_MORE
+ MSG_WAITFORONE = 0x10000, /* Wait for at least one packet to return.*/
+ #define MSG_WAITFORONE MSG_WAITFORONE
++ MSG_FASTOPEN = 0x20000000, /* Send data in TCP SYN. */
++#define MSG_FASTOPEN MSG_FASTOPEN
+
+ MSG_CMSG_CLOEXEC = 0x40000000 /* Set close_on_exit for file
+ descriptor received through
+Index: libc/sysdeps/gnu/netinet/tcp.h
+===================================================================
+--- libc/sysdeps/gnu/netinet/tcp.h (revision 22242)
++++ libc/sysdeps/gnu/netinet/tcp.h (revision 22243)
+@@ -37,20 +37,29 @@
+ /*
+ * User-settable options (used with setsockopt).
+ */
+-#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */
+-#define TCP_MAXSEG 2 /* Set maximum segment size */
+-#define TCP_CORK 3 /* Control sending of partial frames */
+-#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
+-#define TCP_KEEPINTVL 5 /* Interval between keepalives */
+-#define TCP_KEEPCNT 6 /* Number of keepalives before death */
+-#define TCP_SYNCNT 7 /* Number of SYN retransmits */
+-#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
+-#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
+-#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
+-#define TCP_INFO 11 /* Information about this connection. */
+-#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
+-#define TCP_CONGESTION 13 /* Congestion control algorithm. */
+-#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
++#define TCP_NODELAY 1 /* Don't delay send to coalesce packets */
++#define TCP_MAXSEG 2 /* Set maximum segment size */
++#define TCP_CORK 3 /* Control sending of partial frames */
++#define TCP_KEEPIDLE 4 /* Start keeplives after this period */
++#define TCP_KEEPINTVL 5 /* Interval between keepalives */
++#define TCP_KEEPCNT 6 /* Number of keepalives before death */
++#define TCP_SYNCNT 7 /* Number of SYN retransmits */
++#define TCP_LINGER2 8 /* Life time of orphaned FIN-WAIT-2 state */
++#define TCP_DEFER_ACCEPT 9 /* Wake up listener only when data arrive */
++#define TCP_WINDOW_CLAMP 10 /* Bound advertised window */
++#define TCP_INFO 11 /* Information about this connection. */
++#define TCP_QUICKACK 12 /* Bock/reenable quick ACKs. */
++#define TCP_CONGESTION 13 /* Congestion control algorithm. */
++#define TCP_MD5SIG 14 /* TCP MD5 Signature (RFC2385) */
++#define TCP_COOKIE_TRANSACTIONS 15 /* TCP Cookie Transactions */
++#define TCP_THIN_LINEAR_TIMEOUTS 16 /* Use linear timeouts for thin streams*/
++#define TCP_THIN_DUPACK 17 /* Fast retrans. after 1 dupack */
++#define TCP_USER_TIMEOUT 18 /* How long for loss retry before timeout */
++#define TCP_REPAIR 19 /* TCP sock is under repair right now */
++#define TCP_REPAIR_QUEUE 20 /* Set TCP queue to repair */
++#define TCP_QUEUE_SEQ 21 /* Set sequence number of repaired queue. */
++#define TCP_REPAIR_OPTIONS 22 /* Repair TCP connection options */
++#define TCP_FASTOPEN 23 /* Enable FastOpen on listeners */
+
+ #ifdef __USE_MISC
+ # include <sys/types.h>
+@@ -173,7 +182,9 @@
+ # define TCPI_OPT_TIMESTAMPS 1
+ # define TCPI_OPT_SACK 2
+ # define TCPI_OPT_WSCALE 4
+-# define TCPI_OPT_ECN 8
++# define TCPI_OPT_ECN 8 /* ECN was negociated at TCP session init */
++# define TCPI_OPT_ECN_SEEN 16 /* we received at least one packet with ECT */
++# define TCPI_OPT_SYN_DATA 32 /* SYN-ACK acked data in SYN sent or rcvd */
+
+ /* Values for tcpi_state. */
+ enum tcp_ca_state
+@@ -241,6 +252,49 @@
+ u_int8_t tcpm_key[TCP_MD5SIG_MAXKEYLEN]; /* Key (binary). */
+ };
+
++/* For socket repair options. */
++struct tcp_repair_opt
++{
++ u_int32_t opt_code;
++ u_int32_t opt_val;
++};
++
++/* Queue to repair, for TCP_REPAIR_QUEUE. */
++enum
++{
++ TCP_NO_QUEUE,
++ TCP_RECV_QUEUE,
++ TCP_SEND_QUEUE,
++ TCP_QUEUES_NR,
++};
++
++/* For cookie transactions socket options. */
++#define TCP_COOKIE_MIN 8 /* 64-bits */
++#define TCP_COOKIE_MAX 16 /* 128-bits */
++#define TCP_COOKIE_PAIR_SIZE (2*TCP_COOKIE_MAX)
++
++/* Flags for both getsockopt and setsockopt */
++#define TCP_COOKIE_IN_ALWAYS (1 << 0) /* Discard SYN without cookie */
++#define TCP_COOKIE_OUT_NEVER (1 << 1) /* Prohibit outgoing cookies,
++ * supercedes everything. */
++
++/* Flags for getsockopt */
++#define TCP_S_DATA_IN (1 << 2) /* Was data received? */
++#define TCP_S_DATA_OUT (1 << 3) /* Was data sent? */
++
++#define TCP_MSS_DEFAULT 536U /* IPv4 (RFC1122, RFC2581) */
++#define TCP_MSS_DESIRED 1220U /* IPv6 (tunneled), EDNS0 (RFC3226) */
++
++struct tcp_cookie_transactions
++{
++ u_int16_t tcpct_flags;
++ u_int8_t __tcpct_pad1;
++ u_int8_t tcpct_cookie_desired;
++ u_int16_t tcpct_s_data_desired;
++ u_int16_t tcpct_used;
++ u_int8_t tcpct_value[TCP_MSS_DEFAULT];
++};
++
+ #endif /* Misc. */
+
+ #endif /* netinet/tcp.h */
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:r22178-22242
+
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:r22178-22242
+
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:r22178-22242
+
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:r22178-22242
+
+
+Property changes on: .
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch:r22178-22242
+
diff --git a/meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-r22178.patch b/meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-r22178.patch
new file mode 100644
index 0000000000..2ad1e23bcf
--- /dev/null
+++ b/meta/recipes-core/eglibc/eglibc-2.17/eglibc-2.17-r22178.patch
@@ -0,0 +1,9472 @@
+Index: libc/ChangeLog
+===================================================================
+--- libc/ChangeLog (revision 22177)
++++ libc/ChangeLog (revision 22178)
+@@ -1,3 +1,8 @@
++2013-01-01 David S. Miller <davem@davemloft.net>
++
++ * po/fr.po: Update from translation team.
++ * po/ca.po: Likewise.
++
+ 2012-12-21 David S. Miller <davem@davemloft.net>
+
+ * po/hr.po: Update from translation team.
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/c++-types.data:r22064-22177
+
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/single/nptl/localplt.data:r22064-22177
+
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/c++-types.data:r22064-22177
+
+
+Property changes on: libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data
+___________________________________________________________________
+Modified: svn:mergeinfo
+ Merged /fsf/glibc-2_17-branch/libc/ports/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500/nptl/localplt.data:r22064-22177
+
+Index: libc/po/fr.po
+===================================================================
+--- libc/po/fr.po (revision 22177)
++++ libc/po/fr.po (revision 22178)
+@@ -7,9 +7,9 @@
+ # kerb <traduc@traduc.org>, 2008, 2009.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: libc-2.16-pre1\n"
+-"POT-Creation-Date: 2012-06-21 07:51-0700\n"
+-"PO-Revision-Date: 2012-07-12 08:16+0100\n"
++"Project-Id-Version: libc-2.17-pre1\n"
++"POT-Creation-Date: 2012-12-07 15:10-0500\n"
++"PO-Revision-Date: 2012-12-30 17:20+0100\n"
+ "Last-Translator: kerb <y.kerb@laposte.net>\n"
+ "Language-Team: French <traduc@traduc.org>\n"
+ "Language: fr\n"
+@@ -19,45 +19,45 @@
+ "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+ "X-Generator: KBabel 1.11.4\n"
+
+-#: argp/argp-help.c:226
++#: argp/argp-help.c:227
+ #, c-format
+ msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
+ msgstr "%.*s : le paramètre ARGP_HELP_FMT requiert une valeur"
+
+-#: argp/argp-help.c:236
++#: argp/argp-help.c:237
+ #, c-format
+ msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
+ msgstr "% *s : paramètre ARGP_HELP_FMT inconnu"
+
+-#: argp/argp-help.c:249
++#: argp/argp-help.c:250
+ #, c-format
+ msgid "Garbage in ARGP_HELP_FMT: %s"
+ msgstr "Rebut dans l'argument ARGP_HELP_FMT : %s"
+
+-#: argp/argp-help.c:1213
++#: argp/argp-help.c:1214
+ msgid "Mandatory or optional arguments to long options are also mandatory or optional for any corresponding short options."
+ msgstr ""
+ "Les arguments obligatoires ou optionnels pour les options de formes longues\n"
+ "le sont aussi pour les options de forme courtes."
+
+-#: argp/argp-help.c:1599
++#: argp/argp-help.c:1600
+ msgid "Usage:"
+ msgstr "Usage :"
+
+-#: argp/argp-help.c:1603
++#: argp/argp-help.c:1604
+ msgid " or: "
+ msgstr " ou : "
+
+-#: argp/argp-help.c:1615
++#: argp/argp-help.c:1616
+ msgid " [OPTION...]"
+ msgstr " [OPTION...]"
+
+-#: argp/argp-help.c:1642
++#: argp/argp-help.c:1643
+ #, c-format
+ msgid "Try `%s --help' or `%s --usage' for more information.\n"
+ msgstr "Pour en savoir davantage, faites : «%s --help » ou «%s --usage».\n"
+
+-#: argp/argp-help.c:1670
++#: argp/argp-help.c:1671
+ #, c-format
+ msgid "Report bugs to %s.\n"
+ msgstr "Rapporter toutes anomalies à %s.\n"
+@@ -109,7 +109,7 @@
+ "%s%s%s :%u : %s%s l'assertion « %s » a échoué.\n"
+ "%n"
+
+-#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:115 nss/makedb.c:118
++#: catgets/gencat.c:109 catgets/gencat.c:113 nscd/nscd.c:115 nss/makedb.c:119
+ msgid "NAME"
+ msgstr "NOM"
+
+@@ -121,7 +121,7 @@
+ msgid "Do not use existing catalog, force new output file"
+ msgstr "Ne pas utiliser le catalogue existant, forcer la génération d'un autre fichier"
+
+-#: catgets/gencat.c:113 nss/makedb.c:118
++#: catgets/gencat.c:113 nss/makedb.c:119
+ msgid "Write output to file NAME"
+ msgstr "Écrit en sortie dans le FICHIER"
+
+@@ -141,28 +141,27 @@
+ "-o FICHIER_DE_SORTIE [FICHIER_D_ENTRÉE]...\n"
+ "[FICHIER_DE_SORTIE [FICHIER_D_ENTRÉE]...]"
+
+-#: catgets/gencat.c:234 debug/pcprofiledump.c:207 debug/xtrace.sh:57
+-#: elf/ldconfig.c:301 elf/ldd.bash.in:55 elf/pldd.c:56 elf/sln.c:85
+-#: elf/sotruss.ksh:49 elf/sprof.c:370 iconv/iconv_prog.c:407
+-#: iconv/iconvconfig.c:382 locale/programs/locale.c:278
+-#: locale/programs/localedef.c:367 login/programs/pt_chown.c:91
+-#: malloc/memusage.sh:64 malloc/memusagestat.c:538 nscd/nscd.c:456
+-#: nss/getent.c:965 nss/makedb.c:369 posix/getconf.c:1121
+-#: sunrpc/rpc_main.c:1446 sunrpc/rpcinfo.c:691
++#: catgets/gencat.c:235 debug/pcprofiledump.c:208 elf/ldconfig.c:302
++#: elf/pldd.c:222 elf/sln.c:85 elf/sprof.c:371 iconv/iconv_prog.c:408
++#: iconv/iconvconfig.c:383 locale/programs/locale.c:279
++#: locale/programs/localedef.c:363 login/programs/pt_chown.c:88
++#: malloc/memusagestat.c:536 nscd/nscd.c:459 nss/getent.c:965 nss/makedb.c:371
++#: posix/getconf.c:1121 sunrpc/rpcinfo.c:691
+ #: sysdeps/unix/sysv/linux/lddlibc4.c:61
++#, c-format
+ msgid ""
+ "For bug reporting instructions, please see:\n"
+-"<http://www.gnu.org/software/libc/bugs.html>.\n"
++"%s.\n"
+ msgstr ""
+ "Pour les instructions de rapport de bug, SVP voyez là : \n"
+-"<http://www.gnu.org/software/libc/bugs.html>.\n"
++"%s.\n"
+
+-#: catgets/gencat.c:248 debug/pcprofiledump.c:221 debug/xtrace.sh:65
+-#: elf/ldconfig.c:315 elf/ldd.bash.in:38 elf/pldd.c:220 elf/sotruss.ksh:76
+-#: elf/sprof.c:385 iconv/iconv_prog.c:422 iconv/iconvconfig.c:397
+-#: locale/programs/locale.c:293 locale/programs/localedef.c:383
+-#: login/programs/pt_chown.c:62 malloc/memusage.sh:72
+-#: malloc/memusagestat.c:556 nscd/nscd.c:470 nss/getent.c:86 nss/makedb.c:383
++#: catgets/gencat.c:251 debug/pcprofiledump.c:224 debug/xtrace.sh:64
++#: elf/ldconfig.c:318 elf/ldd.bash.in:38 elf/pldd.c:238 elf/sotruss.ksh:75
++#: elf/sprof.c:388 iconv/iconv_prog.c:425 iconv/iconvconfig.c:400
++#: locale/programs/locale.c:296 locale/programs/localedef.c:389
++#: login/programs/pt_chown.c:62 malloc/memusage.sh:71
++#: malloc/memusagestat.c:552 nscd/nscd.c:475 nss/getent.c:86 nss/makedb.c:387
+ #: posix/getconf.c:1103 sysdeps/unix/sysv/linux/lddlibc4.c:68
+ #, c-format
+ msgid ""
+@@ -175,96 +174,96 @@
+ "reproduction. AUCUNE garantie n'est donnée; tant pour des raisons\n"
+ "COMMERCIALES que pour RÉPONDRE À UN BESOIN PARTICULIER.\n"
+
+-#: catgets/gencat.c:253 debug/pcprofiledump.c:226 debug/xtrace.sh:69
+-#: elf/ldconfig.c:320 elf/pldd.c:225 elf/sprof.c:391 iconv/iconv_prog.c:427
+-#: iconv/iconvconfig.c:402 locale/programs/locale.c:298
+-#: locale/programs/localedef.c:388 malloc/memusage.sh:76
+-#: malloc/memusagestat.c:561 nscd/nscd.c:475 nss/getent.c:91 nss/makedb.c:388
++#: catgets/gencat.c:256 debug/pcprofiledump.c:229 debug/xtrace.sh:68
++#: elf/ldconfig.c:323 elf/pldd.c:243 elf/sprof.c:394 iconv/iconv_prog.c:430
++#: iconv/iconvconfig.c:405 locale/programs/locale.c:301
++#: locale/programs/localedef.c:394 malloc/memusage.sh:75
++#: malloc/memusagestat.c:557 nscd/nscd.c:480 nss/getent.c:91 nss/makedb.c:392
+ #: posix/getconf.c:1108
+ #, c-format
+ msgid "Written by %s.\n"
+ msgstr "Écrit par %s.\n"
+
+-#: catgets/gencat.c:284
++#: catgets/gencat.c:287
+ msgid "*standard input*"
+ msgstr "*entrée standard*"
+
+-#: catgets/gencat.c:290 iconv/iconv_charmap.c:171 iconv/iconv_prog.c:293
+-#: nss/makedb.c:247
++#: catgets/gencat.c:293 iconv/iconv_charmap.c:169 iconv/iconv_prog.c:293
++#: nss/makedb.c:248
+ #, c-format
+ msgid "cannot open input file `%s'"
+ msgstr "ne peut ouvrir le fichier d'entrée « %s »"
+
+-#: catgets/gencat.c:419 catgets/gencat.c:494
++#: catgets/gencat.c:422 catgets/gencat.c:497
+ msgid "illegal set number"
+ msgstr "numéro d'ensemble non permis"
+
+-#: catgets/gencat.c:446
++#: catgets/gencat.c:449
+ msgid "duplicate set definition"
+ msgstr "double définitions d'ensemble"
+
+-#: catgets/gencat.c:448 catgets/gencat.c:620 catgets/gencat.c:672
++#: catgets/gencat.c:451 catgets/gencat.c:623 catgets/gencat.c:675
+ msgid "this is the first definition"
+ msgstr "ceci est la première définition"
+
+-#: catgets/gencat.c:519
++#: catgets/gencat.c:522
+ #, c-format
+ msgid "unknown set `%s'"
+ msgstr "ensemble inconnu « %s »"
+
+-#: catgets/gencat.c:560
++#: catgets/gencat.c:563
+ msgid "invalid quote character"
+ msgstr "caractère de citation (quote) invalide"
+
+-#: catgets/gencat.c:573
++#: catgets/gencat.c:576
+ #, c-format
+ msgid "unknown directive `%s': line ignored"
+ msgstr "directive inconnue « %s » : ligne ignorée"
+
+-#: catgets/gencat.c:618
++#: catgets/gencat.c:621
+ msgid "duplicated message number"
+ msgstr "numéro de message en double"
+
+-#: catgets/gencat.c:669
++#: catgets/gencat.c:672
+ msgid "duplicated message identifier"
+ msgstr "identifiant de message en double"
+
+-#: catgets/gencat.c:726
++#: catgets/gencat.c:729
+ msgid "invalid character: message ignored"
+ msgstr "caractère invalide : message ignoré"
+
+-#: catgets/gencat.c:769
++#: catgets/gencat.c:772
+ msgid "invalid line"
+ msgstr "ligne invalide"
+
+-#: catgets/gencat.c:823
++#: catgets/gencat.c:826
+ msgid "malformed line ignored"
+ msgstr "ligne incorrecte ignorée"
+
+-#: catgets/gencat.c:987 catgets/gencat.c:1028
++#: catgets/gencat.c:990 catgets/gencat.c:1031
+ #, c-format
+ msgid "cannot open output file `%s'"
+ msgstr "ne peut ouvrir le fichier de sortie « %s »"
+
+-#: catgets/gencat.c:1190 locale/programs/linereader.c:559
++#: catgets/gencat.c:1193 locale/programs/linereader.c:559
+ msgid "invalid escape sequence"
+ msgstr "séquence d'échappement invalide"
+
+-#: catgets/gencat.c:1212
++#: catgets/gencat.c:1215
+ msgid "unterminated message"
+ msgstr "message non terminé"
+
+-#: catgets/gencat.c:1236
++#: catgets/gencat.c:1239
+ #, c-format
+ msgid "while opening old catalog file"
+ msgstr "lors de l'ouverture de l'ancien fichier catalogue"
+
+-#: catgets/gencat.c:1327
++#: catgets/gencat.c:1330
+ #, c-format
+ msgid "conversion modules not available"
+ msgstr "modules de conversion indisponibles"
+
+-#: catgets/gencat.c:1353
++#: catgets/gencat.c:1356
+ #, c-format
+ msgid "cannot determine escape character"
+ msgstr "ne peut déterminer le caractère d'échappement"
+@@ -300,8 +299,8 @@
+ msgid "Usage: xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+ msgstr "Usage : xtrace [OPTION]... PROGRAM [PROGRAMOPTION]...\\n"
+
+-#: debug/xtrace.sh:32 elf/sotruss.ksh:57 elf/sotruss.ksh:68
+-#: elf/sotruss.ksh:136 malloc/memusage.sh:26
++#: debug/xtrace.sh:32 elf/sotruss.ksh:56 elf/sotruss.ksh:67
++#: elf/sotruss.ksh:135 malloc/memusage.sh:26
+ msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n"
+ msgstr "Pour en savoir davantage, faites : «%s --help » ou «%s --usage».\\n"
+
+@@ -335,20 +334,25 @@
+ "les options de formes courtes.\n"
+ "\n"
+
+-#: debug/xtrace.sh:126
++#: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.ksh:49
++#: malloc/memusage.sh:64
++msgid "For bug reporting instructions, please see:\\\\n%s.\\\\n"
++msgstr "Pour les instructions de rapport de bug, SVP voyez là : \\\\n%s.\\\\n"
++
++#: debug/xtrace.sh:125
+ msgid "xtrace: unrecognized option \\`$1'\\n"
+ msgstr "xtrace : option non reconnue\\`$1'\\n"
+
+-#: debug/xtrace.sh:139
++#: debug/xtrace.sh:138
+ msgid "No program name given\\n"
+ msgstr "Le nom de programme n'est pas indiqué\\n"
+
+-#: debug/xtrace.sh:147
++#: debug/xtrace.sh:146
+ #, sh-format
+ msgid "executable \\`$program' not found\\n"
+ msgstr "exécutable \\`$program' non trouvé\\n"
+
+-#: debug/xtrace.sh:151
++#: debug/xtrace.sh:150
+ #, sh-format
+ msgid "\\`$program' is no executable\\n"
+ msgstr "\\`$program' n'est pas un exécutable\\n"
+@@ -377,85 +381,85 @@
+ msgid "unknown"
+ msgstr "inconnu"
+
+-#: elf/cache.c:115
++#: elf/cache.c:121
+ msgid "Unknown OS"
+ msgstr "Système d'exploitation inconnu"
+
+-#: elf/cache.c:120
++#: elf/cache.c:126
+ #, c-format
+ msgid ", OS ABI: %s %d.%d.%d"
+ msgstr ", Système d'exploitation ABI : %s %d.%d.%d"
+
+-#: elf/cache.c:137 elf/ldconfig.c:1306
++#: elf/cache.c:143 elf/ldconfig.c:1309
+ #, c-format
+ msgid "Can't open cache file %s\n"
+ msgstr "Ne peut ouvrir le fichier de cache %s\n"
+
+-#: elf/cache.c:151
++#: elf/cache.c:157
+ #, c-format
+ msgid "mmap of cache file failed.\n"
+ msgstr "la procédure mmap sur le fichier de cache a échouée\n"
+
+-#: elf/cache.c:155 elf/cache.c:169
++#: elf/cache.c:161 elf/cache.c:175
+ #, c-format
+ msgid "File is not a cache file.\n"
+ msgstr "Fichier n'est pas un fichier de cache.\n"
+
+-#: elf/cache.c:202 elf/cache.c:212
++#: elf/cache.c:208 elf/cache.c:218
+ #, c-format
+ msgid "%d libs found in cache `%s'\n"
+ msgstr "%d libs trouvé dans le cache « %s »\n"
+
+-#: elf/cache.c:406
++#: elf/cache.c:412
+ #, c-format
+ msgid "Can't create temporary cache file %s"
+ msgstr "Ne peut créer un fichier de cache temporaire %s"
+
+-#: elf/cache.c:414 elf/cache.c:424 elf/cache.c:428 elf/cache.c:433
++#: elf/cache.c:420 elf/cache.c:430 elf/cache.c:434 elf/cache.c:439
+ #, c-format
+ msgid "Writing of cache data failed"
+ msgstr "Échec d'écriture des données du cache"
+
+-#: elf/cache.c:438
++#: elf/cache.c:444
+ #, c-format
+ msgid "Changing access rights of %s to %#o failed"
+ msgstr "Échec de la modification des droits d'accès de %s à %#o"
+
+-#: elf/cache.c:443
++#: elf/cache.c:449
+ #, c-format
+ msgid "Renaming of %s to %s failed"
+ msgstr "Échec du changement de nom de %s vers %s"
+
+-#: elf/dl-close.c:386 elf/dl-open.c:460
++#: elf/dl-close.c:378 elf/dl-open.c:474
+ msgid "cannot create scope list"
+ msgstr "ne peut créer une liste panorama"
+
+-#: elf/dl-close.c:773
++#: elf/dl-close.c:771
+ msgid "shared object not open"
+ msgstr "objet partagé non ouvert"
+
+-#: elf/dl-deps.c:114
++#: elf/dl-deps.c:112
+ msgid "DST not allowed in SUID/SGID programs"
+ msgstr "DST non permis dans un programme SUID/SGID"
+
+-#: elf/dl-deps.c:127
++#: elf/dl-deps.c:125
+ msgid "empty dynamic string token substitution"
+ msgstr "la chaîne dynamique d'un jeton de substitution est vide"
+
+-#: elf/dl-deps.c:133
++#: elf/dl-deps.c:131
+ #, c-format
+ msgid "cannot load auxiliary `%s' because of empty dynamic string token substitution\n"
+ msgstr "ne peut charger l'auxiliaire « %s » en raison d'une chaîne dynamique de substitution de jeton vide\n"
+
+-#: elf/dl-deps.c:486
++#: elf/dl-deps.c:483
+ msgid "cannot allocate dependency list"
+ msgstr "ne peut allouer une liste de dépendances"
+
+-#: elf/dl-deps.c:522 elf/dl-deps.c:582
++#: elf/dl-deps.c:520 elf/dl-deps.c:580
+ msgid "cannot allocate symbol search list"
+ msgstr "ne peut allouer la liste des symboles à rechercher"
+
+-#: elf/dl-deps.c:562
++#: elf/dl-deps.c:560
+ msgid "Filters not supported with LD_TRACE_PRELINKING"
+ msgstr "Filtres non supportés avec LD_TRACE_PRELINKING"
+
+@@ -479,187 +483,191 @@
+ msgid "internal error: symidx out of range of fptr table"
+ msgstr "erreur interne : symidx en dehors de la table fptr "
+
+-#: elf/dl-load.c:470
++#: elf/dl-hwcaps.c:173 elf/dl-hwcaps.c:185
++msgid "cannot create capability list"
++msgstr "ne peut créer une liste des possibilités"
++
++#: elf/dl-load.c:471
+ msgid "cannot allocate name record"
+ msgstr "ne peut allouer un enregistrement de nom"
+
+-#: elf/dl-load.c:547 elf/dl-load.c:663 elf/dl-load.c:748 elf/dl-load.c:861
++#: elf/dl-load.c:548 elf/dl-load.c:664 elf/dl-load.c:749 elf/dl-load.c:862
+ msgid "cannot create cache for search path"
+ msgstr "ne peut créer le cache pour le chemin de recherche"
+
+-#: elf/dl-load.c:638
++#: elf/dl-load.c:639
+ msgid "cannot create RUNPATH/RPATH copy"
+ msgstr "ne peut créer une copie RUNPATH/RPATH"
+
+-#: elf/dl-load.c:734
++#: elf/dl-load.c:735
+ msgid "cannot create search path array"
+ msgstr "ne peut créer un tableau des chemins de recherche"
+
+-#: elf/dl-load.c:932
++#: elf/dl-load.c:934
+ msgid "cannot stat shared object"
+ msgstr "ne peut évaluer par stat() l'objet partagé"
+
+-#: elf/dl-load.c:1010
++#: elf/dl-load.c:1012
+ msgid "cannot open zero fill device"
+ msgstr "ne peut ouvrir le fichier de périphérique rempli de zéros"
+
+-#: elf/dl-load.c:1056 elf/dl-load.c:2317
++#: elf/dl-load.c:1059 elf/dl-load.c:2339
+ msgid "cannot create shared object descriptor"
+ msgstr "ne peut créer un descripteur d'objet partagé"
+
+-#: elf/dl-load.c:1075 elf/dl-load.c:1731 elf/dl-load.c:1834
++#: elf/dl-load.c:1078 elf/dl-load.c:1751 elf/dl-load.c:1854
+ msgid "cannot read file data"
+ msgstr "ne peut lire les données du fichier"
+
+-#: elf/dl-load.c:1121
++#: elf/dl-load.c:1124
+ msgid "ELF load command alignment not page-aligned"
+ msgstr "Commande de chargement sur une page ELF qui n'est pas alignée"
+
+-#: elf/dl-load.c:1128
++#: elf/dl-load.c:1131
+ msgid "ELF load command address/offset not properly aligned"
+ msgstr "Commande de chargement sur une adresse ELF incorrectement alignée"
+
+-#: elf/dl-load.c:1211
++#: elf/dl-load.c:1216
+ msgid "cannot allocate TLS data structures for initial thread"
+ msgstr "ne peut allouer une structure de données TLS pour un thread initial"
+
+-#: elf/dl-load.c:1234
++#: elf/dl-load.c:1239
+ msgid "cannot handle TLS data"
+ msgstr "ne peut traiter les données TLS"
+
+-#: elf/dl-load.c:1253
++#: elf/dl-load.c:1258
+ msgid "object file has no loadable segments"
+ msgstr "le fichier objet n'a pas de segment chargeable"
+
+-#: elf/dl-load.c:1289
++#: elf/dl-load.c:1294
+ msgid "failed to map segment from shared object"
+ msgstr "échec d'adressage (mapping) du segment de l'objet partagé"
+
+-#: elf/dl-load.c:1315
++#: elf/dl-load.c:1320
+ msgid "cannot dynamically load executable"
+ msgstr "ne peut dynamiquement charger un exécutable"
+
+-#: elf/dl-load.c:1377
++#: elf/dl-load.c:1383
+ msgid "cannot change memory protections"
+ msgstr "ne peut modifier les protections de mémoire"
+
+-#: elf/dl-load.c:1396
++#: elf/dl-load.c:1402
+ msgid "cannot map zero-fill pages"
+ msgstr "ne peut adresser des pages remplies de zéros"
+
+-#: elf/dl-load.c:1410
++#: elf/dl-load.c:1416
+ msgid "object file has no dynamic section"
+ msgstr "le fichier objet n'a pas de section dynamique"
+
+-#: elf/dl-load.c:1433
++#: elf/dl-load.c:1439
+ msgid "shared object cannot be dlopen()ed"
+ msgstr "l'objet partagé ne peut pas être ouvert via dlopen()"
+
+-#: elf/dl-load.c:1446
++#: elf/dl-load.c:1452
+ msgid "cannot allocate memory for program header"
+ msgstr "ne peut allouer de la mémoire pour une en-tête de programme"
+
+-#: elf/dl-load.c:1463 elf/dl-open.c:178
++#: elf/dl-load.c:1469 elf/dl-open.c:180
+ msgid "invalid caller"
+ msgstr "appelant invalide"
+
+-#: elf/dl-load.c:1502
++#: elf/dl-load.c:1508
+ msgid "cannot enable executable stack as shared object requires"
+ msgstr "ne peut activer une pile exécutable comme l'objet partagé le requiert"
+
+-#: elf/dl-load.c:1515
++#: elf/dl-load.c:1521
+ msgid "cannot close file descriptor"
+ msgstr "ne peut pas fermer le descripteur de fichier"
+
+-#: elf/dl-load.c:1731
++#: elf/dl-load.c:1751
+ msgid "file too short"
+ msgstr "fichier trop court"
+
+-#: elf/dl-load.c:1767
++#: elf/dl-load.c:1787
+ msgid "invalid ELF header"
+ msgstr "en-tête ELF invalide"
+
+-#: elf/dl-load.c:1779
++#: elf/dl-load.c:1799
+ msgid "ELF file data encoding not big-endian"
+ msgstr "l'encodage des données du fichier ELF n'est pas big-endian"
+
+-#: elf/dl-load.c:1781
++#: elf/dl-load.c:1801
+ msgid "ELF file data encoding not little-endian"
+ msgstr "l'encodage des données du fichier ELF n'est pas little-endian"
+
+-#: elf/dl-load.c:1785
++#: elf/dl-load.c:1805
+ msgid "ELF file version ident does not match current one"
+ msgstr "l'identifiant de version du fichier ELF ne concorde pas avec la version courante"
+
+-#: elf/dl-load.c:1789
++#: elf/dl-load.c:1809
+ msgid "ELF file OS ABI invalid"
+ msgstr "Système d'exploitation du fichier ELF ABI invalide"
+
+-#: elf/dl-load.c:1792
++#: elf/dl-load.c:1812
+ msgid "ELF file ABI version invalid"
+ msgstr "Version du fichier ELF ABI invalide"
+
+-#: elf/dl-load.c:1795
++#: elf/dl-load.c:1815
+ msgid "nonzero padding in e_ident"
+ msgstr "remplissage sans zéro dans e_ident"
+
+-#: elf/dl-load.c:1798
++#: elf/dl-load.c:1818
+ msgid "internal error"
+ msgstr "Erreur interne"
+
+-#: elf/dl-load.c:1805
++#: elf/dl-load.c:1825
+ msgid "ELF file version does not match current one"
+ msgstr "Version du fichier ELF ne concorde pas avec la version courante"
+
+-#: elf/dl-load.c:1813
++#: elf/dl-load.c:1833
+ msgid "only ET_DYN and ET_EXEC can be loaded"
+ msgstr "Seuls ET_DYN et ET_EXEC peuvent être chargés"
+
+-#: elf/dl-load.c:1819
++#: elf/dl-load.c:1839
+ msgid "ELF file's phentsize not the expected size"
+ msgstr "« Phentize » du fichier ELF ne concorde pas avec la taille prévue"
+
+-#: elf/dl-load.c:2336
++#: elf/dl-load.c:2358
+ msgid "wrong ELF class: ELFCLASS64"
+ msgstr "mauvaise classe ELF : ELFCLASS64"
+
+-#: elf/dl-load.c:2337
++#: elf/dl-load.c:2359
+ msgid "wrong ELF class: ELFCLASS32"
+ msgstr "mauvaise classe ELF : ELFCLASS32"
+
+-#: elf/dl-load.c:2340
++#: elf/dl-load.c:2362
+ msgid "cannot open shared object file"
+ msgstr "Ne peut ouvrir le fichier d'objet partagé"
+
+-#: elf/dl-lookup.c:756 ports/sysdeps/mips/dl-lookup.c:773
++#: elf/dl-lookup.c:757 ports/sysdeps/mips/dl-lookup.c:774
+ msgid "relocation error"
+ msgstr "erreur de réaffectation"
+
+-#: elf/dl-lookup.c:785 ports/sysdeps/mips/dl-lookup.c:802
++#: elf/dl-lookup.c:786 ports/sysdeps/mips/dl-lookup.c:803
+ msgid "symbol lookup error"
+ msgstr "erreur de recherche de symbole"
+
+-#: elf/dl-open.c:108
++#: elf/dl-open.c:110
+ msgid "cannot extend global scope"
+ msgstr "ne peut augmenter l'étendue de la plage globale"
+
+-#: elf/dl-open.c:510
++#: elf/dl-open.c:524
+ msgid "TLS generation counter wrapped! Please report this."
+ msgstr "Le compteur de génération TLS a bouclé ! SVP expédier un rapport avec le script 'glibcbug'."
+
+-#: elf/dl-open.c:532
++#: elf/dl-open.c:546
+ msgid "cannot load any more object with static TLS"
+ msgstr "ne peut pas charger plus d'objets avec TLS statique"
+
+-#: elf/dl-open.c:581
++#: elf/dl-open.c:599
+ msgid "invalid mode for dlopen()"
+ msgstr "mode invalide pour dlopen()"
+
+-#: elf/dl-open.c:598
++#: elf/dl-open.c:616
+ msgid "no more namespaces available for dlmopen()"
+ msgstr "plus d'espace de nommage disponible pour dlmopen()"
+
+-#: elf/dl-open.c:616
++#: elf/dl-open.c:634
+ msgid "invalid target namespace in dlmopen()"
+ msgstr "espace de nommage cible invalide dans dlmopen()"
+
+@@ -689,23 +697,19 @@
+ msgid "cannot apply additional memory protection after relocation"
+ msgstr "ne peut appliquer les protections additionnelle de mémoire après la réaffectation"
+
+-#: elf/dl-sym.c:162
++#: elf/dl-sym.c:163
+ msgid "RTLD_NEXT used in code not dynamically loaded"
+ msgstr "RTLD_NEXT est utilisé dans du code qui n'est pas chargé dynamiquement"
+
+-#: elf/dl-sysdep.c:488 elf/dl-sysdep.c:500
+-msgid "cannot create capability list"
+-msgstr "ne peut créer une liste des possibilités"
+-
+-#: elf/dl-tls.c:872
++#: elf/dl-tls.c:875
+ msgid "cannot create TLS data structures"
+ msgstr "ne peut créer les structures de données TLS"
+
+-#: elf/dl-version.c:171
++#: elf/dl-version.c:166
+ msgid "version lookup error"
+ msgstr "erreur de recherche de version"
+
+-#: elf/dl-version.c:302
++#: elf/dl-version.c:297
+ msgid "cannot allocate version reference table"
+ msgstr "ne peut allouer la table de référence des versions"
+
+@@ -773,156 +777,156 @@
+ msgid "Configure Dynamic Linker Run Time Bindings."
+ msgstr "Configuration dynamique des éditions de liens lors de l'exécution."
+
+-#: elf/ldconfig.c:338
++#: elf/ldconfig.c:341
+ #, c-format
+ msgid "Path `%s' given more than once"
+ msgstr "Chemin « %s » donné plus d'une fois"
+
+-#: elf/ldconfig.c:378
++#: elf/ldconfig.c:381
+ #, c-format
+ msgid "%s is not a known library type"
+ msgstr "%s n'est pas un type de librairie connu"
+
+-#: elf/ldconfig.c:406
++#: elf/ldconfig.c:409
+ #, c-format
+ msgid "Can't stat %s"
+ msgstr "Ne peut évaluer par stat %s"
+
+-#: elf/ldconfig.c:480
++#: elf/ldconfig.c:483
+ #, c-format
+ msgid "Can't stat %s\n"
+ msgstr "Ne peut évaluer par stat %s\n"
+
+-#: elf/ldconfig.c:490
++#: elf/ldconfig.c:493
+ #, c-format
+ msgid "%s is not a symbolic link\n"
+ msgstr "%s n'est pas un lien symbolique\n"
+
+-#: elf/ldconfig.c:509
++#: elf/ldconfig.c:512
+ #, c-format
+ msgid "Can't unlink %s"
+ msgstr "Ne peut enlever le lien (unlink) %s"
+
+-#: elf/ldconfig.c:515
++#: elf/ldconfig.c:518
+ #, c-format
+ msgid "Can't link %s to %s"
+ msgstr "Ne peut établir un lien entre %s et %s"
+
+-#: elf/ldconfig.c:521
++#: elf/ldconfig.c:524
+ msgid " (changed)\n"
+ msgstr " (a été modifié)\n"
+
+-#: elf/ldconfig.c:523
++#: elf/ldconfig.c:526
+ msgid " (SKIPPED)\n"
+ msgstr " (ESCAMOTÉ)\n"
+
+-#: elf/ldconfig.c:578
++#: elf/ldconfig.c:581
+ #, c-format
+ msgid "Can't find %s"
+ msgstr "Ne peut repérer %s"
+
+-#: elf/ldconfig.c:594 elf/ldconfig.c:767 elf/ldconfig.c:826 elf/ldconfig.c:860
++#: elf/ldconfig.c:597 elf/ldconfig.c:7