mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-06 14:10:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated to fedora-glibc-20060831T0640

Browse Source
This commit is contained in:
Jakub Jelinek 2006-08-31 06:53:32 +00:00
parent 2455d11258
commit 936bb2647a
18 changed files with 87 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@ -1,3 +1,23 @@
2006-08-30 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (splice): Add offin
and offout arguments to the prototype.
* sysdeps/unix/sysv/linux/s390/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/sparc/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/sh/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/i386/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/ia64/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h (splice): Likewise.
* sysdeps/unix/sysv/linux/syscalls.list (splice): Adjust args string.
2006-08-28 Ulrich Drepper <drepper@redhat.com>
* elf/dl-load.c (_dl_init_paths): Expand DSTs.
* elf/dl-open.c (dl_open_worker): Allow $LIB and $PLATFORM in
dlopen parameters.
2006-08-28 Jakub Jelinek <jakub@redhat.com>
* inet/getnameinfo.c (getnameinfo): For AF_INET, check errno

20
elf/dl-load.c
View File

@ -749,7 +749,25 @@ _dl_init_paths (const char *llp)
{
size_t nllp;
const char *cp = llp;
char *llp_tmp = strdupa (llp);
char *llp_tmp;
#ifdef SHARED
/* Expand DSTs. */
size_t cnt = DL_DST_COUNT (llp, 1);
if (__builtin_expect (cnt == 0, 1))
llp_tmp = strdupa (llp);
else
{
/* Determine the length of the substituted string. */
size_t total = DL_DST_REQUIRED (l, llp, strlen (llp), cnt);
/* Allocate the necessary memory. */
llp_tmp = (char *) alloca (total + 1);
llp_tmp = _dl_dst_substitute (l, llp, llp_tmp, 1);
}
#else
llp_tmp = strdupa (llp);
#endif
/* Decompose the LD_LIBRARY_PATH contents. First determine how many
elements it has. */

7
elf/dl-open.c
View File

@ -221,13 +221,6 @@ dl_open_worker (void *a)
size_t required;
char *new_file;
/* DSTs must not appear in SUID/SGID programs. */
if (INTUSE(__libc_enable_secure))
/* This is an error. */
_dl_signal_error (0, "dlopen", NULL,
N_("DST not allowed in SUID/SGID programs"));
/* Determine how much space we need. We have to allocate the
memory locally. */
required = DL_DST_REQUIRED (call_map, file, len, _dl_dst_count (dst, 0));

4
fedora/branch.mk
View File

@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc4
fedora-sync-date := 2006-08-28 19:03 UTC
fedora-sync-tag := fedora-glibc-20060828T1903
fedora-sync-date := 2006-08-31 06:40 UTC
fedora-sync-tag := fedora-glibc-20060831T0640

8
fedora/glibc.spec.in
View File

@ -1,4 +1,4 @@
%define glibcrelease 26
%define glibcrelease 27
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define xenarches i686 athlon
%ifarch %{xenarches}
@ -1448,6 +1448,12 @@ rm -f *.filelist*
%endif
%changelog
* Thu Aug 31 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-27
- allow $LIB and $PLATFORM in dlopen parameters even in suid/sgid (#204399)
- fix splice prototype (#204530)
- fix pthread_rwlock_{,try,timed}wrlock to honor reader preference
if requested
* Mon Aug 28 2006 Jakub Jelinek <jakub@redhat.com> 2.4.90-26
- real fix for the doubly linked list corruption problem
- try harder in realloc to allocate memory (BZ#2684)

9
nptl/ChangeLog
View File

@ -1,3 +1,12 @@
2006-08-30 Ulrich Drepper <drepper@redhat.com>
* pthread_rwlock_trywrlock.c (__pthread_rwlock_trywrlock): Respect
reader preference.
* sysdeps/pthread/pthread_rwlock_timedwrlock.c
(pthread_rwlock_timedwrlock): Likewise.
* sysdeps/pthread/pthread_rwlock_wrlock.c (__pthread_rwlock_wrlock):
Likewise.
2006-08-25 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/libc_pthread_init.c (freeres_libpthread):

7
nptl/pthread_rwlock_trywrlock.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -30,7 +30,10 @@ __pthread_rwlock_trywrlock (rwlock)
lll_mutex_lock (rwlock->__data.__lock);
if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0)
if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0
/* Respect the preference. */
&& (rwlock->__data.__flags != 0
|| rwlock->__data.__nr_readers_queued == 0))
{
rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid);
result = 0;

6
nptl/sysdeps/pthread/pthread_rwlock_timedwrlock.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@ -40,7 +40,9 @@ pthread_rwlock_timedwrlock (rwlock, abstime)
int err;
/* Get the rwlock if there is no writer and no reader. */
if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0)
if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0
&& (rwlock->__data.__flags != 0
|| rwlock->__data.__nr_readers_queued == 0))
{
/* Mark self as writer. */
rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid);

6
nptl/sysdeps/pthread/pthread_rwlock_wrlock.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2003 Free Software Foundation, Inc.
/* Copyright (C) 2003, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Martin Schwidefsky <schwidefsky@de.ibm.com>, 2003.
@ -37,7 +37,9 @@ __pthread_rwlock_wrlock (rwlock)
while (1)
{
/* Get the rwlock if there is no writer and no reader. */
if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0)
if (rwlock->__data.__writer == 0 && rwlock->__data.__nr_readers == 0
&& (rwlock->__data.__flags != 0
|| rwlock->__data.__nr_readers_queued == 0))
{
/* Mark self as writer. */
rwlock->__data.__writer = THREAD_GETMEM (THREAD_SELF, tid);

3
sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
View File

@ -216,7 +216,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

3
sysdeps/unix/sysv/linux/i386/bits/fcntl.h
View File

@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

3
sysdeps/unix/sysv/linux/ia64/bits/fcntl.h
View File

@ -218,7 +218,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

3
sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
View File

@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

3
sysdeps/unix/sysv/linux/s390/bits/fcntl.h
View File

@ -244,7 +244,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

3
sysdeps/unix/sysv/linux/sh/bits/fcntl.h
View File

@ -224,7 +224,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

3
sysdeps/unix/sysv/linux/sparc/bits/fcntl.h
View File

@ -243,7 +243,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */

2
sysdeps/unix/sysv/linux/syscalls.list
View File

@ -67,7 +67,7 @@ setfsgid EXTRA setfsgid i:i setfsgid
setfsuid EXTRA setfsuid i:i setfsuid
setpgid - setpgid i:ii __setpgid setpgid
sigaltstack - sigaltstack i:PP __sigaltstack sigaltstack
splice EXTRA splice i:iiii splice
splice EXTRA splice i:iPiPii splice
sysinfo EXTRA sysinfo i:p sysinfo
swapon - swapon i:si __swapon swapon
swapoff - swapoff i:s __swapoff swapoff

3
sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h
View File

@ -238,7 +238,8 @@ extern int vmsplice (int __fdout, const struct iovec *__iov, size_t __count,
unsigned int __flags);
/* Splice two files together. */
extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
extern int splice (int __fdin, __off64_t *__offin, int __fdout,
__off64_t *__offout, size_t __len, unsigned int __flags)
__THROW;
/* In-kernel implementation of tee for pipe buffers. */