From c8814a5fda65c63da9aff53bd698610fb8e963d7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 11 May 2010 12:51:58 +0200
Subject: [PATCH] glibc: downgrade to 2.11.1, 2.12 is so buggy!

---
 srcpkgs/glibc/glibc-devel.template            |  2 +-
 srcpkgs/glibc/glibc-locales.template          |  1 +
 srcpkgs/glibc/nscd.template                   |  1 +
 .../getpagesize_workaround_assertion.patch    | 21 -------------------
 srcpkgs/glibc/template                        | 13 +++++++-----
 5 files changed, 11 insertions(+), 27 deletions(-)
 delete mode 100644 srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch

diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template
index a3991628f7..d570914b4b 100644
--- a/srcpkgs/glibc/glibc-devel.template
+++ b/srcpkgs/glibc/glibc-devel.template
@@ -5,7 +5,7 @@ long_desc="${long_desc}
 
  This package contains files for development: headers, static libs, etc."
 
-revision=1
+revision="1-20100511"
 
 Add_dependency run kernel-libc-headers
 Add_dependency run glibc
diff --git a/srcpkgs/glibc/glibc-locales.template b/srcpkgs/glibc/glibc-locales.template
index 276cd34267..6eb8102cf4 100644
--- a/srcpkgs/glibc/glibc-locales.template
+++ b/srcpkgs/glibc/glibc-locales.template
@@ -5,6 +5,7 @@ long_desc="${long_desc}
 
  This package contains the ${sourcepkg} locale files, for non US users."
 
+revision="1-20100511"
 noarch=yes
 
 do_install()
diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template
index 2aa4a186ca..0ed20e6610 100644
--- a/srcpkgs/glibc/nscd.template
+++ b/srcpkgs/glibc/nscd.template
@@ -5,6 +5,7 @@ long_desc="
  This package contains nscd, a daemon that provides a cache for the
  most common name service requests."
 
+revision="1-20100511"
 openrc_services="nscd default false"
 conf_files="/etc/nscd.conf"
 
diff --git a/srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch b/srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch
deleted file mode 100644
index f59eab064f..0000000000
--- a/srcpkgs/glibc/patches/getpagesize_workaround_assertion.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- sysdeps/unix/sysv/linux/getpagesize.c.orig	2010-05-08 17:30:11.713092813 +0200
-+++ sysdeps/unix/sysv/linux/getpagesize.c	2010-05-08 17:30:40.031108986 +0200
-@@ -28,10 +28,6 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
--  assert (GLRO(dl_pagesize) != 0);
--  return GLRO(dl_pagesize);
--#else
-   if (GLRO(dl_pagesize) != 0)
-     return GLRO(dl_pagesize);
- 
-@@ -47,7 +43,6 @@ __getpagesize ()
-   return NBPC;
- #  endif	/* NBPG.  */
- # endif	/* EXEC_PAGESIZE.  */
--#endif
- }
- libc_hidden_def (__getpagesize)
- weak_alias (__getpagesize, getpagesize)
diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template
index 30b4a12b7f..f595cf7724 100644
--- a/srcpkgs/glibc/template
+++ b/srcpkgs/glibc/template
@@ -1,8 +1,8 @@
 # Template file for 'glibc'
 pkgname=glibc
-version=2.12
-revision=1
-distfiles="http://xbps.nopcode.org/distfiles/glibc-${version}.tar.bz2"
+version=2.11.1
+revision="2-20100511"
+distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2"
 build_style=gnu_configure
 build_wrksrc="build"
 configure_script="../configure"
@@ -14,7 +14,7 @@ configure_args="--with-tls -disable-profile --with-__thread
 make_install_target="install_root=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="The GNU C library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=27391024c1576c8d795bb03a5efccbe220ccb92d6c60b76f3c4f2cf2bd213c4b
+checksum=64e01d0cfc964a8d8a8c74b5d36bd655e800c12d22b756dd84d867148a595fa1
 long_desc="
  The GNU C Library is the standard system C library for all GNU systems,
  and is an important part of what makes up a GNU system.  It provides the
@@ -57,7 +57,7 @@ pre_install()
 {
 	# Create DESTDIR/etc/ld.so.conf
 	mkdir -p ${DESTDIR}/etc
-	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf
+	echo "include /etc/ld.so.conf.d/*.conf" > ${DESTDIR}/etc/ld.so.conf
 }
 
 post_install()
@@ -75,5 +75,8 @@ post_install()
 	install -m644 ${FILESDIR}/nsswitch.conf \
 		${DESTDIR}/etc/nsswitch.conf || return 1
 
+	install -d ${DESTDIR}/etc/ld.so.conf.d
+	echo "/usr/local/lib" > ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
+	chmod 644 ${DESTDIR}/etc/ld.so.conf.d/usr_local.conf
 	rm -f ${DESTDIR}/etc/ld.so.cache
 }