[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/glibc/FC-4 glibc-20050727-20050815.patch, NONE, 1.1 glibc.spec, 1.159, 1.160



Author: jakub

Update of /cvs/dist/rpms/glibc/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv26294

Modified Files:
	glibc.spec 
Added Files:
	glibc-20050727-20050815.patch 
Log Message:
2.3.5-10.3


glibc-20050727-20050815.patch:
 argp/argp-help.c                   |    7 -
 elf/dl-load.c                      |   14 +-
 elf/elf.h                          |    2 
 iconvdata/utf-16.c                 |   34 ++---
 mach/shortcut.awk                  |    2 
 misc/error.c                       |    2 
 nis/nis_subr.c                     |   18 --
 nis/nis_xdr.c                      |    4 
 nscd/cache.c                       |    6 
 nscd/connections.c                 |  231 +++++++++++++++++++++++++++++++++++--
 nscd/mem.c                         |   12 -
 nscd/nscd.h                        |    5 
 nscd/nscd_stat.c                   |   13 +-
 stdio-common/fxprintf.c            |    1 
 sysdeps/mach/hurd/mig-reply.c      |    2 
 sysdeps/powerpc/powerpc32/Makefile |    2 
 sysdeps/powerpc/powerpc64/Makefile |    6 
 sysdeps/unix/sysv/linux/sigwait.c  |   13 +-
 sysdeps/x86_64/dl-machine.h        |   19 +--
 timezone/africa                    |    8 -
 timezone/antarctica                |    6 
 timezone/asia                      |   24 +--
 timezone/australasia               |   24 +--
 timezone/checktab.awk              |    4 
 timezone/europe                    |   78 ++++++------
 timezone/iso3166.tab               |    4 
 timezone/leapseconds               |   36 +++--
 timezone/northamerica              |   12 -
 timezone/private.h                 |   31 ++--
 timezone/scheck.c                  |    2 
 timezone/solar87                   |    8 -
 timezone/solar88                   |    8 -
 timezone/solar89                   |    8 -
 timezone/southamerica              |   18 +-
 timezone/tzselect.ksh              |    4 
 timezone/zdump.c                   |   47 +++++++
 timezone/zic.c                     |   44 ++++++-
 timezone/zone.tab                  |    4 
 38 files changed, 542 insertions(+), 221 deletions(-)

--- NEW FILE glibc-20050727-20050815.patch ---
2005-08-15  Jakub Jelinek  <jakub redhat com>

	* nis/nis_subr.c (nis_leaf_of_r): Handle buflen == 0 correctly.

2005-08-08  Ulrich Drepper  <drepper redhat com>

	* nscd/connections.c (main_loop_epoll): Pass NULL as event
	argument for epoll_ctl(EPOLL_CTL_DEL) calls.

	* nscd/nscd_stat.c (receive_print_stats): Really print values of
	thread number, paranoia, and restart interval the server is using.

	* argp/argp-help.c: Use _IO_vasprintf instead of vasprintf.

2005-08-08  Roland McGrath  <roland redhat com>

	* argp/argp-help.c (__argp_error): __asprintf -> vasprintf.
	(__argp_failure): Likewise.

2005-08-08  Ulrich Drepper  <drepper redhat com>

	* nscd/cache.c (cache_add): Commit hash table and header to disk.

	* nscd/mem.c (mempool_alloc): Use posix_fallocate instead of ftruncate.
	* nscd/connections.c (nscd_init): Likewise.

2005-08-08  Jakub Jelinek  <jakub redhat com>

	* stdio-common/fxprintf.c: Include libioP.h.

2005-08-08  Ulrich Drepper  <drepper redhat com>
	    Jakub Jelinek  <jakub redhat com>

	* nscd/mem.c (BLOCK_ALIGN_LOG, BLOCK_ALIGN, BLOCK_ALIGN_M1): Move
	definitions to...
	* nscd/nscd.h (BLOCK_ALIGN_LOG, BLOCK_ALIGN, BLOCK_ALIGN_M1): ...here.
	* nscd/connections.c (usekey): New enum.
	(check_use, verify_persistent_db): New functions.
	(nscd_init): If persistent database is corrupted, unlink it and
	recreate rather than falling back to non-persistent database.
	Call verify_persistent_db.  Avoid overflows in total computation.

2005-08-08  Ulrich Drepper  <drepper redhat com>

	* iconvdata/utf-16.c (PREPARE_LOOP): Minor cleanups to make code
	better readable.  Avoid passing var to loop function, it's not
	necessary at all.

2005-08-07  Ulrich Drepper  <drepper redhat com>

	* elf/elf.h (DT_ALPHA_PLTRO): Use symbolic name in DT_ALPHA_PLTRO
	definition.

2005-08-05  Ulrich Drepper  <drepper redhat com>

	* timezone/checktab.awk: Update from tzcode2005k.
	* timezone/private.h: Likewise.
	* timezone/scheck.c: Likewise.
	* timezone/tzselect.ksh: Likewise.
	* timezone/zdump.c: Likewise.
	* timezone/zic.c: Likewise.
	* timezone/africa: Update from tzdata2005k.
	* timezone/antarctica: Likewise.
	* timezone/asia: Likewise.
	* timezone/australasia: Likewise.
	* timezone/europe: Likewise.
	* timezone/iso3166.tab: Likewise.
	* timezone/leapseconds: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/solar87: Likewise.
	* timezone/solar88: Likewise.
	* timezone/solar89: Likewise.
	* timezone/southamerica: Likewise.
	* timezone/zone.tab: Likewise.

2005-08-05  Roland McGrath  <roland redhat com>

	* mach/shortcut.awk: Ignore `weak_alias' lines.
	Reported by Alfred M. Szmidt <ams gnu org>.

	* sysdeps/mach/hurd/mig-reply.c (reply_port): Don't use ?: as lvalue.
	Reported by Alfred M. Szmidt <ams gnu org>.

2005-08-03  Dwayne Grant McConnell  <dgm69 us ibm com>

	* sysdeps/powerpc/powerpc32/Makefile (CFLAGS-initfini.s):
	Use +=, not =, to append.  Remove duplicate flags.
	* sysdeps/powerpc/powerpc64/Makefile (CFLAGS-initfini.s):
	Likewise.  Fix comments.

2005-08-01  Ulrich Drepper  <drepper redhat com>

	* sysdeps/unix/sysv/linux/sigwait.c (do_sigwait): Restart system
	call if it returned EINTR.

2005-07-31  Ulrich Drepper  <drepper redhat com>

	* sysdeps/x86_64/dl-machine.h (elf_machine_load_address): Move
	helper variable into .data.rel.ro.  Simplify the code.  Extend
	comment to explain prelinking.

2005-07-30  Ulrich Drepper  <drepper redhat com>

	* elf/dl-load.c [__WORDSIZE==64] (FILEBUF_SIZE): Adjust the value
	up.  We have more program header entries now and the note section
	was normally not loaded.

	* nis/nis_subr.c: Some minor code cleanups.

2005-07-28  Thomas Schwinge  <schwinge nic-nac-project de>

	[BZ #1137]
	* misc/error.c [_LIBC]: Include <stdbool.h> and <stdint.h>.

2005-07-28  Ulrich Drepper  <drepper redhat com>

	* nis/nis_xdr.c: Help gcc to avoid generating unnecessary wrapper
	functions.

--- libc/argp/argp-help.c	20 Jul 2005 17:50:29 -0000	1.45
+++ libc/argp/argp-help.c	9 Aug 2005 01:26:22 -0000	1.47
@@ -48,7 +48,8 @@ char *alloca ();
 #include <stdarg.h>
 #include <ctype.h>
 #include <limits.h>
-#ifdef USE_IN_LIBIO
+#ifdef _LIBC
+# include <../libio/libioP.h>
 # include <wchar.h>
 #endif
 
@@ -1766,7 +1767,7 @@ __argp_error (const struct argp_state *s
 #ifdef _LIBC
 	  char *buf;
 
-	  if (__asprintf (&buf, fmt, ap) < 0)
+	  if (_IO_vasprintf (&buf, fmt, ap) < 0)
 	    buf = NULL;
 
 	  __fxprintf (stream, "%s: %s\n",
@@ -1836,7 +1837,7 @@ __argp_failure (const struct argp_state 
 #ifdef _LIBC
 	      char *buf;
 
-	      if (__asprintf (&buf, fmt, ap) < 0)
+	      if (_IO_vasprintf (&buf, fmt, ap) < 0)
 		buf = NULL;
 
 	      __fxprintf (stream, ": %s", buf);
--- libc/elf/dl-load.c	26 Apr 2005 04:25:58 -0000	1.268
+++ libc/elf/dl-load.c	30 Jul 2005 21:14:33 -0000	1.269
@@ -122,19 +122,19 @@ int __stack_prot attribute_hidden attrib
    question is how large are the ELF and program header combined.  The
    ELF header 32-bit files is 52 bytes long and in 64-bit files is 64
    bytes long.  Each program header entry is again 32 and 56 bytes
-   long respectively.  I.e., even with a file which has 7 program
-   header entries we only have to read 512B.  Add to this a bit of
-   margin for program notes and reading 512B and 640B for 32-bit and
-   64-bit files respecitvely is enough.  If this heuristic should
-   really fail for some file the code in `_dl_map_object_from_fd'
-   knows how to recover.  */
+   long respectively.  I.e., even with a file which has 10 program
+   header entries we only have to read 372B/624B respectively.  Add to
+   this a bit of margin for program notes and reading 512B and 832B
+   for 32-bit and 64-bit files respecitvely is enough.  If this
+   heuristic should really fail for some file the code in
+   `_dl_map_object_from_fd' knows how to recover.  */
 struct filebuf
 {
   ssize_t len;
 #if __WORDSIZE == 32
 # define FILEBUF_SIZE 512
 #else
-# define FILEBUF_SIZE 640
+# define FILEBUF_SIZE 832
 #endif
   char buf[FILEBUF_SIZE] __attribute__ ((aligned (__alignof (ElfW(Ehdr)))));
 };
--- libc/elf/elf.h	17 Jun 2005 22:56:39 -0000	1.148
+++ libc/elf/elf.h	7 Aug 2005 07:53:58 -0000	1.149
@@ -1867,7 +1867,7 @@ typedef Elf32_Addr Elf32_Conflict;
 #define LITUSE_ALPHA_TLS_LDM	5
 
 /* Legal values for d_tag of Elf64_Dyn.  */
-#define DT_ALPHA_PLTRO		0x70000000
+#define DT_ALPHA_PLTRO		(DT_LOPROC + 0)
 #define DT_ALPHA_NUM		1
 
 /* PowerPC specific declarations */
--- libc/iconvdata/utf-16.c	19 Feb 2003 20:36:21 -0000	1.22
+++ libc/iconvdata/utf-16.c	8 Aug 2005 18:44:29 -0000	1.23
@@ -44,10 +44,9 @@
 #define PREPARE_LOOP \
   enum direction dir = ((struct utf16_data *) step->__data)->dir;	      \
   enum variant var = ((struct utf16_data *) step->__data)->var;		      \
-  int swap;								      \
-  if (FROM_DIRECTION && var == UTF_16)					      \
+  if (__builtin_expect (data->__invocation_counter == 0, 0) && var == UTF_16) \
     {									      \
[...1617 lines suppressed...]
 # they bought the wrong times on satellite for coverage of Pope's visit.
@@ -1010,7 +1010,7 @@ Zone America/Port_of_Spain -4:06:04 -	LM
 			-4:00	-	AST
 
 # Uruguay
-# From Paul Eggert <eggert twinsun com> (1993-11-18):
+# From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.
 # From Shanks:
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
--- libc/timezone/tzselect.ksh	1 Oct 1999 15:51:26 -0000	1.3
+++ libc/timezone/tzselect.ksh	6 Aug 2005 05:40:57 -0000	1.4
@@ -1,11 +1,11 @@
 #! @KSH@
 
-# '@(#)tzselect.ksh	1.7'
+# '@(#)tzselect.ksh	1.8'
 
 # Ask the user about the time zone, and output the resulting TZ value to stdout.
 # Interact with the user via stderr and stdin.
 
-# Contributed by Paul Eggert <eggert twinsun com>.
+# Contributed by Paul Eggert.
 
 # Porting notes:
 #
--- libc/timezone/zdump.c	4 Apr 2005 20:36:46 -0000	1.9
+++ libc/timezone/zdump.c	6 Aug 2005 05:40:57 -0000	1.10
@@ -1,4 +1,4 @@
-static char	elsieid[] = "@(#)zdump.c	7.64";
+static char	elsieid[] = "@(#)zdump.c	7.65";
 
 /*
 ** This code has been made independent of the rest of the time
@@ -144,8 +144,10 @@ static time_t	absolute_min_time;
 static time_t	absolute_max_time;
 static size_t	longest;
 static char *	progname;
+static int	warned;
 
 static char *	abbr P((struct tm * tmp));
+static void	abbrok P((const char * abbr, const char * zone));
 static long	delta P((struct tm * newp, struct tm * oldp));
 static void	dumptime P((const struct tm * tmp));
 static time_t	hunt P((char * name, time_t lot, time_t	hit));
@@ -191,6 +193,44 @@ time_t *	tp;
 }
 #endif /* !defined TYPECHECK */
 
+static void
+abbrok(abbr, zone)
+const char * const	abbr;
+const char * const	zone;
+{
+	register int		i;
+	register const char *	cp;
+	register char *		wp;
+
+	if (warned)
+		return;
+	cp = abbr;
+	wp = NULL;
+	while (isascii(*cp) && isalpha(*cp))
+		++cp;
+	if (cp - abbr == 0)
+		wp = _("lacks alphabetic at start");
+	if (cp - abbr < 3)
+		wp = _("has fewer than 3 alphabetics");
+	if (cp - abbr > 6)
+		wp = _("has more than 6 alphabetics");
+	if (wp == NULL && (*cp == '+' || *cp == '-')) {
+		++cp;
+		if (isascii(*cp) && isdigit(*cp))
+			if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
+				++cp;
+	}
+	if (*cp != '\0')
+		wp = _("differs from POSIX standard");
+	if (wp == NULL)
+		return;
+	(void) fflush(stdout);
+	(void) fprintf(stderr,
+		"%s: warning: zone \"%s\" abbreviation \"%s\" %s\n",
+		progname, zone, abbr, wp);
+	warned = TRUE;
+}
+
 int
 main(argc, argv)
 int	argc;
@@ -216,7 +256,7 @@ char *	argv[];
 	INITIALIZE(cutlotime);
 	INITIALIZE(cuthitime);
 #if HAVE_GETTEXT
-	(void) setlocale(LC_MESSAGES, "");
+	(void) setlocale(LC_ALL, "");
 #ifdef TZ_DOMAINDIR
 	(void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR);
 #endif /* defined TEXTDOMAINDIR */
@@ -297,6 +337,7 @@ _("%s: usage is %s [ --version ] [ -v ] 
 			show(argv[i], now, FALSE);
 			continue;
 		}
+		warned = FALSE;
 		t = absolute_min_time;
 		show(argv[i], t, TRUE);
 		t += SECSPERHOUR * HOURSPERDAY;
@@ -527,6 +568,8 @@ int	v;
 		}
 	}
 	(void) printf("\n");
+	if (tmp != NULL && *abbr(tmp) != '\0')
+		abbrok(abbr(tmp), zone);
 }
 
 static char *
--- libc/timezone/zic.c	4 Apr 2005 20:36:46 -0000	1.19
+++ libc/timezone/zic.c	6 Aug 2005 05:40:57 -0000	1.20
@@ -1,4 +1,4 @@
-static char	elsieid[] = "@(#)zic.c	7.122";
+static char	elsieid[] = "@(#)zic.c	7.124";
 
 /*
 ** Regardless of the type of time_t, we do our work using this type.
@@ -10,6 +10,10 @@ typedef int	zic_t;
 #include "locale.h"
 #include "tzfile.h"
 
+#ifndef ZIC_MAX_ABBR_LEN_WO_WARN
+#define ZIC_MAX_ABBR_LEN_WO_WARN	6
+#endif /* !defined ZIC_MAX_ABBR_LEN_WO_WARN */
+
 #if HAVE_SYS_STAT_H
 #include "sys/stat.h"
 #endif
@@ -475,8 +479,7 @@ char *	argv[];
 	(void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
 #endif /* defined unix */
 #if HAVE_GETTEXT
-	(void) setlocale(LC_CTYPE, "");
-	(void) setlocale(LC_MESSAGES, "");
+	(void) setlocale(LC_ALL, "");
 #ifdef TZ_DOMAINDIR
 	(void) bindtextdomain(TZ_DOMAIN, TZ_DOMAINDIR);
 #endif /* defined TEXTDOMAINDIR */
@@ -2197,6 +2200,41 @@ const char * const	string;
 {
 	register int	i;
 
+	if (strcmp(string, GRANDPARENTED) != 0) {
+		register const char *	cp;
+		register char *		wp;
+
+		/*
+		** Want one to ZIC_MAX_ABBR_LEN_WO_WARN alphabetics
+		** optionally followed by a + or - and a number from 1 to 14.
+		*/
+		cp = string;
+		wp = NULL;
+		while (isascii(*cp) && isalpha(*cp))
+			++cp;
+		if (cp - string == 0)
+wp = _("time zone abbreviation lacks alphabetic at start");
+		if (noise && cp - string > 3)
+wp = _("time zone abbreviation has more than 3 alphabetics");
+		if (cp - string > ZIC_MAX_ABBR_LEN_WO_WARN)
+wp = _("time zone abbreviation has too many alphabetics");
+		if (wp == NULL && (*cp == '+' || *cp == '-')) {
+			++cp;
+			if (isascii(*cp) && isdigit(*cp))
+				if (*cp++ == '1' && *cp >= '0' && *cp <= '4')
+					++cp;
+		}
+		if (*cp != '\0')
+wp = _("time zone abbreviation differs from POSIX standard");
+		if (wp != NULL) {
+			wp = ecpyalloc(wp);
+			wp = ecatalloc(wp, " (");
+			wp = ecatalloc(wp, string);
+			wp = ecatalloc(wp, ")");
+			warning(wp);
+			ifree(wp);
+		}
+	}
 	i = strlen(string) + 1;
 	if (charcnt + i > TZ_MAX_CHARS) {
 		error(_("too many, or too long, time zone abbreviations"));
--- libc/timezone/zone.tab	29 Jul 2004 21:49:30 -0000	1.21
+++ libc/timezone/zone.tab	6 Aug 2005 06:03:20 -0000	1.22
@@ -1,8 +1,8 @@
-# @(#)zone.tab	1.30
+# @(#)zone.tab	1.31
 #
 # TZ zone descriptions
 #
-# From Paul Eggert <eggert twinsun com> (1996-08-05):
+# From Paul Eggert (1996-08-05):
 #
 # This file contains a table with the following columns:
 # 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/FC-4/glibc.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- glibc.spec	28 Jul 2005 14:46:49 -0000	1.159
+++ glibc.spec	15 Aug 2005 12:13:59 -0000	1.160
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20050524T1606
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.5
-%define glibcrelease 10.2
+%define glibcrelease 10.3
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64
@@ -38,6 +38,7 @@
 Patch3: %{name}-ia64-lib64.patch
 Patch4: glibc-20050524-20050727.patch
 Patch5: glibc-zh_TW.patch
+Patch6: glibc-20050727-20050815.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
 Obsoletes:  linuxthreads, gencat, locale, ldconfig, locale-ja
@@ -308,6 +309,7 @@
 %endif
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 # Hack till glibc-kernheaders get updated, argh
 mkdir asm
@@ -1352,6 +1354,11 @@
 %endif
 
 %changelog
+* Mon Aug 15 2005 Jakub Jelinek <jakub redhat com> 2.3.5-10.3
+- selective update from CVS
+  - nscd persistent database verifier (#164001)
+  - handle EINTR in sigwait properly
+
 * Thu Jul 28 2005 Jakub Jelinek <jakub redhat com> 2.3.5-10.2
 - avoid some unnecessary PLT relocations that newly appeared in 2.3.5-10.1
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]