[arch-commits] CVS update of core/base/glibc (PKGBUILD fix-makecontext.patch)

[Jan de Groot]

    Date: Sunday, March 23, 2008 @ 17:58:38
  Author: jgc
    Path: /home/cvs-core/core/base/glibc

   Added: fix-makecontext.patch (1.1)
Modified: PKGBUILD (1.81 -> 1.82)

Fix getcontext/makecontext function


-----------------------+
 PKGBUILD              |   11 ++++++++---
 fix-makecontext.patch |   33 +++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)


Index: core/base/glibc/PKGBUILD
diff -u core/base/glibc/PKGBUILD:1.81 core/base/glibc/PKGBUILD:1.82
--- core/base/glibc/PKGBUILD:1.81	Sat Mar  8 15:10:48 2008
+++ core/base/glibc/PKGBUILD	Sun Mar 23 17:58:37 2008
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.81 2008/03/08 20:10:48 jgc Exp $
+# $Id: PKGBUILD,v 1.82 2008/03/23 21:58:37 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=glibc
 pkgver=2.7
-pkgrel=8
+pkgrel=9
 install=glibc.install
 backup=(etc/locale.gen)
 pkgdesc="GNU C Library"
@@ -10,18 +10,20 @@
 license=('GPL' 'LGPL')
 url="http://www.gnu.org/software/libc"
 groups=('base')
-depends=('sh' 'kernel-headers>=2.6.23.1' 'tzdata')
+depends=('sh' 'kernel-headers>=2.6.24.3' 'tzdata')
 makedepends=('gcc>=4.2.2-2')
 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-8.tar.bz2
+	fix-makecontext.patch
 	nscd
 	locale.gen.txt
 	locale-gen)
 md5sums=('065c5952b439deba40083ccd67bcc8f7'
          '226809992fb1f3dc6ea23e0f26952ea4'
          '0a74af666f39171cf9f03eba05faab4b'
+	 'cd56c14f38207cb3a5d0ad2d7bce540c'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -42,6 +44,9 @@
   patch -Np0 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5441.patch || return 1
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz5531.patch || return 1
 
+  # Fixes breakage introduced by patch bz5435
+  patch -Np1 -i ${startdir}/src/fix-makecontext.patch || return 1
+
   # Gentoo fixes
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-handle-long-kernel-versions.patch || return 1
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-dont-build-timezone.patch || return 1
Index: core/base/glibc/fix-makecontext.patch
diff -u /dev/null core/base/glibc/fix-makecontext.patch:1.1
--- /dev/null	Sun Mar 23 17:58:38 2008
+++ core/base/glibc/fix-makecontext.patch	Sun Mar 23 17:58:37 2008
@@ -0,0 +1,33 @@
+===================================================================
+RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/i386/makecontext.S,v
+retrieving revision 1.8
+retrieving revision 1.9
+diff -u -r1.8 -r1.9
+--- libc/sysdeps/unix/sysv/linux/i386/makecontext.S	2007/12/03 04:56:56	1.8
++++ libc/sysdeps/unix/sysv/linux/i386/makecontext.S	2008/01/09 19:35:15	1.9
+@@ -1,5 +1,5 @@
+ /* Create new context.
+-   Copyright (C) 2001, 2002, 2005 Free Software Foundation, Inc.
++   Copyright (C) 2001, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper at redhat.com>, 2001.
+ 
+@@ -41,13 +41,15 @@
+ 	movl	12(%esp), %ecx
+ 	movl	%ecx, oEBX(%eax)
+ 
+-	/* Make room on the new stack for the parameters.  */
++	/* Make room on the new stack for the parameters.
++	   Room for the arguments, return address (== L(exitcode)) and
++	   oLINK pointer is needed.  One of the pointer sizes is subtracted
++	   after aligning the stack.  */
+ 	negl	%ecx
+-	leal	-8(%edx,%ecx,4), %edx
++	leal	-4(%edx,%ecx,4), %edx
+ 	negl	%ecx
+ 
+ 	/* Align the stack.  */
+-	addl	$16, %edx
+ 	andl	$0xfffffff0, %edx
+ 	subl	$4, %edx
+