Updated to fedora-glibc-2_5-20061008T1257

9 files changed, 38 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 7c213e12cd..4e93d46a89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-06  Andreas Jaeger  <aj@suse.de>
+
+	* include/features.h (__GLIBC_MINOR__): It's glibc 2.5 now.
+
+2006-10-06  Ulrich Drepper  <drepper@redhat.com>
+
+	* po/pl.po: Update from translation team.
+
+	* nscd/nscd.c (main): Fix typo in message.
+	Patch by Jakub Bogsz <qboosh@pld-linux.org>.
+
 2006-10-02  Jakub Jelinek  <jakub@redhat.com>
 
 	[BZ #3291]
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 608931e4a9..dbfdf57338 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora-2_5
 glibc-base := glibc-2_5-branch
 DIST_BRANCH := FC-6
 COLLECTION := dist-fc6
-fedora-sync-date := 2006-10-02 18:58 UTC
-fedora-sync-tag := fedora-glibc-20061002T1858
+fedora-2_5-sync-date := 2006-10-08 12:57 UTC
+fedora-2_5-sync-tag := fedora-glibc-2_5-20061008T1257
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 37cda6065d..23fec6c779 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 2
+%define glibcrelease 3
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define xenarches i686 athlon
 %ifarch %{xenarches}
@@ -1528,6 +1528,12 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Sun Oct  8 2006 Jakub Jelinek <jakub@redhat.com> 2.5-3
+- bump __GLIBC_MINOR__
+- increase PTHREAD_STACK_MIN on ppc{,64} to 128K to allow
+  64K pagesize kernels (#209877)
+- speed up initgroups on NIS+ (#208203)
+
 * Mon Oct  2 2006 Jakub Jelinek <jakub@redhat.com> 2.5-2
 - fix nscd database growing (#207928)
 - bypass prelinking when LD_DYNAMIC_WEAK=1 is in the environment
diff --git a/include/features.h b/include/features.h
index 2428e08038..aeeb3a578a 100644
--- a/include/features.h
+++ b/include/features.h
@@ -310,7 +310,7 @@
 /* Major and minor version number of the GNU C library package.  Use
    these macros to test for features in specific releases.  */
 #define	__GLIBC__	2
-#define	__GLIBC_MINOR__	4
+#define	__GLIBC_MINOR__	5
 
 #define __GLIBC_PREREQ(maj, min) \
 	((__GLIBC__ << 16) + __GLIBC_MINOR__ >= ((maj) << 16) + (min))
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 78414d58e7..7930f1399d 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-05  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* locales/tt_RU: Fix territory, title and descriptive comment.
+
+2006-10-05  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/pa_IN (abday): Fix spelling of Sunday.
+	Patch by Mayank Jain <majain@redhat.com>.
+
 2006-10-01  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/en_GB: Use more complete en_US data in LC_NAME.
diff --git a/localedata/locales/pa_IN b/localedata/locales/pa_IN
index e38308dfac..b269472d4e 100644
--- a/localedata/locales/pa_IN
+++ b/localedata/locales/pa_IN
@@ -80,7 +80,7 @@ abday       "<U0A10><U0A24><U0020>";/
             "<U0A2C><U0A41><U0A71><U0A27><U0020>";/
             "<U0A35><U0A40><U0A30><U0020>";/
             "<U0A36><U0A41><U0A71><U0A15><U0A30><U0020>";/
-            "<U0A36><U0A28><U0A40><U0A1A><U0A30><U0020>"
+            "<U0A36><U0A28><U0A3F><U0A71><U0A1A><U0A30><U0020>"
 %
 % Full weekday names (%A)
 day       "<U0A10><U0A24><U0A35><U0A3E><U0A30><U0020>";/
diff --git a/localedata/locales/tt_RU b/localedata/locales/tt_RU
index 3bac711a8f..bfa6bb8dac 100644
--- a/localedata/locales/tt_RU
+++ b/localedata/locales/tt_RU
@@ -1,7 +1,7 @@
 comment_char %
 escape_char  /
 %
-% Tatar Language Locale for Tatarstan
+% Tatar Language Locale for Russia
 % Source:
 % Contact: Pablo Saratxaga, Rinat Norkin
 % Email: <pablo@mandrakesoft.com>, <rinat@taif.ru>
@@ -24,7 +24,7 @@ escape_char  /
 % replace cyrillic alphabet
 
 LC_IDENTIFICATION
-title "Tatar language locale for Tatarstan"
+title "Tatar language locale for Russia"
 source "Rinat Norkin"
 address ""
 contact "Pablo Saratxaga, Rinat Norkin"
@@ -32,7 +32,7 @@ email "pablo@mandrakesoft.com, rinat@taif.ru"
 tel ""
 fax ""
 language "Tatar"
-territory "Tatarstan"
+territory "Russia"
 revision "0.4"
 date "2001-01-28"
 
diff --git a/manual/stdio.texi b/manual/stdio.texi
index c471209134..977989d95e 100644
--- a/manual/stdio.texi
+++ b/manual/stdio.texi
@@ -2393,8 +2393,9 @@ This function is similar to @code{sprintf}, except that it dynamically
 allocates a string (as with @code{malloc}; @pxref{Unconstrained
 Allocation}) to hold the output, instead of putting the output in a
 buffer you allocate in advance.  The @var{ptr} argument should be the
-address of a @code{char *} object, and @code{asprintf} stores a pointer
-to the newly allocated string at that location.
+address of a @code{char *} object, and a successful call to
+@code{asprintf} stores a pointer to the newly allocated string at that
+location.
 
 The return value is the number of characters allocated for the buffer, or
 less than zero if an error occurred. Usually this means that the buffer
diff --git a/nscd/nscd.c b/nscd/nscd.c
index 03359f3c05..588b09d4fb 100644
--- a/nscd/nscd.c
+++ b/nscd/nscd.c
@@ -240,7 +240,7 @@ main (int argc, char **argv)
 
       if (chdir ("/") != 0)
 	error (EXIT_FAILURE, errno,
-	       _("cannot change current working cirectory to \"/\""));
+	       _("cannot change current working directory to \"/\""));
 
       openlog ("nscd", LOG_CONS | LOG_ODELAY, LOG_DAEMON);