From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 16 Jun 2008 09:16:55 +0000 (+0000)
Subject: Revert "Updated glibc to 2.8 (fedora release)."
X-Git-Tag: v3.0-alpha1~956^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f5c0b98cb250a34c74ea46d7ab307b518f4a1e5c;p=ipfire-3.x.git

Revert "Updated glibc to 2.8 (fedora release)."

This reverts commit d54211690bb77ceecb2383bfb556101ed195dc62.
---

diff --git a/lfs/glibc b/lfs/glibc
index 45b3009fc..bc74de697 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -25,7 +25,7 @@
 include Config
 
 PKG_NAME   = glibc
-VER        = 20080412T0741
+VER        = 2.7
 
 THISAPP    = $(PKG_NAME)-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -57,6 +57,7 @@ endif
 ###############################################################################
 
 objects = $(DL_FILE) \
+	glibc-libidn-$(VER).tar.bz2 \
 	$(THISAPP)-pt_pax-1.patch \
 	$(THISAPP)-ssp_hp-timing-1.patch \
 	$(THISAPP)-arc4_prng-1.patch \
@@ -111,10 +112,13 @@ endif
 endif
 
 ifeq "$(STAGE)" "base"
+	tar jxf $(DIR_DL)/glibc-libidn-$(VER).tar.bz2 -C $(DIR_APP)
+	cd $(DIR_APP) && mv glibc-libidn-$(VER) libidn
 ifeq "$(SSP)" "1"
 ifeq "$(MACHINE)" "i686"
 	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-ssp_hp-timing-1.patch
 endif
+	#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(THISAPP)-wur-1.patch
 endif
 	cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
 	cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=$(LINKER) -o|' \