rpms/glibc/devel glibc-fedora.patch, 1.89, 1.90 glibc.spec, 1.156, 1.157 sources, 1.121, 1.122

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon May 30 10:02:26 UTC 2005


Author: jakub

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

Modified Files:
	glibc-fedora.patch glibc.spec sources 
Log Message:
auto-import glibc-2.3.5-10 on branch devel from glibc-2.3.5-10.src.rpm

glibc-fedora.patch:
 ChangeLog                                            |   37 +
 ChangeLog.11                                         |   21 
 ChangeLog.12                                         |   12 
 ChangeLog.15                                         |   45 ++
 Versions.def                                         |    2 
 csu/elf-init.c                                       |   18 
 debug/Versions                                       |    6 
 debug/fgets_chk.c                                    |    2 
 debug/fgets_u_chk.c                                  |    2 
 debug/getcwd_chk.c                                   |    3 
 debug/getwd_chk.c                                    |    3 
 debug/pread64_chk.c                                  |    3 
 debug/pread_chk.c                                    |    3 
 debug/read_chk.c                                     |    3 
 debug/readlink_chk.c                                 |    3 
 debug/recv_chk.c                                     |    3 
 debug/recvfrom_chk.c                                 |    3 
 debug/tst-chk1.c                                     |    9 
 elf/dl-load.c                                        |   30 +
 elf/dl-support.c                                     |    5 
 elf/ldconfig.c                                       |   25 -
 elf/rtld.c                                           |  104 ++++
 elf/tst-tls10.h                                      |    4 
 iconv/iconvconfig.c                                  |   55 +-
 include/features.h                                   |   10 
 intl/locale.alias                                    |    2 
 libio/bits/stdio2.h                                  |   34 -
 libio/stdio.h                                        |    2 
 linuxthreads/ChangeLog                               |   44 ++
 linuxthreads/Makefile                                |    7 
 linuxthreads/cancel.c                                |    1 
 linuxthreads/lockfile.c                              |    6 
 linuxthreads/man/Makefile                            |    8 
 linuxthreads/man/pthread_cleanup_push.man            |   14 
 linuxthreads/man/pthread_kill_other_threads_np.man   |    8 
 linuxthreads/man/pthread_mutexattr_setkind_np.man    |    8 
 linuxthreads/semaphore.h                             |    1 
 linuxthreads/sysdeps/alpha/tls.h                     |   46 +-
 linuxthreads/sysdeps/i386/tls.h                      |    9 
 linuxthreads/sysdeps/ia64/tls.h                      |    9 
 linuxthreads/sysdeps/powerpc/tls.h                   |   12 
 linuxthreads/sysdeps/pthread/Makefile                |   12 
 linuxthreads/sysdeps/pthread/nptl-struct-pthread.sym |   13 
 linuxthreads/sysdeps/s390/tls.h                      |    9 
 linuxthreads/sysdeps/sh/tls.h                        |    9 
 linuxthreads/sysdeps/sparc/tls.h                     |    9 
 linuxthreads/sysdeps/x86_64/tls.h                    |    9 
 linuxthreads/tst-tls1.h                              |    2 
 locale/iso-4217.def                                  |   13 
 locale/programs/3level.h                             |   36 +
 localedata/Makefile                                  |    1 
 localedata/SUPPORTED                                 |    6 
 localedata/locales/cy_GB                             |    7 
 localedata/locales/en_GB                             |    4 
 localedata/locales/en_US                             |    1 
 localedata/locales/no_NO                             |   69 +++
 localedata/locales/zh_TW                             |    6 
 math/Versions                                        |    9 
 nptl/ChangeLog                                       |   10 
 nptl/Makefile                                        |    8 
 nptl/descr.h                                         |    4 
 nptl/pthread_cond_destroy.c                          |   30 +
 nptl/sysdeps/unix/sysv/linux/kernel-features.h       |    6 
 nscd/connections.c                                   |   52 ++
 nscd/nscd.c                                          |    8 
 nscd/nscd.conf                                       |    4 
 nscd/nscd_conf.c                                     |    5 
 posix/Makefile                                       |   19 
 posix/bits/unistd.h                                  |   58 --
 posix/getconf.speclist.h                             |   15 
 socket/bits/socket2.h                                |   18 
 sysdeps/generic/dl-cache.h                           |    8 
 sysdeps/generic/w_exp2.c                             |    4 
 sysdeps/i386/Versions                                |    7 
 sysdeps/i386/bits/atomic.h                           |  410 +++++++++++++++++++
 sysdeps/ia64/Makefile                                |    4 
 sysdeps/ia64/Versions                                |    7 
 sysdeps/ia64/ia64libgcc.S                            |  350 ----------------
 sysdeps/ia64/libgcc-compat.c                         |   84 +++
 sysdeps/m68k/Versions                                |    7 
 sysdeps/mips/mips64/Versions                         |    7 
 sysdeps/sparc/sparc64/Versions                       |    7 
 sysdeps/unix/nice.c                                  |    7 
 sysdeps/unix/sysv/linux/dl-osinfo.h                  |    4 
 sysdeps/unix/sysv/linux/i386/dl-cache.h              |   59 ++
 sysdeps/unix/sysv/linux/ia64/dl-cache.h              |   27 +
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.c           |    5 
 sysdeps/unix/sysv/linux/ia64/dl-procinfo.h           |    5 
 sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed         |    2 
 sysdeps/unix/sysv/linux/paths.h                      |    2 
 sysdeps/unix/sysv/linux/readonly-area.c              |    5 
 sysdeps/unix/sysv/linux/tcsetattr.c                  |   32 +
 sysdeps/x86_64/Versions                              |    7 
 version.h                                            |    2 
 94 files changed, 1494 insertions(+), 632 deletions(-)

Index: glibc-fedora.patch
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc-fedora.patch,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- glibc-fedora.patch	24 May 2005 16:58:02 -0000	1.89
+++ glibc-fedora.patch	30 May 2005 10:02:23 -0000	1.90
@@ -1,6 +1,16 @@
 --- glibc-20050524T1606/ChangeLog	24 May 2005 06:18:21 -0000	1.9374
-+++ glibc-20050524T1606-fedora/ChangeLog	24 May 2005 16:31:24 -0000	1.8782.2.107
-@@ -398,6 +398,14 @@
++++ glibc-20050524T1606-fedora/ChangeLog	30 May 2005 09:42:27 -0000	1.8782.2.108
+@@ -1,3 +1,9 @@
++2005-05-30  Jakub Jelinek  <jakub at redhat.com>
++
++	* sysdeps/unix/sysv/linux/dl-osinfo.h (DL_SYSDEP_OSCHECK): If
++	GLRO(dl_osversion) has been already set to a value smaller than
++	_dl_discover_osversion (), don't overwrite it here.
++
+ 2005-05-23  Roland McGrath  <roland at redhat.com>
+ 
+ 	* sysdeps/arm, sysdeps/unix/arm, sysdeps/unix/sysv/linux/arm:
+@@ -398,6 +404,14 @@
  	* nscd/connections.c (nscd_run): Use time() value in prune_cache
  	call, not timeout value, since the latter might be from another clock.
  
@@ -15,7 +25,7 @@
  2005-04-27  Roland McGrath  <roland at redhat.com>
  
  	[BZ #877]
-@@ -1013,17 +1021,6 @@
+@@ -1013,17 +1027,6 @@
  
  2005-03-28  Roland McGrath  <roland at redhat.com>
  
@@ -33,7 +43,7 @@
  	* locale/langinfo.h (_NL_LOCALE_NAME): New macro.
  	[__USE_GNU] (NL_LOCALE_NAME): New macro.
  	* locale/nl_langinfo.c: Grok special item value for _NL_LOCALE_NAME,
-@@ -2092,6 +2089,18 @@
+@@ -2092,6 +2095,18 @@
  
  	* scripts/soversions.awk: Fix default version set handling.
  
@@ -955,8 +965,22 @@
  }
  #endif
 --- glibc-20050524T1606/linuxthreads/ChangeLog	24 May 2005 06:18:26 -0000	1.851
-+++ glibc-20050524T1606-fedora/linuxthreads/ChangeLog	24 May 2005 16:31:27 -0000	1.817.2.27
-@@ -841,6 +841,12 @@
++++ glibc-20050524T1606-fedora/linuxthreads/ChangeLog	30 May 2005 09:15:05 -0000	1.817.2.28
+@@ -1,3 +1,13 @@
++2005-05-30  Jakub Jelinek  <jakub at redhat.com>
++
++	* man/Makefile (SOURCES): Remove all man pages but
++	pthread_cleanup_push.man, pthread_kill_other_threads_np.man
++	and pthread_mutexattr_setkind_np.man.
++	* man/pthread_cleanup_push.man: Replace (3) with (3p) where man page
++	was not kept.
++	* man/pthread_kill_other_threads_np.man: Likewise.
++	* man/pthread_mutexattr_setkind_np.man: Likewise.
++
+ 2005-05-23  Roland McGrath  <roland at redhat.com>
+ 
+ 	* sysdeps/arm, sysdeps/unix/sysv/linux/arm: Subdirectories moved to
+@@ -841,6 +851,12 @@
  	(pthread_barrierattr_setpshared): Return EINVAL if pshared
  	is neither PTHREAD_PROCESS_PRIVATE nor PTHREAD_PROCESS_SHARED.
  
@@ -969,7 +993,7 @@
  2003-09-02  Ulrich Drepper  <drepper at redhat.com>
  
  	* sysdeps/unix/sysv/linux/i386/dl-sysdep.h
-@@ -973,6 +979,34 @@
+@@ -973,6 +989,34 @@
  
  2003-07-22  Jakub Jelinek  <jakub at redhat.com>
  
@@ -1072,6 +1096,116 @@
  
  struct tls_obj
  {
+--- glibc-20050524T1606/linuxthreads/man/Makefile	6 Apr 2002 01:04:38 -0000	1.2
++++ glibc-20050524T1606-fedora/linuxthreads/man/Makefile	30 May 2005 09:15:07 -0000	1.2.2.1
+@@ -1,10 +1,4 @@
+-SOURCES=pthread_atfork.man pthread_attr_init.man pthread_cancel.man \
+-  pthread_cleanup_push.man pthread_cond_init.man \
+-  pthread_condattr_init.man pthread_create.man pthread_detach.man \
+-  pthread_equal.man pthread_exit.man pthread_join.man \
+-  pthread_key_create.man pthread_mutex_init.man \
+-  pthread_mutexattr_init.man pthread_once.man pthread_self.man \
+-  pthread_setschedparam.man pthread_sigmask.man sem_init.man \
++SOURCES= pthread_cleanup_push.man \
+   pthread_kill_other_threads_np.man pthread_mutexattr_setkind_np.man
+ 
+ MANPAGES=$(SOURCES:.man=.3thr)
+--- glibc-20050524T1606/linuxthreads/man/pthread_cleanup_push.man	11 Mar 1998 12:42:23 -0000	1.1
++++ glibc-20050524T1606-fedora/linuxthreads/man/pthread_cleanup_push.man	30 May 2005 09:15:07 -0000	1.1.6.1
+@@ -21,7 +21,7 @@ void pthread_cleanup_pop_restore_np(int 
+ .SH DESCRIPTION
+ 
+ Cleanup handlers are functions that get called when a thread
+-terminates, either by calling !pthread_exit!(3) or because of
++terminates, either by calling !pthread_exit!(3p) or because of
+ cancellation. Cleanup handlers are installed and removed following a
+ stack-like discipline.
+ 
+@@ -37,7 +37,7 @@ with !malloc!(3) or close file descripto
+ !pthread_cleanup_push! installs the |routine| function with argument
+ |arg| as a cleanup handler. From this point on to the matching
+ !pthread_cleanup_pop!, the function |routine| will be called with
+-arguments |arg| when the thread terminates, either through !pthread_exit!(3)
++arguments |arg| when the thread terminates, either through !pthread_exit!(3p)
+ or by cancellation. If several cleanup handlers are active at that
+ point, they are called in LIFO order: the most recently installed
+ handler is called first.
+@@ -56,7 +56,7 @@ with the matching closing brace !}! bein
+ of the matching !pthread_cleanup_pop!.
+ 
+ !pthread_cleanup_push_defer_np! is a non-portable extension that
+-combines !pthread_cleanup_push! and !pthread_setcanceltype!(3).
++combines !pthread_cleanup_push! and !pthread_setcanceltype!(3p).
+ It pushes a cleanup handler just as !pthread_cleanup_push! does, but
+ also saves the current cancellation type and sets it to deferred
+ cancellation. This ensures that the cleanup mechanism is effective
+@@ -113,9 +113,9 @@ None.
+ Xavier Leroy <Xavier.Leroy at inria.fr>
+ 
+ .SH "SEE ALSO"
+-!pthread_exit!(3),
+-!pthread_cancel!(3),
+-!pthread_setcanceltype!(3).
++!pthread_exit!(3p),
++!pthread_cancel!(3p),
++!pthread_setcanceltype!(3p).
+ 
+ .SH EXAMPLE
+ 
+@@ -149,7 +149,7 @@ pthread_cleanup_pop(1);
+ .fi
+ 
+ Notice that the code above is safe only in deferred cancellation mode
+-(see !pthread_setcanceltype!(3)). In asynchronous cancellation mode,
++(see !pthread_setcanceltype!(3p)). In asynchronous cancellation mode,
+ a cancellation can occur between !pthread_cleanup_push! and
+ !pthread_mutex_lock!, or between !pthread_mutex_unlock! and
+ !pthread_cleanup_pop!, resulting in both cases in the thread trying to
+--- glibc-20050524T1606/linuxthreads/man/pthread_kill_other_threads_np.man	11 Mar 1998 12:42:23 -0000	1.1
++++ glibc-20050524T1606-fedora/linuxthreads/man/pthread_kill_other_threads_np.man	30 May 2005 09:15:07 -0000	1.1.6.1
+@@ -16,7 +16,7 @@ called just before a thread calls one of
+ e.g. !execve!(2).
+ 
+ Termination of the other threads is not performed through
+-!pthread_cancel!(3) and completely bypasses the cancellation
++!pthread_cancel!(3p) and completely bypasses the cancellation
+ mechanism. Hence, the current settings for cancellation state and
+ cancellation type are ignored, and the cleanup handlers are not
+ executed in the terminated threads.
+@@ -26,9 +26,9 @@ Xavier Leroy <Xavier.Leroy at inria.fr>
+ 
+ .SH "SEE ALSO"
+ !execve!(2),
+-!pthread_setcancelstate!(3),
+-!pthread_setcanceltype!(3),
+-!pthread_cancel!(3).
++!pthread_setcancelstate!(3p),
++!pthread_setcanceltype!(3p),
++!pthread_cancel!(3p).
+ 
+ .SH BUGS
+ 
+--- glibc-20050524T1606/linuxthreads/man/pthread_mutexattr_setkind_np.man	6 Apr 2002 01:05:27 -0000	1.1
++++ glibc-20050524T1606-fedora/linuxthreads/man/pthread_mutexattr_setkind_np.man	30 May 2005 09:15:07 -0000	1.1.2.1
+@@ -14,8 +14,8 @@ int pthread_mutexattr_getkind_np(const p
+ 
+ .SH DESCRIPTION
+ 
+-These functions are deprecated, use !pthread_mutexattr_settype!(3)
+-and !pthread_mutexattr_gettype!(3) instead.
++These functions are deprecated, use !pthread_mutexattr_settype!(3p)
++and !pthread_mutexattr_gettype!(3p) instead.
+ 
+ .SH "RETURN VALUE"
+ !pthread_mutexattr_getkind_np! always returns 0.
+@@ -35,5 +35,5 @@ nor !PTHREAD_MUTEX_ERRORCHECK_NP!
+ Xavier Leroy <Xavier.Leroy at inria.fr>
+ 
+ .SH "SEE ALSO"
+-!pthread_mutexattr_settype!(3),
+-!pthread_mutexattr_gettype!(3).
++!pthread_mutexattr_settype!(3p),
++!pthread_mutexattr_gettype!(3p).
 --- glibc-20050524T1606/linuxthreads/sysdeps/alpha/tls.h	9 Jan 2005 20:01:12 -0000	1.6
 +++ glibc-20050524T1606-fedora/linuxthreads/sysdeps/alpha/tls.h	8 Feb 2005 10:04:11 -0000	1.5.2.2
 @@ -58,54 +58,76 @@ typedef struct
@@ -3133,6 +3267,19 @@
    if (result != -1)
      return getpriority (PRIO_PROCESS, 0);
    else
+--- glibc-20050524T1606/sysdeps/unix/sysv/linux/dl-osinfo.h	7 Apr 2005 20:56:50 -0000	1.19
++++ glibc-20050524T1606-fedora/sysdeps/unix/sysv/linux/dl-osinfo.h	30 May 2005 09:42:34 -0000	1.14.2.4
+@@ -145,7 +145,9 @@ _dl_discover_osversion (void)
+     int version = _dl_discover_osversion ();				      \
+     if (__builtin_expect (version >= 0, 1))				      \
+       {									      \
+-	GLRO(dl_osversion) = version;					      \
++	if (__builtin_expect (GLRO(dl_osversion) == 0, 1)		      \
++	    || GLRO(dl_osversion) > version)				      \
++	  GLRO(dl_osversion) = version;					      \
+ 									      \
+ 	/* Now we can test with the required version.  */		      \
+ 	if (__LINUX_KERNEL_VERSION > 0 && version < __LINUX_KERNEL_VERSION)   \
 --- glibc-20050524T1606/sysdeps/unix/sysv/linux/paths.h	15 Nov 2000 23:06:47 -0000	1.11
 +++ glibc-20050524T1606-fedora/sysdeps/unix/sysv/linux/paths.h	22 Sep 2004 21:21:08 -0000	1.11.4.1
 @@ -61,7 +61,7 @@


Index: glibc.spec
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/glibc.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- glibc.spec	24 May 2005 16:58:02 -0000	1.156
+++ glibc.spec	30 May 2005 10:02:23 -0000	1.157
@@ -3,7 +3,7 @@
 %define glibcsrcdir glibc-20050524T1606
 %define glibc_release_tarballs 0
 %define glibcversion 2.3.5
-%define glibcrelease 9
+%define glibcrelease 10
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 sparc64 ppc ppc64
@@ -1344,6 +1344,14 @@
 %endif
 
 %changelog
+* Mon May 30 2005 Jakub Jelinek <jakub at redhat.com> 2.3.5-10
+- fix LD_ASSUME_KERNEL (since 2.3.5-8 GLRO(dl_osversion)
+  has been always overwritten with the version of currently
+  running kernel)
+- remove linuxthreads man pages other than those covered in
+  3p section, as 3p man pages are far better quality and describe
+  POSIX behaviour that NPTL implements (#159084)
+
 * Tue May 24 2005 Jakub Jelinek <jakub at redhat.com> 2.3.5-9
 - update from CVS
   - increase bindresvport's LOWPORT to 512, apparently some


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/glibc/devel/sources,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- sources	24 May 2005 16:58:02 -0000	1.121
+++ sources	30 May 2005 10:02:23 -0000	1.122
@@ -1,2 +1,2 @@
 8543c324cdd8c43aea280fa3738f8186  glibc-20050524T1606.tar.bz2
-9ded48aed251ee019639dac11dccc65f  glibc-fedora-20050524T1606.tar.bz2
+ea77b628e06890d36248f2199c3cc1d5  glibc-fedora-20050524T1606.tar.bz2




More information about the fedora-cvs-commits mailing list