This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch glibc-2.24 in repository glibc.
commit 471fd40b706ed46024ebd16d4254bcdded76838a Author: Aurelien Jarno <aurel...@aurel32.net> Date: Fri Aug 5 22:44:21 2016 +0200 debian/patches/git-updates.diff: update from upstream stable branch. --- debian/changelog | 3 + debian/patches/git-updates.diff | 891 ++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- 3 files changed, 895 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 31722dc..8a984c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ glibc (2.24-0experimental1) UNRELEASED; urgency=medium [ Samuel Thibault ] * testsuite-xfail-debian.mk: Update with hurd-i386 non-regressions. + [ Aurelien Jarno ] + * debian/patches/git-updates.diff: update from upstream stable branch. + -- Samuel Thibault <sthiba...@debian.org> Thu, 04 Aug 2016 09:20:04 +0200 glibc (2.24-0experimental0) experimental; urgency=medium diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff new file mode 100644 index 0000000..a984652 --- /dev/null +++ b/debian/patches/git-updates.diff @@ -0,0 +1,891 @@ +GIT update of git://sourceware.org/git/glibc.git/release/2.24/master from glibc-2.24 + +diff --git a/ChangeLog b/ChangeLog +index c44c926..84ae7a7 100644 +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,3 +1,24 @@ ++2016-08-04 Carlos O'Donell <car...@redhat.com> ++ ++ * po/de.po: Update from Translation Project. ++ * po/fi.po: Likewise. ++ * po/sv.po: Likewise. ++ ++2016-08-02 Florian Weimer <fwei...@redhat.com> ++ ++ [BZ #20370] ++ * malloc/arena.c (get_free_list): Update comment. Assert that ++ arenas on the free list have no attached threads. ++ (remove_from_free_list): New function. ++ (reused_arena): Call it. ++ ++2016-08-04 Florian Weimer <fwei...@redhat.com> ++ ++ Use sysdep.o from libc.a in static libraries. ++ * sysdeps/unix/sysv/linux/i386/Makefile ++ (libpthread-shared-only-routines): Add sysdep. ++ (librt-shared-only-routines): Likewise. ++ + 2016-08-01 Carlos O'Donell <car...@redhat.com> + + * version.h (RELEASE): Set to "stable" +diff --git a/malloc/arena.c b/malloc/arena.c +index 229783f..4e16593 100644 +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -702,8 +702,7 @@ _int_new_arena (size_t size) + } + + +-/* Remove an arena from free_list. The arena may be in use because it +- was attached concurrently to a thread by reused_arena below. */ ++/* Remove an arena from free_list. */ + static mstate + get_free_list (void) + { +@@ -718,7 +717,8 @@ get_free_list (void) + free_list = result->next_free; + + /* The arena will be attached to this thread. */ +- ++result->attached_threads; ++ assert (result->attached_threads == 0); ++ result->attached_threads = 1; + + detach_arena (replaced_arena); + } +@@ -735,6 +735,26 @@ get_free_list (void) + return result; + } + ++/* Remove the arena from the free list (if it is present). ++ free_list_lock must have been acquired by the caller. */ ++static void ++remove_from_free_list (mstate arena) ++{ ++ mstate *previous = &free_list; ++ for (mstate p = free_list; p != NULL; p = p->next_free) ++ { ++ assert (p->attached_threads == 0); ++ if (p == arena) ++ { ++ /* Remove the requested arena from the list. */ ++ *previous = p->next_free; ++ break; ++ } ++ else ++ previous = &p->next_free; ++ } ++} ++ + /* Lock and return an arena that can be reused for memory allocation. + Avoid AVOID_ARENA as we have already failed to allocate memory in + it and it is currently locked. */ +@@ -782,14 +802,25 @@ reused_arena (mstate avoid_arena) + (void) mutex_lock (&result->mutex); + + out: +- /* Attach the arena to the current thread. Note that we may have +- selected an arena which was on free_list. */ ++ /* Attach the arena to the current thread. */ + { + /* Update the arena thread attachment counters. */ + mstate replaced_arena = thread_arena; + (void) mutex_lock (&free_list_lock); + detach_arena (replaced_arena); ++ ++ /* We may have picked up an arena on the free list. We need to ++ preserve the invariant that no arena on the free list has a ++ positive attached_threads counter (otherwise, ++ arena_thread_freeres cannot use the counter to determine if the ++ arena needs to be put on the free list). We unconditionally ++ remove the selected arena from the free list. The caller of ++ reused_arena checked the free list and observed it to be empty, ++ so the list is very short. */ ++ remove_from_free_list (result); ++ + ++result->attached_threads; ++ + (void) mutex_unlock (&free_list_lock); + } + +diff --git a/po/de.po b/po/de.po +index 1383e8c..ca14c7e 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -8,7 +8,7 @@ msgid "" + msgstr "" + "Project-Id-Version: GNU libc 2.22-pre1\n" + "POT-Creation-Date: 2015-07-31 00:10-0400\n" +-"PO-Revision-Date: 2015-08-31 18:30+0200\n" ++"PO-Revision-Date: 2016-04-22 18:44+0200\n" + "Last-Translator: Jochen Hein <joc...@jochen.org>\n" + "Language-Team: German <translation-team...@lists.sourceforge.net>\n" + "Language: de\n" +@@ -4479,13 +4479,13 @@ msgstr "" + "%15s Cache ist dauerhaft\n" + "%15s Cache wird gemeinsam verwendet\n" + "%15Zu vorgeschlagene Größe\n" +-"%15Zu Gesamtröße des Data-Pools\n" ++"%15Zu Gesamtgröße des Data-Pools\n" + "%15Zu Benutzter Speicher im Data-Pool\n" + "%15lu Time to Live für positive Einträge in Sekunden\n" + "%15lu Time to Live für negative Einträge in Sekunden\n" + "%15<PRIuMAX> Cache-Hits bei positiven Einträgen\n" + "%15<PRIuMAX> Cache-Hits bei positiven Einträgen\n" +-"%15<PRIuMAX> Cache-Misses bei positiven Einträgen\n" ++"%15<PRIuMAX> Cache-Misses bei positiven Einträgen\n" + "%15<PRIuMAX> Cache-Misses bei negativen Einträgen\n" + "%15lu%% Cache-Hit Verhältnis\n" + "%15zu aktuelle Anzahl der Werte im Cache\n" +diff --git a/po/fi.po b/po/fi.po +index 17cb3e3..8a2ab83 100644 +--- a/po/fi.po ++++ b/po/fi.po +@@ -24,16 +24,16 @@ + # + msgid "" + msgstr "" +-"Project-Id-Version: libc 2.21-pre1\n" ++"Project-Id-Version: libc 2.22-pre1\n" + "POT-Creation-Date: 2015-07-31 00:10-0400\n" +-"PO-Revision-Date: 2015-07-28 20:29+0300\n" ++"PO-Revision-Date: 2016-05-26 21:14+0300\n" + "Last-Translator: Lauri Nurmi <lanu...@iki.fi>\n" + "Language-Team: Finnish <translation-team...@lists.sourceforge.net>\n" + "Language: fi\n" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"X-Generator: Poedit 1.8.3\n" ++"X-Generator: Poedit 1.8.7\n" + "Plural-Forms: nplurals=2; plural=(n != 1);\n" + + #: argp/argp-help.c:227 +@@ -126,7 +126,7 @@ msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n" + msgstr "%s%s%s:%u: %s%sOdottamaton virhe: %s.\n" + + #: assert/assert.c:101 +-#, fuzzy, c-format ++#, c-format + msgid "" + "%s%s%s:%u: %s%sAssertion `%s' failed.\n" + "%n" +@@ -169,12 +169,12 @@ msgstr "" + #: malloc/memusagestat.c:563 nss/getent.c:973 nss/makedb.c:369 + #: posix/getconf.c:486 sunrpc/rpcinfo.c:691 + #: sysdeps/unix/sysv/linux/lddlibc4.c:61 +-#, fuzzy, c-format ++#, c-format + msgid "" + "For bug reporting instructions, please see:\n" + "%s.\n" + msgstr "" +-"Ohjeet ohjelmistovioista ilmoittamiseen ovat osoitteessa\n" ++"Katso ohjeet vikailmoitusten tekemiseen osoitteesta:\n" + "%s.\n" + + #: catgets/gencat.c:245 debug/pcprofiledump.c:225 debug/xtrace.sh:64 +@@ -321,9 +321,8 @@ msgstr "Käyttö: xtrace [VALITSIN]... OHJELMA [OHJELMANVALITSIN]...\\n" + + #: debug/xtrace.sh:32 elf/sotruss.sh:56 elf/sotruss.sh:67 elf/sotruss.sh:135 + #: malloc/memusage.sh:26 +-#, fuzzy + msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n" +-msgstr "Kokeile ”%s --help” tai ”%s --usage” saadaksesi lisää tietoa.\n" ++msgstr "Kokeile ”%s --help” tai ”%s --usage” saadaksesi lisää tietoa.\\n" + + #: debug/xtrace.sh:38 + #, fuzzy +@@ -594,9 +593,8 @@ msgid "cannot enable executable stack as shared object requires" + msgstr "jaettua objektikahvaa ei voi luoda" + + #: elf/dl-load.c:1339 +-#, fuzzy + msgid "cannot close file descriptor" +-msgstr "tiedostoa %s ei voi sulkea" ++msgstr "tiedostokahvaa ei voi sulkea" + + #: elf/dl-load.c:1568 + msgid "file too short" +@@ -796,9 +794,8 @@ msgid "Format to use: new, old or compat (default)" + msgstr "Käytettävä muoto: ”new”, ”old” tai ”compat” (oletus)" + + #: elf/ldconfig.c:151 +-#, fuzzy + msgid "Ignore auxiliary cache file" +-msgstr "Käytä CACHEa välimuistitiedostona" ++msgstr "Jätä huomiotta apuvälimuistitiedosto" + + #: elf/ldconfig.c:159 + msgid "Configure Dynamic Linker Run Time Bindings." +@@ -1087,9 +1084,9 @@ msgid "invalid process ID '%s'" + msgstr "virheellinen prosessi-ID ”%s”" + + #: elf/pldd.c:120 +-#, fuzzy, c-format ++#, c-format + msgid "cannot open %s" +-msgstr "laitetta %s ei voi avata" ++msgstr "tiedostoa %s ei voi avata" + + #: elf/pldd.c:152 + #, fuzzy, c-format +@@ -1102,24 +1099,24 @@ msgid "cannot prepare reading %s/task" + msgstr "ei voi avata laitetta %s lukutilaan" + + #: elf/pldd.c:168 +-#, fuzzy, c-format ++#, c-format + msgid "invalid thread ID '%s'" +-msgstr "virheellinen prosessi-ID ”%s”" ++msgstr "virheellinen säie-ID ”%s”" + + #: elf/pldd.c:179 +-#, fuzzy, c-format ++#, c-format + msgid "cannot attach to process %lu" +-msgstr "tiedostoa ”%s” ei voi avata" ++msgstr "ei voida kiinnittyä prosessiin %lu" + + #: elf/pldd.c:294 + #, c-format + msgid "cannot get information about process %lu" +-msgstr "" ++msgstr "tietojen saaminen prosessista %lu ei onnistu" + + #: elf/pldd.c:307 +-#, fuzzy, c-format ++#, c-format + msgid "process %lu is no ELF program" +-msgstr "ohjelma %lu ei ole käytettävissä\n" ++msgstr "prosessi %lu ei ole ELF-ohjelma" + + #: elf/readelflib.c:34 + #, c-format +@@ -1203,7 +1200,7 @@ msgstr "%s kohde ei saa olla hakemisto\n" + #: elf/sln.c:184 + #, c-format + msgid "%s: failed to remove the old destination\n" +-msgstr "" ++msgstr "%s: vanhan kohteen poistaminen epäonnistui\n" + + #: elf/sln.c:192 + #, c-format +@@ -1237,9 +1234,8 @@ msgid "Mandatory arguments to long options are also mandatory for any correspond + msgstr "Pakolliset argumentit pitkille valitsimille ovat pakollisia kaikille vastaaville lyhyille valitsimille.\\n" + + #: elf/sotruss.sh:55 +-#, fuzzy + msgid "%s: option requires an argument -- '%s'\\n" +-msgstr "%s: valitsin ”%s” vaatii argumentin\n" ++msgstr "%s: valitsin vaatii argumentin -- ”%c”\\n" + + #: elf/sotruss.sh:61 + msgid "%s: option is ambiguous; possibilities:" +@@ -1507,7 +1503,6 @@ msgid "unknown iconv() error %d" + msgstr "tuntematon iconv()-virhe %d" + + #: iconv/iconv_prog.c:791 +-#, fuzzy + msgid "" + "The following list contains all the coded character sets known. This does\n" + "not necessarily mean that all combinations of these names can be used for\n" +@@ -1516,9 +1511,9 @@ msgid "" + "\n" + " " + msgstr "" +-"Seuraavassa listassa ovat kaikki tunnetut koodatut merkistöt. Se ei\n" ++"Seuraavassa listassa ovat kaikki tunnetut koodatut merkistöt. Tämä ei\n" + "kuitenkaan välttämättä tarkoita sitä, että kaikkia näiden nimien\n" +-"yhdistelmiä voidaan käyttää FROM- ja TO-komentoriviparametreina. Yksi\n" ++"yhdistelmiä voisi käyttää FROM- ja TO-komentoriviparametreina. Yksi\n" + "koodattu merkistö voi olla listalla useilla eri nimillä (aliaksilla).\n" + "\n" + " " +@@ -2733,14 +2728,12 @@ msgid "locale.alias file to consult when making archive" + msgstr "Arkistoa luotaessa käytettävä locale.alias-tiedosto" + + #: locale/programs/localedef.c:150 +-#, fuzzy + msgid "Generate little-endian output" +-msgstr "Tuota little-endian-koodia" ++msgstr "Tuota little-endian-muotoa" + + #: locale/programs/localedef.c:152 +-#, fuzzy + msgid "Generate big-endian output" +-msgstr "Tuota big-endian-koodia" ++msgstr "Tuota big-endian-muotoa" + + #: locale/programs/localedef.c:157 + msgid "Compile locale specification" +@@ -4275,10 +4268,9 @@ msgid "" + msgstr "" + + #: nscd/nscd.c:635 +-#, fuzzy, c-format +-#| msgid "lstat failed" ++#, c-format + msgid "'wait' failed\n" +-msgstr "tiedoston tilan luku epäonnistui" ++msgstr "”wait” epäonnistui\n" + + #: nscd/nscd.c:642 + #, c-format +@@ -4670,9 +4662,9 @@ msgid "cannot create temporary file" + msgstr "tilapäistä tiedostoa ei voi luoda" + + #: nss/makedb.c:304 +-#, fuzzy, c-format ++#, c-format + msgid "cannot stat newly created file" +-msgstr "tiedoston ”%s” tilaa ei voi lukea: %s" ++msgstr "juuri luodun tiedoston tilaa ei voi lukea" + + #: nss/makedb.c:315 + #, c-format +@@ -4680,9 +4672,9 @@ msgid "cannot rename temporary file" + msgstr "tilapäistä tiedostoa ei voi nimetä uudelleen" + + #: nss/makedb.c:531 nss/makedb.c:554 +-#, fuzzy, c-format ++#, c-format + msgid "cannot create search tree" +-msgstr "hakupolulle ei voi luoda välimuistia" ++msgstr "hakupuuta ei voi luoda" + + #: nss/makedb.c:560 + msgid "duplicate key" +@@ -4699,9 +4691,9 @@ msgid "failed to write new database file" + msgstr "uuden tietokantatiedoston kirjoittaminen epäonnistui" + + #: nss/makedb.c:812 +-#, fuzzy, c-format ++#, c-format + msgid "cannot stat database file" +-msgstr "tiedoston ”%s” tilaa ei voi lukea: %s" ++msgstr "tietokantatiedoston tilaa ei voi lukea" + + #: nss/makedb.c:817 + #, fuzzy, c-format +@@ -4709,9 +4701,9 @@ msgid "cannot map database file" + msgstr "Karttatietokannassa ei ole enempää tietueita" + + #: nss/makedb.c:820 +-#, fuzzy, c-format ++#, c-format + msgid "file not a database file" +-msgstr "luettaessa profilointidatatiedoston tilaa" ++msgstr "tiedosto ei ole tietokantatiedosto" + + #: nss/makedb.c:871 + #, fuzzy, c-format +@@ -4726,7 +4718,7 @@ msgstr "Käyttö: %s [-v määrittely] muuttujanimi [polku]\n" + #: posix/getconf.c:403 + #, c-format + msgid " %s -a [pathname]\n" +-msgstr "" ++msgstr " %s -a [polku]\n" + + #: posix/getconf.c:479 + #, c-format +@@ -5094,11 +5086,11 @@ msgstr "Laitetta irrotettu" + + #: stdio-common/psiginfo.c:139 + msgid "Signal sent by kill()" +-msgstr "" ++msgstr "Signaalin lähetti kill()" + + #: stdio-common/psiginfo.c:142 + msgid "Signal sent by sigqueue()" +-msgstr "" ++msgstr "Signaalin lähetti sigqueue()" + + #: stdio-common/psiginfo.c:145 + msgid "Signal generated by the expiration of a timer" +@@ -5114,7 +5106,7 @@ msgstr "" + + #: stdio-common/psiginfo.c:157 + msgid "Signal sent by tkill()" +-msgstr "" ++msgstr "Signaalin lähetti tkill()" + + #: stdio-common/psiginfo.c:162 + msgid "Signal generated by the completion of an asynchronous name lookup request" +@@ -5296,9 +5288,8 @@ msgid "Failed (unspecified error)" + msgstr "Epäonnistui (määrittelemätön virhe)" + + #: sunrpc/clnt_raw.c:115 +-#, fuzzy + msgid "clnt_raw.c: fatal header serialization error" +-msgstr "clnt_raw.c: vakava otsikon serialisointivirhe" ++msgstr "clnt_raw.c: vakava otsikon sarjallistamisvirhe" + + #: sunrpc/pm_getmaps.c:77 + msgid "pmap_getmaps.c: rpc problem" +@@ -6825,9 +6816,8 @@ msgid "Interrupted by a signal" + msgstr "Signaalin keskeyttämä" + + #: sysdeps/posix/gai_strerror-strs.h:17 +-#, fuzzy + msgid "Parameter string not correctly encoded" +-msgstr "Parametrimerkkijono on väärin koodattu" ++msgstr "Parametrimerkkijono ei ole koodattu oikein" + + #: sysdeps/unix/sysv/linux/i386/readelflib.c:65 + #, c-format +diff --git a/po/sv.po b/po/sv.po +index 49d1f23..e046577 100644 +--- a/po/sv.po ++++ b/po/sv.po +@@ -1,13 +1,17 @@ + # GNU libc message catalog for Swedish +-# Copyright © 1996, 1998, 2001, 2002, 2003, 2006, 2008, 2009, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. ++# Copyright © 1996, 1998, 2001, 2002, 2003, 2006, 2008, 2009, 2011, 2012, 2013, 2014, 2015, 2016 Free Software Foundation, Inc. + # This file is distributed under the same license as the glibc package. +-# Jan Djärv <jan....@swipnet.se>, 1996, 1998, 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014, 2015 ++# ++# Jan Djärv <jan....@swipnet.se>, 1996, 1998, 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014, 2015. ++# Göran Uddeborg <goe...@uddeborg.se>, 2016. ++# ++# $Revision: 1.3 $ + msgid "" + msgstr "" +-"Project-Id-Version: libc 2.21-pre1\n" ++"Project-Id-Version: libc 2.22-pre1\n" + "POT-Creation-Date: 2015-07-31 00:10-0400\n" +-"PO-Revision-Date: 2015-01-24 10:35+0100\n" +-"Last-Translator: Jan Djärv <jan....@swipnet.se>\n" ++"PO-Revision-Date: 2016-08-02 17:17+0200\n" ++"Last-Translator: Göran Uddeborg <goe...@uddeborg.se>\n" + "Language-Team: Swedish <tp...@listor.tp-sv.se>\n" + "Language: sv\n" + "MIME-Version: 1.0\n" +@@ -48,7 +52,7 @@ msgstr " [FLAGGA...]" + #: argp/argp-help.c:1643 + #, c-format + msgid "Try `%s --help' or `%s --usage' for more information.\n" +-msgstr "Försök med \"%s --help\" eller \"%s --usage\" för mer information\n" ++msgstr "Försök med ”%s --help” eller ”%s --usage” för mer information.\n" + + #: argp/argp-help.c:1671 + #, c-format +@@ -304,11 +308,11 @@ msgstr "Användning: xtrace [FLAGGA]... PROGRAM [PROGRAMFLAGGA}...\\n" + #: debug/xtrace.sh:32 elf/sotruss.sh:56 elf/sotruss.sh:67 elf/sotruss.sh:135 + #: malloc/memusage.sh:26 + msgid "Try \\`%s --help' or \\`%s --usage' for more information.\\n" +-msgstr "Försök med \\\"%s --help\\\" eller \\\"%s --usage\\\" för mer information\\n" ++msgstr "Försök med ”%s --help” eller ”%s --usage” för mer information\\n" + + #: debug/xtrace.sh:38 + msgid "%s: option '%s' requires an argument.\\n" +-msgstr "%s: flaggan \\\"%s\\\" kräver ett argument\\n" ++msgstr "%s: flaggan ”%s” kräver ett argument.\\n" + + #: debug/xtrace.sh:45 + msgid "" +@@ -332,19 +336,17 @@ msgstr "" + " --usage Visa en kort hjälptext\n" + " -V,--version Visa versionsinformation och avsluta\n" + "\n" +-"Obligatoriska argument för långa flaggor är obligatoriska även för\n" ++"Obligatoriska argument för långa flaggor är obligatoriska även för\n" + "motsvarande korta.\n" + + #: debug/xtrace.sh:57 elf/ldd.bash.in:55 elf/sotruss.sh:49 + #: malloc/memusage.sh:64 + msgid "For bug reporting instructions, please see:\\\\n%s.\\\\n" +-msgstr "" +-"För felrapporteringsinstruktioner, se:\\\\n%s.\\\\n\n" +-"Rapportera fel eller synpunkter på översättningen till <tp...@listor.tp-sv.se>.\\\\n" ++msgstr "För felrapporteringsinstruktioner, se:\\\\n%s.\\\\nRapportera fel eller synpunkter på översättningen till:\\\\n<tp...@listor.tp-sv.se>.\\\\n" + + #: debug/xtrace.sh:125 + msgid "xtrace: unrecognized option \\`$1'\\n" +-msgstr "xtrace: okänd flagga \"$1\"\\n" ++msgstr "xtrace: okänd flagga ”$1”\\n" + + #: debug/xtrace.sh:138 + msgid "No program name given\\n" +@@ -353,12 +355,12 @@ msgstr "Inget programnamn givet\\n" + #: debug/xtrace.sh:146 + #, sh-format + msgid "executable \\`$program' not found\\n" +-msgstr "program \"$program\" hittades inte\\n" ++msgstr "program ”$program” hittades inte\\n" + + #: debug/xtrace.sh:150 + #, sh-format + msgid "\\`$program' is no executable\\n" +-msgstr "\"$program\" är inte en körbar binär\\n" ++msgstr "”$program” är inte en körbar binär\\n" + + #: dlfcn/dlinfo.c:63 + msgid "RTLD_SELF used in code not dynamically loaded" +@@ -396,7 +398,7 @@ msgstr ", OS ABI: %s %d.%d.%d" + #: elf/cache.c:157 elf/ldconfig.c:1340 + #, c-format + msgid "Can't open cache file %s\n" +-msgstr "Kan inte öppna cache-fil \"%s\"\n" ++msgstr "Kan inte öppna cache-filen %s\n" + + #: elf/cache.c:171 + #, c-format +@@ -416,7 +418,7 @@ msgstr "%d bibliotek hittades i cache \"%s\"\n" + #: elf/cache.c:426 + #, c-format + msgid "Can't create temporary cache file %s" +-msgstr "Kan inte skapa temporär cache-fil \"%s\"" ++msgstr "Kan inte skapa en temporär cache-fil %s" + + #: elf/cache.c:434 elf/cache.c:444 elf/cache.c:448 elf/cache.c:453 + #, c-format +@@ -829,7 +831,7 @@ msgstr "Kan inte ta status (lstat) på %s" + #: elf/ldconfig.c:609 + #, c-format + msgid "Ignored file %s since it is not a regular file." +-msgstr "Ignorerar fil %s eftersom den inte är en vanlig fil" ++msgstr "Ignorerar fil %s eftersom den inte är en vanlig fil." + + #: elf/ldconfig.c:618 + #, c-format +@@ -951,7 +953,7 @@ msgstr "" + + #: elf/ldd.bash.in:80 + msgid "ldd: option \\`$1' is ambiguous" +-msgstr "ldd: flaggan \"$1\" är tvetydig" ++msgstr "ldd: flaggan ”$1” är tvetydig" + + #: elf/ldd.bash.in:87 + msgid "unrecognized option" +@@ -959,7 +961,7 @@ msgstr "okänd flagga" + + #: elf/ldd.bash.in:88 elf/ldd.bash.in:125 + msgid "Try \\`ldd --help' for more information." +-msgstr "Försök med \"ldd --help\" för mer information" ++msgstr "Försök med \"ldd --help\" för mer information." + + #: elf/ldd.bash.in:124 + msgid "missing file arguments" +@@ -1028,10 +1030,9 @@ msgid "cannot read object name" + msgstr "kan inte läsa objektnamn" + + #: elf/pldd-xx.c:219 +-#, fuzzy, c-format +-#| msgid "cannot allocate memory for program header" ++#, c-format + msgid "cannot allocate buffer for object name" +-msgstr "kan inte allokera minne för programhuvud" ++msgstr "kan inte allokera en buffert för objektnamn" + + #: elf/pldd.c:64 + msgid "List dynamic shared objects loaded into process." +@@ -1212,11 +1213,11 @@ msgstr "" + + #: elf/sotruss.sh:46 + msgid "Mandatory arguments to long options are also mandatory for any corresponding\\nshort options.\\n" +-msgstr "Obligatoriska respektive valfria argument för långa flaggor är obligatoriska respektive\\nvalfria även för korta.\\n" ++msgstr "Obligatoriska respektive valfria argument för långa flaggor är obligatoriska\\nrespektive valfria även för korta.\\n" + + #: elf/sotruss.sh:55 + msgid "%s: option requires an argument -- '%s'\\n" +-msgstr "%s: flaggan kräver ett argument -- \\\"%s\\\"\\n" ++msgstr "%s: flaggan kräver ett argument — ”%s”\\n" + + #: elf/sotruss.sh:61 + msgid "%s: option is ambiguous; possibilities:" +@@ -1240,7 +1241,7 @@ msgstr "" + + #: elf/sotruss.sh:134 + msgid "%s: unrecognized option '%c%s'\\n" +-msgstr "%s: okänd flagga \\\"%c%s\\\"\\n" ++msgstr "%s: okänd flagga ”%c%s”\\n" + + #: elf/sprof.c:77 + msgid "Output selection:" +@@ -1260,7 +1261,7 @@ msgstr "generera anropsgraf" + + #: elf/sprof.c:89 + msgid "Read and display shared object profiling data." +-msgstr "Läs och visa profildata för delat objekt" ++msgstr "Läs och visa profildata för delat objekt." + + #: elf/sprof.c:94 + msgid "SHOBJ [PROFDATA]" +@@ -1622,7 +1623,7 @@ msgstr "Fel: .netrc kan läsas av andra." + + #: inet/ruserpass.c:185 + msgid "Remove password or make file unreadable by others." +-msgstr "Ta bort lösenord eller gör filen oläsbar för andra" ++msgstr "Ta bort lösenord eller gör filen oläsbar för andra." + + #: inet/ruserpass.c:277 + #, c-format +@@ -2182,12 +2183,12 @@ msgstr "Inget namn definierat i teckenuppsättning" + #: locale/programs/ld-ctype.c:479 + #, c-format + msgid "character L'\\u%0*x' in class `%s' must be in class `%s'" +-msgstr "tecken L\"\\u%0*x\" i klass \"%s\" måste vara i klass \"%s\"" ++msgstr "tecken L'\\u%0*x' i klassen ”%s” måste vara i klassen ”%s”" + + #: locale/programs/ld-ctype.c:494 + #, c-format + msgid "character L'\\u%0*x' in class `%s' must not be in class `%s'" +-msgstr "tecken L\"\\u%0*x\" i klass \"%s\" får inte vara i klass \"%s\"" ++msgstr "tecken L'\\u%0*x' i klassen ”%s” får inte vara i klassen ”%s”" + + #: locale/programs/ld-ctype.c:508 locale/programs/ld-ctype.c:566 + #, c-format +@@ -2611,7 +2612,7 @@ msgstr "Skriv mer information" + + #: locale/programs/locale.c:85 + msgid "Get locale-specific information." +-msgstr "Hämta lokalspecifik information" ++msgstr "Hämta lokalspecifik information." + + #: locale/programs/locale.c:88 + msgid "" +@@ -3022,7 +3023,7 @@ msgstr "felaktig mcheck_status, biblioteket är felaktigt\n" + + #: malloc/memusage.sh:32 + msgid "%s: option '%s' requires an argument\\n" +-msgstr "%s: flaggan \\\"%s\\\" kräver ett argument\\n" ++msgstr "%s: flaggan ”%s” kräver ett argument\\n" + + #: malloc/memusage.sh:38 + msgid "" +@@ -3091,11 +3092,11 @@ msgstr "" + + #: malloc/memusage.sh:191 + msgid "memusage: option \\`${1##*=}' is ambiguous" +-msgstr "memusage: flaggan \"${1##*=}\" är tvetydig" ++msgstr "memusage: flaggan ”${1##*=}” är tvetydig" + + #: malloc/memusage.sh:200 + msgid "memusage: unrecognized option \\`$1'" +-msgstr "memusage: okänd flagga \"$1\"" ++msgstr "memusage: okänd flagga ”$1”" + + #: malloc/memusage.sh:213 + msgid "No program name given" +@@ -3341,7 +3342,7 @@ msgstr "Kan inte skapa process hos server" + + #: nis/nis_error.h:48 + msgid "Master server busy, full dump rescheduled." +-msgstr "Huvudserver är upptagen, full dump åter schemalagd" ++msgstr "Huvudserver är upptagen, full dump åter schemalagd." + + #: nis/nis_local_names.c:121 + #, c-format +@@ -3511,7 +3512,7 @@ msgstr "\t\tRättigheter : " + + #: nis/nis_print.c:290 + msgid "Linked Object Type : " +-msgstr "Länkad objekttyp: " ++msgstr "Länkad objekttyp : " + + #: nis/nis_print.c:292 + #, c-format +@@ -3802,15 +3803,14 @@ msgid " (first)" + msgstr " (första)" + + #: nscd/cache.c:288 +-#, fuzzy, c-format +-#| msgid "cannot stat() file `%s': %s" ++#, c-format + msgid "checking for monitored file `%s': %s" +-msgstr "kan inte ta status på fil \"%s\": %s" ++msgstr "kontrollerar den övervakade filen ”%s”: %s" + + #: nscd/cache.c:298 + #, c-format + msgid "monitored file `%s` changed (mtime)" +-msgstr "" ++msgstr "den övervakade filen ”%s” ändrades (mtime)" + + #: nscd/cache.c:341 + #, c-format +@@ -3906,34 +3906,32 @@ msgstr "kan inte få uttag (socket) att acceptera förbindelser: %s" + #: nscd/connections.c:973 + #, c-format + msgid "disabled inotify-based monitoring for file `%s': %s" +-msgstr "" ++msgstr "avaktiverade inotify-baserad övervakning för filen ”%s”: %s" + + #: nscd/connections.c:977 + #, c-format + msgid "monitoring file `%s` (%d)" +-msgstr "" ++msgstr "övervakar filen ”%s” (%d)" + + #: nscd/connections.c:990 + #, c-format + msgid "disabled inotify-based monitoring for directory `%s': %s" +-msgstr "" ++msgstr "avaktiverade inotify-baserad övervakning av katalogen ”%s”: %s" + + #: nscd/connections.c:994 +-#, fuzzy, c-format +-#| msgid "Can't open directory %s" ++#, c-format + msgid "monitoring directory `%s` (%d)" +-msgstr "Kan inte öppna katalog %s" ++msgstr "övervakar katalogen ”%s” (%d)" + + #: nscd/connections.c:1022 +-#, fuzzy, c-format +-#| msgid "register trace file %s for database %s" ++#, c-format + msgid "monitoring file %s for database %s" +-msgstr "registrera spårningsfil %s för databas %s" ++msgstr "övervakar filen %s för databas %s" + + #: nscd/connections.c:1032 + #, c-format + msgid "stat failed for file `%s'; will try again later: %s" +-msgstr "" ++msgstr "stat misslyckades för filen ”%s”; kommer försöka igen senare: %s" + + #: nscd/connections.c:1151 + #, c-format +@@ -4032,44 +4030,42 @@ msgstr "handle_request: begäran mottagen (Version = %d)" + #: nscd/connections.c:1963 + #, c-format + msgid "ignored inotify event for `%s` (file exists)" +-msgstr "" ++msgstr "ignorerade inotify-händelse för ”%s” (filen finns)" + + #: nscd/connections.c:1968 + #, c-format + msgid "monitored file `%s` was %s, removing watch" +-msgstr "" ++msgstr "den övervakade filen ”%s” var %s, tar bort vakten" + + #: nscd/connections.c:1976 nscd/connections.c:2018 + #, c-format + msgid "failed to remove file watch `%s`: %s" +-msgstr "" ++msgstr "misslyckades att ta bort filvakt ”%s”: %s" + + #: nscd/connections.c:1991 + #, c-format + msgid "monitored file `%s` was written to" +-msgstr "" ++msgstr "den övervakade filen ”%s” skrevs till" + + #: nscd/connections.c:2015 + #, c-format + msgid "monitored parent directory `%s` was %s, removing watch on `%s`" +-msgstr "" ++msgstr "den övervakade föräldrakatalogen ”%s” var %s, tar bort vakten av ”%s”" + + #: nscd/connections.c:2041 + #, c-format + msgid "monitored file `%s` was %s, adding watch" +-msgstr "" ++msgstr "den övervakade filen ”%s” var %s, lägger till vakt" + + #: nscd/connections.c:2053 +-#, fuzzy, c-format +-#| msgid "failed to load shared object `%s'" ++#, c-format + msgid "failed to add file watch `%s`: %s" +-msgstr "misslyckades med att ladda delat objekt \"%s\"" ++msgstr "misslyckades med att lägga till filvakt ”%s”: %s" + + #: nscd/connections.c:2247 nscd/connections.c:2428 +-#, fuzzy, c-format +-#| msgid "disabled inotify after read error %d" ++#, c-format + msgid "disabled inotify-based monitoring after read error %d" +-msgstr "inaktiverade inotify efter läsfel %d" ++msgstr "avaktiverade inotify-baserad övervakning efter läsfel %d" + + #: nscd/connections.c:2543 + msgid "could not initialize conditional variable" +@@ -4199,7 +4195,7 @@ msgstr "Använd separat cache för varje användare" + + #: nscd/nscd.c:122 + msgid "Name Service Cache Daemon." +-msgstr "Namntjänst cache-demon" ++msgstr "Cache-demon för namntjänsten." + + #: nscd/nscd.c:155 nss/getent.c:1007 nss/makedb.c:206 + #, c-format +@@ -4531,11 +4527,11 @@ msgstr "Access Vector Cache (AVC) startad" + + #: nscd/selinux.c:368 + msgid "Error querying policy for undefined object classes or permissions." +-msgstr "Fel när policy för odefinierade objektklasser eller rättigheter hämtades" ++msgstr "Fel när policy för odefinierade objektklasser eller rättigheter hämtades." + + #: nscd/selinux.c:375 + msgid "Error getting security class for nscd." +-msgstr "Fel när säkerhetsklass för nscd hämtades" ++msgstr "Fel när säkerhetsklass för nscd hämtades." + + #: nscd/selinux.c:380 + #, c-format +@@ -4609,7 +4605,7 @@ msgstr "inaktivera DIN-kodning" + + #: nss/getent.c:64 + msgid "Get entries from administrative database." +-msgstr "Hämta poster från den administrativa databasen" ++msgstr "Hämta poster från den administrativa databasen." + + #: nss/getent.c:148 nss/getent.c:477 nss/getent.c:522 + #, c-format +@@ -4652,7 +4648,7 @@ msgstr "Genererad rad som inte ingår i iterationen" + + #: nss/makedb.c:131 + msgid "Create simple database from textual input." +-msgstr "Skapa en enkel databas från textuell indata" ++msgstr "Skapa en enkel databas från textuell indata." + + #: nss/makedb.c:134 + msgid "" +@@ -5412,7 +5408,7 @@ msgstr "Kan inte ange netid-flaggan utan TIRPC!\n" + #: sunrpc/rpc_main.c:1374 + #, c-format + msgid "Cannot use table flags with newstyle!\n" +-msgstr "Kan inte ange tabellflaggor med ny stil\n" ++msgstr "Kan inte ange tabellflaggor med ny stil!\n" + + #: sunrpc/rpc_main.c:1393 + #, c-format +@@ -7270,18 +7266,9 @@ msgstr "tidszonsförkortning skiljer sig från POSIX-standarden" + + #: timezone/zic.c:2789 + msgid "too many, or too long, time zone abbreviations" +-msgstr "för många eller för långa tidszonförkortningar" ++msgstr "för många eller för långa tidszonsförkortningar" + + #: timezone/zic.c:2829 + #, c-format + msgid "%s: Can't create directory %s: %s\n" + msgstr "%s: Kan inte skapa katalog %s: %s\n" +- +-#~ msgid "cannot load any more object with static TLS" +-#~ msgstr "kan inte ladda fler objekt med statiskt TLS" +- +-#~ msgid "%s: no PLTREL found in object %s\n" +-#~ msgstr "%s: hittade inga PLTREL i objekt %s\n" +- +-#~ msgid "cannot create internal descriptors" +-#~ msgstr "kan inte skapa interna deskriptorer" +diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile +index 71ba61e..b015ff7 100644 +--- a/sysdeps/unix/sysv/linux/i386/Makefile ++++ b/sysdeps/unix/sysv/linux/i386/Makefile +@@ -48,9 +48,11 @@ endif + ifeq ($(subdir),nptl) + # pull in __syscall_error routine + libpthread-routines += sysdep ++libpthread-shared-only-routines += sysdep + endif + + ifeq ($(subdir),rt) + # pull in __syscall_error routine + librt-routines += sysdep ++librt-shared-only-routines += sysdep + endif diff --git a/debian/patches/series b/debian/patches/series index bcc58d2..35b3ec5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -#git-updates.diff +git-updates.diff locale/check-unknown-symbols.diff locale/fix-LC_COLLATE-rules.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git