Skip to content

Commit

Permalink
Updated to fedora-glibc-20080802T0809
Browse files Browse the repository at this point in the history
  • Loading branch information
Jakub Jelinek committed Aug 2, 2008
1 parent c704519 commit 2fb513c
Show file tree
Hide file tree
Showing 36 changed files with 1,205 additions and 602 deletions.
74 changes: 74 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,79 @@
2008-08-01 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/Versions: Fix changes due to old patch for
new epoll_create1 interface.
* sysdeps/unix/sysv/linux/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/sys/epoll.h: Likewise.
* sysdeps/unix/sysv/linux/x86_64/sys/epoll.h: Likewise.

* include/arpa/nameser.h (NS_GET16): Use const pointer.
(NS_GET32): Likewise.

* sysdeps/unix/sysv/linux/kernel-features.h: s390 has the new
syscalls, too.

* sysdeps/unix/sysv/linux/dl-origin.c (_dl_get_origin): We cannot
use the AT_EXECFN value if it is no absolute path.
* sysdeps/unix/sysv/linux/kernel-features.h: Never define
__ASSUME_AT_EXECFN.

* Versions.def: Add GLIBC_2.9 to libresolv.
* include/resolv.h: Remove hidden proto declarations for __ns_*
functions. Add them for __dn_count_labels and __p_secstodate.
* include/arpa/nameser.h: Add a number of hidden proto declarations.
Define ns_msg_getflags macro here.
* resolv/res_debug.c: Add hidden definition for __dn_count_labels
and __p_secstodate.
* resolv/Versions: Export functions from <arpa/nameser.h> from
libresolv in version GLIBC_2.9.
* resolv/ns_name.c: Integrate changes from bind 9.5.0. Add necessary
hidden definitions.
* resolv/ns_netint.c: Likewise.
* resolv/ns_parse.c: Likewise.
* resolv/ns_print.c: Likewise.
* resolv/ns_samedomain.c: Likewise.
* resolv/ns_ttl.c: Likewise.
* resolv/arpa/nameser_compat.h: Likewise.
* resolv/arpa/nameser.h: Likewise. Remove macros which redirect
function calls.
* resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Use __ns_get16
instead of ns_get16.
* resolv/nss_dns/dns-host.c (getanswer_r): Use __ns_get16 and
__ns_get32 instead of ns_get16 and ns_get32 respectively.
(gaih_getanswer_slice): Likewise.
* resolv/Makefile (libresolv-routines): Add ns_date.
* resolv/ns_date.c: New file.

* elf/Makefile (check-localplt.out): Also check libresolv and
libcrypt.

2008-07-31 Ulrich Drepper <drepper@redhat.com>

* sysdeps/unix/sysv/linux/kernel-features.h: Define
__ASSUME_O_CLOEXEC.

2008-07-30 Ulrich Drepper <drepper@redhat.com>

* sysdeps/posix/getaddrinfo.c (gaih_inet): Raise size of initial
buffer passed to NSS functions.

* nscd/connections.c (nscd_init): Type if preprocessor directive.

* sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_PACCEPT):
Define.

* misc/syslog.c (openlog_internal): Fix compile problem.

2008-07-28 Roland McGrath <roland@redhat.com>

* elf/dl-sysdep.c (_dl_show_auxv): Add AT_EXECFN to the table.

2008-07-28 Ulrich Drepper <drepper@redhat.com>

* io/ftw.c (add_object): Remove inline to avoid warning.

* sysdeps/unix/sysv/linux/paccept.c: Fix compile problem.

* resolv/res_send.c (__libc_res_nsend): Take additional parameter.
Use it instead of locally defined resplen2 variable.
(res_nsend): Adjust for __libc_res_nsend interface change.
Expand Down
6 changes: 3 additions & 3 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GNU C Library NEWS -- history of user-visible changes. 2008-7-27
GNU C Library NEWS -- history of user-visible changes. 2008-8-1
Copyright (C) 1992-2007, 2008 Free Software Foundation, Inc.
See the end for copying conditions.

Expand All @@ -23,10 +23,10 @@ Version 2.9
* New implementation of memmem, strstr, and strcasestr which is O(n).
Implemented by Eric Blake.

* New Linux interfaces: inotify_init1, paccept, dup3, epoll_create2, pipe2
* New Linux interfaces: inotify_init1, paccept, dup3, epoll_create1, pipe2

* Implement "e" option for popen to open file descriptor with the
close-on-exec flag set
close-on-exec flag set. Implemented by Ulrich Drepper.

* Many functions, exported and internal, now atomically set the close-on-exec
flag when run on a sufficiently new kernel. Implemented by Ulrich Drepper.
Expand Down
1 change: 1 addition & 0 deletions Versions.def
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ libresolv {
GLIBC_2.0
GLIBC_2.2
GLIBC_2.3.2
GLIBC_2.9
GLIBC_PRIVATE
}
librt {
Expand Down
2 changes: 2 additions & 0 deletions elf/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,8 @@ $(objpfx)check-localplt.out: $(objpfx)check-localplt \
$(common-objpfx)math/libm.so $(thread-dso) \
$(common-objpfx)rt/librt.so \
$(common-objpfx)dlfcn/libdl.so \
$(common-objpfx)resolv/libresolv.so \
$(common-objpfx)crypt/libcrypt.so \
$(check-data)
$(dir $<)$(notdir $<) $(filter-out $< $(check-data),$^) | \
LC_ALL=C sort | \
Expand Down
1 change: 1 addition & 0 deletions elf/dl-sysdep.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,7 @@ _dl_show_auxv (void)
} auxvars[] =
{
[AT_EXECFD - 2] = { "AT_EXECFD: ", dec },
[AT_EXECFN - 2] = { "AT_EXECFN: ", str },
[AT_PHDR - 2] = { "AT_PHDR: 0x", hex },
[AT_PHENT - 2] = { "AT_PHENT: ", dec },
[AT_PHNUM - 2] = { "AT_PHNUM: ", dec },
Expand Down
4 changes: 2 additions & 2 deletions fedora/branch.mk
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-f8
fedora-sync-date := 2008-07-28 23:20 UTC
fedora-sync-tag := fedora-glibc-20080728T2320
fedora-sync-date := 2008-08-02 08:09 UTC
fedora-sync-tag := fedora-glibc-20080802T0809
8 changes: 7 additions & 1 deletion fedora/glibc.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
Summary: The GNU libc libraries
Name: glibc
Version: @glibcversion@
Release: 10
Release: 11
# GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
# Things that are linked directly into dynamically linked programs
# and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
Expand Down Expand Up @@ -976,6 +976,12 @@ rm -f *.filelist*
%endif

%changelog
* Sat Aug 2 2008 Jakub Jelinek <jakub@redhat.com> 2.8.90-11
- update from trunk
- fix non-absolute $ORIGIN handling (#457560)
- exported some further libresolv APIs (#453325)
- misc fixes

* Tue Jul 29 2008 Jakub Jelinek <jakub@redhat.com> 2.8.90-10
- update from trunk
- resolver fixes
Expand Down
37 changes: 34 additions & 3 deletions include/arpa/nameser.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#ifndef _ARPA_NAMESER_H_

#include <resolv/arpa/nameser.h>

/* If the machine allows unaligned access we can do better than using
Expand All @@ -7,22 +9,22 @@
#include <stdint.h>
#include <netinet/in.h>

extern struct _ns_flagdata _ns_flagdata[] attribute_hidden;
extern const struct _ns_flagdata _ns_flagdata[] attribute_hidden;

#if _STRING_ARCH_unaligned

# undef NS_GET16
# define NS_GET16(s, cp) \
do { \
uint16_t *t_cp = (uint16_t *) (cp); \
const uint16_t *t_cp = (const uint16_t *) (cp); \
(s) = ntohs (*t_cp); \
(cp) += NS_INT16SZ; \
} while (0)

# undef NS_GET32
# define NS_GET32(l, cp) \
do { \
uint32_t *t_cp = (uint32_t *) (cp); \
const uint32_t *t_cp = (const uint32_t *) (cp); \
(l) = ntohl (*t_cp); \
(cp) += NS_INT32SZ; \
} while (0)
Expand All @@ -44,3 +46,32 @@ extern struct _ns_flagdata _ns_flagdata[] attribute_hidden;
} while (0)

#endif

extern u_int __ns_get16 (const u_char *) __THROW;
extern u_long __ns_get32 (const u_char *) __THROW;

#define ns_msg_getflag(handle, flag) \
(((handle)._flags & _ns_flagdata[flag].mask) >> _ns_flagdata[flag].shift)

libresolv_hidden_proto (ns_get16)
libresolv_hidden_proto (ns_get32)
libresolv_hidden_proto (ns_put16)
libresolv_hidden_proto (ns_put32)
libresolv_hidden_proto (ns_initparse)
libresolv_hidden_proto (ns_skiprr)
libresolv_hidden_proto (ns_parserr)
libresolv_hidden_proto (ns_name_ntop)
libresolv_hidden_proto (ns_name_pton)
libresolv_hidden_proto (ns_name_pack)
libresolv_hidden_proto (ns_name_skip)
libresolv_hidden_proto (ns_name_unpack)
libresolv_hidden_proto (ns_name_compress)
libresolv_hidden_proto (ns_name_uncompress)
libresolv_hidden_proto (ns_sprintrr)
libresolv_hidden_proto (ns_sprintrrf)
libresolv_hidden_proto (ns_samedomain)
libresolv_hidden_proto (ns_samename)
libresolv_hidden_proto (ns_makecanon)
libresolv_hidden_proto (ns_format_ttl)

#endif
6 changes: 2 additions & 4 deletions include/resolv.h
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,9 @@ libresolv_hidden_proto (__res_nameinquery)
libresolv_hidden_proto (__res_queriesmatch)
libresolv_hidden_proto (__res_nsend)
libresolv_hidden_proto (__b64_ntop)
libresolv_hidden_proto (__ns_name_ntop)
libresolv_hidden_proto (__ns_name_unpack)
libresolv_hidden_proto (__ns_get16)
libresolv_hidden_proto (__ns_get32)
libresolv_hidden_proto (__res_nopt)
libresolv_hidden_proto (__dn_count_labels)
libresolv_hidden_proto (__p_secstodate)

extern const char *_res_opcodes[];
libresolv_hidden_proto (_res_opcodes)
Expand Down
4 changes: 2 additions & 2 deletions io/ftw.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* File tree walker functions.
Copyright (C) 1996-2003, 2004, 2006, 2007 Free Software Foundation, Inc.
Copyright (C) 1996-2004, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
Expand Down Expand Up @@ -243,7 +243,7 @@ object_compare (const void *p1, const void *p2)
}


static inline int
static int
add_object (struct ftw_data *data, struct STAT *st)
{
struct known_object *newp = malloc (sizeof (struct known_object));
Expand Down
2 changes: 1 addition & 1 deletion misc/syslog.c
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,9 @@ openlog_internal(const char *ident, int logstat, int logfac)
__have_sock_cloexec
= (LogFile != -1
|| errno != EINVAL);
#endif
}
#endif
#endif
#ifndef __ASSUME_SOCK_CLOEXEC
# ifdef SOCK_CLOEXEC
if (__have_sock_cloexec < 0)
Expand Down
4 changes: 4 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2008-07-30 Ulrich Drepper <drepper@redhat.com>

* tst-align2.c (f): Print message that f is reached.

2008-04-28 Hiroki Kaminaga <kaminaga@sm.sony.co.jp>

[BZ #6740]
Expand Down
2 changes: 2 additions & 0 deletions nptl/tst-align2.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ f (void *arg)
{
bool ok = true;

puts ("in f");

if (TEST_STACK_ALIGN ())
ok = false;

Expand Down
2 changes: 1 addition & 1 deletion nscd/connections.c
Original file line number Diff line number Diff line change
Expand Up @@ -880,7 +880,7 @@ cannot set socket to close on exec: %s; disabling paranoia mode"),
#endif
{
sock = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
#ifdef __ASSUME_SOCK_CLOEXEC
#ifndef __ASSUME_SOCK_CLOEXEC
if (have_sock_cloexec == 0)
have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
#endif
Expand Down
5 changes: 2 additions & 3 deletions resolv/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# Copyright (C) 1994,1995,1996,1997,1998,1999,2000,2001,2003,2004,2007
# Free Software Foundation, Inc.
# Copyright (C) 1994-2001,2003,2004,2007,2008 Free Software Foundation, Inc.
# This file is part of the GNU C Library.

# The GNU C Library is free software; you can redistribute it and/or
Expand Down Expand Up @@ -49,7 +48,7 @@ libresolv-routines := gethnamaddr res_comp res_debug \
res_data res_mkquery res_query res_send \
inet_net_ntop inet_net_pton inet_neta base64 \
ns_parse ns_name ns_netint ns_ttl ns_print \
ns_samedomain
ns_samedomain ns_date

libanl-routines := gai_cancel gai_error gai_misc gai_notify gai_suspend \
getaddrinfo_a
Expand Down
13 changes: 13 additions & 0 deletions resolv/Versions
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,19 @@ libresolv {
GLIBC_2.3.2 {
__p_rcode;
}
GLIBC_2.9 {
ns_msg_getflag;
ns_get16; ns_get32; ns_put16; ns_put32;
ns_initparse; ns_skiprr; ns_parserr;
ns_sprintrr; ns_sprintrrf;
ns_format_ttl; ns_parse_ttl;
ns_datetosecs;
ns_name_ntol; ns_name_ntop; ns_name_pton;
ns_name_unpack; ns_name_pack;
ns_name_uncompress; ns_name_compress;
ns_name_skip; ns_name_rollback;
ns_samedomain; ns_subdomain; ns_makecanon; ns_samename;
}
GLIBC_PRIVATE {
# Needed in libnss_dns.
__ns_name_unpack; __ns_name_ntop;
Expand Down
Loading

0 comments on commit 2fb513c

Please sign in to comment.