[arch-commits] Commit in glibc/repos (3 files)

[andyrtr at archlinux.org]

    Date: Wednesday, June 11, 2008 @ 09:10:15
  Author: andyrtr
Revision: 2684

Merged revisions 2650-2683 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/glibc/trunk

........
  r2683 | andyrtr | 2008-06-11 13:09:42 +0000 (Mi, 11 Jun 2008) | 2 lines
  
  upgpkg: glibc 2.8-2
      fix the old memory issue again
........

Modified:
  glibc/repos/testing-x86_64/	(properties)
  glibc/repos/testing-x86_64/ChangeLog
  glibc/repos/testing-x86_64/PKGBUILD

-----------+
 ChangeLog |    3 +++
 PKGBUILD  |    9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)


Property changes on: glibc/repos/testing-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /glibc/trunk:1-2649
   + /glibc/trunk:1-2683

Modified: testing-x86_64/ChangeLog
===================================================================
--- testing-x86_64/ChangeLog	2008-06-11 13:09:42 UTC (rev 2683)
+++ testing-x86_64/ChangeLog	2008-06-11 13:10:15 UTC (rev 2684)
@@ -1,3 +1,6 @@
+glibc 2.8-2
+- fix an old memory issue again
+
 glibc 2.8-1
 - no more tarballs
 - we checkout the current release branch incl. libidn

Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD	2008-06-11 13:09:42 UTC (rev 2683)
+++ testing-x86_64/PKGBUILD	2008-06-11 13:10:15 UTC (rev 2684)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=glibc
 pkgver=2.8
-pkgrel=1
+pkgrel=2
 _glibcdate=20080610
 install=glibc.install
 backup=(etc/locale.gen)
@@ -15,12 +15,12 @@
 makedepends=('gcc>=4.3.1-1')
 replaces=('glibc-xen')
 source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-2.8_${_glibcdate}.tar.bz2
-	ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-1.tar.bz2
+	ftp://ftp.archlinux.org/other/glibc/glibc-patches-${pkgver}-2.tar.bz2
 	nscd
 	locale.gen.txt
 	locale-gen)
 md5sums=('63def58972f0e8429247916154c21323'
-         'a816b94ff5e94f1ee1bbaa5c447e6f8d'
+         '3ec00d9aa3f2fec046bc3e615dfb723a'
          'b587ee3a70c9b3713099295609afde49'
          '07ac979b6ab5eeb778d55f041529d623'
          '476e9113489f93b348b21e144b6a8fcf')
@@ -41,6 +41,9 @@
   # patch from Debian
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.5-localedef_segfault-1.patch || return 1 # still needed?
 
+  # Upstream fixes. See sources.redhat.com bugzilla
+  patch -Np1 -i ${startdir}/src/glibc-patches/glibc-2.7-bz4781.patch || return 1
+
   # Gentoo fixes
   patch -Np1 -i ${startdir}/src/glibc-patches/glibc-dont-build-timezone.patch || return 1