From 3b9df15235417b39b0534826223cc8d5d6afc23d Mon Sep 17 00:00:00 2001
From: Stefan Fiedler <stefan.fiedler@students.jku.at>
Date: Wed, 31 Jan 2007 17:51:00 +0000
Subject: [PATCH] Stefan Fiedler: 	update glibc (2.4 -> 2.5)

[2006112711140920510] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8161 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/base/glibc/config-400.in                   |  2 +-
 package/base/glibc/glibc.conf                      | 14 +++++++-------
 package/base/glibc/glibc.desc                      | 12 ++++++------
 .../glibc/{glibc24 => glibc25}/gcc_eh.patch.cross  |  0
 .../glibc/{glibc24 => glibc25}/ldconfig-glob.patch |  0
 5 files changed, 14 insertions(+), 14 deletions(-)
 rename package/base/glibc/{glibc24 => glibc25}/gcc_eh.patch.cross (100%)
 rename package/base/glibc/{glibc24 => glibc25}/ldconfig-glob.patch (100%)

diff --git a/package/base/glibc/config-400.in b/package/base/glibc/config-400.in
index e0378da1d..77e140a4e 100644
--- a/package/base/glibc/config-400.in
+++ b/package/base/glibc/config-400.in
@@ -38,7 +38,7 @@ then
 
 	choice ROCKCFG_PKG_GLIBC_BRANCH glibc23 \
                 glibc23 'Use glibc-2.3.x (recommended)' \
-                glibc24 'Use glibc-2.4 (for testing)' \
+                glibc25 'Use glibc-2.5 (for testing)' \
                 glibc22 'Use glibc-2.2.x'
 
 	if [ "$ROCKCFG_PKG_GLIBC_BRANCH" = "glibc22" ] ; then
diff --git a/package/base/glibc/glibc.conf b/package/base/glibc/glibc.conf
index 0fdd7c136..5d857188a 100644
--- a/package/base/glibc/glibc.conf
+++ b/package/base/glibc/glibc.conf
@@ -28,8 +28,8 @@ pkg_glibc_cross=""
 
 case "$xpkg" in
         glibc??-cross-*)
-		if [[ $xpkg = *24 ]] ; then
-                	echo_error "Cross package not yet supported by glibc24. Use glibc23!"
+		if [[ $xpkg = *25 ]] ; then
+                	echo_error "Cross package not yet supported by glibc25. Use glibc23!"
                 	exit 1
 		fi
                 pkg_glibc_cross="${xpkg#glibc*-cross-}"
@@ -51,7 +51,7 @@ pkg_glibc_linuxthreads=1
 # fall back to linuxthreads for cross glibcs
 [ -n "$pkg_glibc_cross" ] && pkg_glibc_linuxthreads=1
 
-[ "${pkg_glibc_version}" = "24" ] && pkg_glibc_linuxthreads=0
+[ "${pkg_glibc_version}" = "25" ] && pkg_glibc_linuxthreads=0
 
 # Give a more descriptive error message than the one that would happen during the build.
 kernel_mainline="`uname -r | cut -f-2 -d'.'`"
@@ -276,7 +276,7 @@ fi
 #---------------------------------
 
 #---------------------------------
-if [ $pkg_glibc_version = 24 ]; then
+if [ $pkg_glibc_version = 25 ]; then
 
 glibc_custmain() {
         # check whether profiling is enabled               
@@ -370,14 +370,14 @@ glibc_prepatch() {
 	if [ $pkg_glibc_linuxthreads = 1 -a -f $archdir/*linuxthreads*.tar.bz2 ]; then
 		tar $taropt $archdir/*linuxthreads*.tar.bz2
 	fi
-	if [ "${pkg_glibc_version}" = "24" ] ; then
+	if [ "${pkg_glibc_version}" = "25" ] ; then
 		echo "extracting glibc-ports"
-		tar $taropt $archdir/glibc-ports-2.4*.tar.bz2
+		tar $taropt $archdir/glibc-ports-*.tar.bz2
 	fi
 }
 
 glibc_stage0() {
-	if [ $pkg_glibc_version = 24 ]
+	if [ $pkg_glibc_version = 25 ]
 	then
 		mkdir -p objdir; cd objdir
 
diff --git a/package/base/glibc/glibc.desc b/package/base/glibc/glibc.desc
index 3adfc5c98..708ea8ecb 100644
--- a/package/base/glibc/glibc.desc
+++ b/package/base/glibc/glibc.desc
@@ -35,7 +35,7 @@
 
 [C] base/library
 [F] CORE
-[E] group libc glibc22 glibc23 glibc24
+[E] group libc glibc22 glibc23 glibc25
 [E] del libgd
 
 [L] GPL
@@ -55,11 +55,11 @@
 [D] 2449696200 glibc-linuxthreads-2.3.6.tar.bz2 ftp://ftp.gnu.org/gnu/glibc/
 #endif
 
-#if xpkg == glibc24.*
-[V] 2.4
-[D] 1764169258 glibc-2.4.tar.bz2 http://ftp.gnu.org/gnu/glibc/
-[D] 1792690402 glibc-ports-2.4.tar.bz2 http://ftp.gnu.org/gnu/glibc/
+#if xpkg == glibc25.*
+[V] 2.5
+[D] 3501909437 glibc-2.5.tar.bz2 http://ftp.gnu.org/gnu/glibc/
+[D] 4254948014 glibc-ports-2.5.tar.bz2 http://ftp.gnu.org/gnu/glibc/
 #endif
 
-[CD] <COPY> cp $cachedir/glibc2[23].cache $confdir/$pkg.cache
+[CD] <COPY> cp $cachedir/glibc2[235].cache $confdir/$pkg.cache
 
diff --git a/package/base/glibc/glibc24/gcc_eh.patch.cross b/package/base/glibc/glibc25/gcc_eh.patch.cross
similarity index 100%
rename from package/base/glibc/glibc24/gcc_eh.patch.cross
rename to package/base/glibc/glibc25/gcc_eh.patch.cross
diff --git a/package/base/glibc/glibc24/ldconfig-glob.patch b/package/base/glibc/glibc25/ldconfig-glob.patch
similarity index 100%
rename from package/base/glibc/glibc24/ldconfig-glob.patch
rename to package/base/glibc/glibc25/ldconfig-glob.patch