summaryrefslogtreecommitdiff
path: root/fedora
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-12-27 14:48:14 +0000
committerJakub Jelinek <jakub@redhat.com>2005-12-27 14:48:14 +0000
commit64cd3e83c9993f3c1a3c24ea3030a22ccf35e12d (patch)
tree8808fad08bb8677b0e0d2158c65096eae5484767 /fedora
parente3173d2c996d8e30dfe44e9bf530881da6df6aaa (diff)
Updated to fedora-glibc-20051227T1426
Diffstat (limited to 'fedora')
-rw-r--r--fedora/branch.mk4
-rw-r--r--fedora/glibc.spec.in51
2 files changed, 51 insertions, 4 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk
index 43a878b1bd..eb64c97cd4 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
glibc-base := HEAD
DIST_BRANCH := devel
COLLECTION := dist-fc4
-fedora-sync-date := 2005-12-21 09:31 UTC
-fedora-sync-tag := fedora-glibc-20051221T0931
+fedora-sync-date := 2005-12-27 14:26 UTC
+fedora-sync-tag := fedora-glibc-20051227T1426
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index d28e5481ab..70c2b41003 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 22
+%define glibcrelease 23
%define auxarches i586 i686 athlon sparcv9 alphaev6
%define prelinkarches noarch
%define xenarches i686 athlon
@@ -390,7 +390,7 @@ cat > asm/unistd.h <<EOF
#define __NR_waitid 281
#endif
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparcv9 sparc64
#ifndef __NR_mq_open
#define __NR_mq_open 273
#define __NR_mq_unlink 274
@@ -418,6 +418,47 @@ cat > asm/unistd.h <<EOF
%endif
#endif
EOF
+cat > asm/errno.h <<EOF
+#ifndef _HACK_ASM_ERRNO_H
+#include_next <asm/errno.h>
+%ifarch alpha
+#ifndef ENOKEY
+#define ENOKEY 132
+#define EKEYEXPIRED 133
+#define EKEYREVOKED 134
+#define EKEYREJECTED 135
+#endif
+#ifndef EOWNERDEAD
+#define EOWNERDEAD 136
+#define ENOTRECOVERABLE 137
+#endif
+%endif
+%ifarch %{ix86} ia64 ppc ppc64 s390 s390x x86_64
+#ifndef ENOKEY
+#define ENOKEY 126
+#define EKEYEXPIRED 127
+#define EKEYREVOKED 128
+#define EKEYREJECTED 129
+#endif
+#ifndef EOWNERDEAD
+#define EOWNERDEAD 130
+#define ENOTRECOVERABLE 131
+#endif
+%endif
+%ifarch sparc sparcv9 sparc64
+#ifndef ENOKEY
+#define ENOKEY 128
+#define EKEYEXPIRED 129
+#define EKEYREVOKED 130
+#define EKEYREJECTED 131
+#endif
+#ifndef EOWNERDEAD
+#define EOWNERDEAD 132
+#define ENOTRECOVERABLE 133
+#endif
+%endif
+#endif
+EOF
# A lot of programs still misuse memcpy when they have to use
# memmove. The memcpy implementation below is not tolerant at
@@ -1074,6 +1115,12 @@ rm -f *.filelist*
%endif
%changelog
+* Tue Dec 27 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-23
+- update from CVS
+ - robust mutexes
+- fix transliteration segfaults (#176573, #176583)
+- ignore prelink temporaries in ldconfig (#176570)
+
* Wed Dec 21 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-22
- update from CVS
- minor fts fixes