[arch-commits] CVS update of core/base/glibc (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Thu Nov 8 21:06:02 UTC 2007
Date: Thursday, November 8, 2007 @ 16:06:02
Author: andyrtr
Path: /home/cvs-core/core/base/glibc
Modified: ChangeLog (1.3 -> 1.4) PKGBUILD (1.76 -> 1.77)
glibc.install (1.8 -> 1.9)
Removed: fix_memory.diff (1.1)
upgpkg: glibc 2.7-6
fixed broken locales; disabled broken first weekday/workday #8530
-----------------+
ChangeLog | 4 ++++
PKGBUILD | 23 +++++++++--------------
fix_memory.diff | 50 --------------------------------------------------
glibc.install | 5 +----
4 files changed, 14 insertions(+), 68 deletions(-)
Index: core/base/glibc/ChangeLog
diff -u core/base/glibc/ChangeLog:1.3 core/base/glibc/ChangeLog:1.4
--- core/base/glibc/ChangeLog:1.3 Wed Nov 7 16:23:13 2007
+++ core/base/glibc/ChangeLog Thu Nov 8 16:06:02 2007
@@ -1,3 +1,7 @@
+glibc 2.7-6
+- fix broken locales with upstream changes
+- disable the whole weekday patch, fixes #8530
+
glibc 2.7-5
- fix a regression: http://sourceware.org/bugzilla/show_bug.cgi?id=4781
mainly for x86_64 where using gcc-gcj eats all memory
Index: core/base/glibc/PKGBUILD
diff -u core/base/glibc/PKGBUILD:1.76 core/base/glibc/PKGBUILD:1.77
--- core/base/glibc/PKGBUILD:1.76 Wed Nov 7 16:23:13 2007
+++ core/base/glibc/PKGBUILD Thu Nov 8 16:06:02 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.76 2007/11/07 21:23:13 andyrtr Exp $
+# $Id: PKGBUILD,v 1.77 2007/11/08 21:06:02 andyrtr Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=glibc
pkgver=2.7
-pkgrel=5
+pkgrel=6
install=glibc.install
backup=(etc/locale.gen)
pkgdesc="GNU C Library"
@@ -15,15 +15,13 @@
replaces=('glibc-xen')
source=(http://ftp.gnu.org/gnu/glibc/glibc-${pkgver}.tar.bz2
http://ftp.gnu.org/gnu/glibc/glibc-libidn-${pkgver}.tar.bz2
- ftp://ftp.archlinux.org/other/glibc/glibc-patches-2.7-3.tar.bz2
- fix_memory.diff
+ ftp://ftp.archlinux.org/other/glibc/glibc-patches-2.7-4.tar.bz2
nscd
locale.gen.txt
locale-gen)
md5sums=('065c5952b439deba40083ccd67bcc8f7'
'226809992fb1f3dc6ea23e0f26952ea4'
- 'aa48afa0f4c0a2859434fb667dccc8d6'
- 'ff8d7d0fe190d9d20f68727a97148330'
+ '6180b68c612792ef779aefb78d2d0de2'
'b587ee3a70c9b3713099295609afde49'
'07ac979b6ab5eeb778d55f041529d623'
'476e9113489f93b348b21e144b6a8fcf')
@@ -34,12 +32,15 @@
# some important patches from Debian
patch -Np0 -i ${startdir}/src/glibc-patches/locale.patch || return 1
- patch -Np0 -i ${startdir}/src/glibc-patches/weekday.patch || return 1
+ # disabled now to fix http://bugs.archlinux.org/task/8530 - let's see if we need to reenable parts of it again
+# patch -Np0 -i ${startdir}/src/glibc-patches/weekday.patch || return 1
patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1
# http://sourceware.org/bugzilla/show_bug.cgi?id=4781 - they forgot to apply it to the 2.7 branch
- patch -Np1 -i ${startdir}/src/fix_memory.diff || return 1
+ patch -Np1 -i ${startdir}/src/glibc-patches/fix_memory.diff || return 1
+ # fix some broken locales (upstream fixes)
+ patch -Np1 -i ${startdir}/src/glibc-patches/fix_broken_locales.patch || return 1
mkdir -p ${startdir}/pkg/etc
touch ${startdir}/pkg/etc/ld.so.conf
@@ -89,12 +90,6 @@
cat ${startdir}/src/glibc-${pkgver}/localedata/SUPPORTED >> ${startdir}/pkg/etc/locale.gen
sed -i "s|^|#|g" ${startdir}/pkg/etc/locale.gen
- # disable broken locales
- # http://sourceware.org/bugzilla/show_bug.cgi?id=5237
- sed -i "s|^#lo_LA UTF-8|##lo_LA UTF-8 ### currently broken ###|" ${startdir}/pkg/etc/locale.gen
- # http://sourceware.org/bugzilla/show_bug.cgi?id=5238
- sed -i "s|^#ug_CN UTF-8|##ug_CN UTF-8 ### currently broken ###|" ${startdir}/pkg/etc/locale.gen
-
if [ "${CARCH}" = "x86_64" ]; then
# fix for the linker
sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${startdir}/pkg/usr/bin/ldd
Index: core/base/glibc/fix_memory.diff
diff -u core/base/glibc/fix_memory.diff:1.1 core/base/glibc/fix_memory.diff:removed
--- core/base/glibc/fix_memory.diff:1.1 Wed Nov 7 16:23:13 2007
+++ core/base/glibc/fix_memory.diff Thu Nov 8 16:06:02 2007
@@ -1,50 +0,0 @@
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/clone.S,v
-retrieving revision 1.27
-retrieving revision 1.27.2.1
-diff -u -r1.27 -r1.27.2.1
---- libc/sysdeps/unix/sysv/linux/i386/clone.S 2006/12/03 23:12:36 1.27
-+++ libc/sysdeps/unix/sysv/linux/i386/clone.S 2007/07/31 12:51:32 1.27.2.1
-@@ -120,9 +120,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (eip);
- /* Note: %esi is zero. */
- movl %esi,%ebp /* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- jmp L(haspid)
- .previous
- #endif
-- cfi_endproc;
-
- cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/x86_64/clone.S,v
-retrieving revision 1.7
-retrieving revision 1.7.2.1
-diff -u -r1.7 -r1.7.2.1
---- libc/sysdeps/unix/sysv/linux/x86_64/clone.S 2006/12/03 23:12:36 1.7
-+++ libc/sysdeps/unix/sysv/linux/x86_64/clone.S 2007/07/31 12:51:32 1.7.2.1
-@@ -89,9 +89,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (rip);
- /* Clear the frame pointer. The ABI suggests this be done, to mark
- the outermost frame obviously. */
- xorl %ebp, %ebp
-@@ -116,7 +113,6 @@
- /* Call exit with return value from function call. */
- movq %rax, %rdi
- call HIDDEN_JUMPTARGET (_exit)
-- cfi_endproc;
-
- cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
Index: core/base/glibc/glibc.install
diff -u core/base/glibc/glibc.install:1.8 core/base/glibc/glibc.install:1.9
--- core/base/glibc/glibc.install:1.8 Fri Nov 2 14:20:38 2007
+++ core/base/glibc/glibc.install Thu Nov 8 16:06:02 2007
@@ -47,10 +47,7 @@
==> additional locales, please enable them in /etc/locale.gen and run
==> /usr/sbin/locale-gen
==>
- ==> Check /etc/locale.gen.pacnew for new supported and broken locales
- ==> currently broken:
- ==> #lo_LA UTF-8
- ==> #ug_CN UTF-8
+ ==> Check /etc/locale.gen.pacnew for new supported locales
==>
_EOF
# Check active locales, enable the ones that are in use
More information about the arch-commits
mailing list