Updated to fedora-glibc-20041214T1058cvs/fedora-glibc-2_3_3-92

6 files changed, 13 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 8dd5b22040..23f4ed3341 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-12-13  Ulrich Drepper  <drepper@redhat.com>
 
+	* po/de.po: Update from translation team.
+
 	* nss/getnssent.c (__nss_getent): Double buffer size each round to
 	avoid problems with delays for some people's huge entries.
 	* nss/getXXbyYY.c (FUNCTION_NAME): Likewise.
diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
index 5dbf88cdc8..4d7c33c728 100644
--- a/elf/ldd.bash.in
+++ b/elf/ldd.bash.in
@@ -74,7 +74,6 @@ For bug reporting instructions, please see:
     ;;
   -u | --u | --un | --unu | --unus | --unuse | --unused)
     unused=yes
-    bind_now=yes
     shift
     ;;
   --v | --ve | --ver)
diff --git a/fedora/branch.mk b/fedora/branch.mk
index b016d1b7eb..3916242a1e 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
 # This file is updated automatically by Makefile.
 glibc-branch := fedora
 glibc-base := HEAD
-fedora-sync-date := 2004-12-13 23:23 UTC
-fedora-sync-tag := fedora-glibc-20041213T2323
+fedora-sync-date := 2004-12-14 10:58 UTC
+fedora-sync-tag := fedora-glibc-20041214T1058
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 7ebb22e30d..860822601f 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 91
+%define glibcrelease 92
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -1265,6 +1265,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Tue Dec 14 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-92
+- update from CVS
+- fix %{_prefix}/libexec/getconf filenames generation
+
 * Tue Dec 14 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-91
 - update from CVS
   - double buffer size in getXXbyYY or getXXent on ERANGE
diff --git a/libio/bug-ungetc4.c b/libio/bug-ungetc4.c
index 82019b6d8e..0f530efecf 100644
--- a/libio/bug-ungetc4.c
+++ b/libio/bug-ungetc4.c
@@ -38,7 +38,7 @@ do_prepare (void)
       printf ("cannot create temporary file: %m\n");
       exit (1);
     }
-  write (fd, pattern, sizeof (pattern));
+  write (fd, pattern, sizeof (pattern) - 1);
   close (fd);
 }
 
diff --git a/po/de.po b/po/de.po
index 8ff90ac397..9c47575ecc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GNU libc 2.3.3\n"
 "POT-Creation-Date: 2004-08-05 09:16+0200\n"
-"PO-Revision-Date: 2004-08-14 12:26+0200\n"
+"PO-Revision-Date: 2004-11-06 12:38+0100\n"
 "Last-Translator: Jochen Hein <jochen@jochen.org>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,6 +51,7 @@ msgstr ""
 # weight
 # ellipsis: Auslassung
 # range: bereich
+#
 #: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
 msgid "Hangup"
 msgstr "Aufgelegt"
@@ -2716,7 +2717,7 @@ msgstr "Der Name ist im Netzwerk nicht eindeutig"
 #: stdio-common/../sysdeps/gnu/errlist.c:1285
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:111
 msgid "File descriptor in bad state"
-msgstr "Die Dateizugriffsnummer ist ein schlechter Verfassung"
+msgstr "Die Dateizugriffsnummer ist in schlechter Verfassung"
 
 #: stdio-common/../sysdeps/gnu/errlist.c:1293
 #: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:112