From ace3f2f9518c04413c45e18828c18a08c7d7b180 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 20 Oct 2004 11:28:44 +0000
Subject: Update.

---
 fedora/branch.mk     |  4 ++--
 fedora/glibc.spec.in | 46 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/fedora/branch.mk b/fedora/branch.mk
index d97f635a5d..8f05e2326c 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -1,5 +1,5 @@
 # This file is updated automatically by Makefile.
 glibc-branch := fedora
 glibc-base := HEAD
-fedora-sync-date := 2004-10-18 09:40 UTC
-fedora-sync-tag := fedora-glibc-20041018T0940
+fedora-sync-date := 2004-10-20 10:16 UTC
+fedora-sync-tag := fedora-glibc-20041020T1016
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 2381b0ac4b..d9a8cad510 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 70
+%define glibcrelease 71
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -299,6 +299,14 @@ cat > asm/unistd.h <<EOF
 #ifndef __NR_waitid
 #define __NR_waitid		284
 #endif
+#ifndef __NR_setaltroot
+#define __NR_setaltroot		285
+#endif
+#ifndef __NR_add_key
+#define __NR_add_key		286
+#define __NR_request_key	287
+#define __NR_keyctl		288
+#endif
 %endif
 %ifarch ia64
 #ifndef __NR_timer_create
@@ -320,6 +328,9 @@ cat > asm/unistd.h <<EOF
 #define __NR_mq_notify			1266
 #define __NR_mq_getsetattr		1267
 #endif
+#ifndef __NR_setaltroot
+#define __NR_setaltroot			1270
+#endif
 %endif
 %ifarch ppc
 #ifndef __NR_utimes
@@ -431,6 +442,24 @@ cat > asm/unistd.h <<EOF
 %endif
 #endif
 EOF
+cat > asm/errno.h <<EOF
+#ifndef _HACK_ASM_ERRNO_H
+#include_next <asm/errno.h>
+#ifndef ENOKEY
+%ifarch alpha alphaev6
+#define ENOKEY		131		/* Required key not available */
+%endif
+%ifarch sparc sparcv9 sparc64
+#define ENOKEY		127		/* Required key not available */
+%endif
+%ifnarch alpha alphaev6 sparc sparcv9 sparc64
+#define ENOKEY		125		/* Required key not available */
+%endif
+#define EKEYEXPIRED	(ENOKEY + 1)	/* Key has expired */
+#define EKEYREVOKED	(ENOKEY + 2)	/* Key has been revoked */
+#define EKEYREJECTED	(ENOKEY + 3)	/* Key was rejected by service */
+#endif
+EOF
 
 %ifnarch %{ix86} alpha alphaev6 sparc sparcv9
 rm -rf glibc-compat
@@ -1256,6 +1285,21 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Wed Oct 20 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-71
+- update from CVS
+  - fix minor catchsegv temp file handling vulnerability
+    (CAN-2004-0968, #136319)
+  - add 4 new errno codes
+  - setaltroot, key{_add,_request,ctl} syscalls on some arches
+  - export _dl_debug_state@GLIBC_PRIVATE from ld.so again for
+    gdb purpose
+  - use inet_pton to decide what is address and what is hostname
+    in getent (#135422)
+  - change dladdr/dladdr1, so that dli_saddr is the same kind
+    of value as dlsym/dlvsym return (makes difference on ia64/hppa only)
+  - fix catchsegv script so that it works with both 32-bit and 64-bit
+    programs on multi-arch platforms
+
 * Tue Oct 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-70
 - update from CVS
 - require newer selinux-policy (#135978)
-- 
cgit v1.2.3