Revert "merged the big update of 2.6.1 into test"

This reverts commit 3a36f4e8bbeb99c555551cbbeb6f860c2bebca77.

Revert glibc 2.6 for stable-rc-0.14

9 files changed, 45 insertions, 88 deletions

diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD
index bdf5de6d81..7ffc310cf7 100755
--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -62,7 +62,14 @@ unset  LD_LIBRARY_PATH  &&
 # Setup sanitised glibc-kernel-headers for the glibc compile
 # ...as well as other arch-dependend specialties
 #
-if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then
+persistent_add  GLIBC_ARCH  &&
+if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
+  GLIBC_ARCH=x86_64
+elif [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then
+  GLIBC_ARCH=ppc
+elif [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then
+  GLIBC_ARCH=i386
+elif [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then
   #
   # If we're not compiling for 64-bit SPARC then we need to use the sparc
   # headers, not sparc64
@@ -106,20 +113,22 @@ elif [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then
   # glibc knows itself what flags to choose
   export CFLAGS="" &&
   GLIBC_ARCH=alpha
+else
+  message "Glibc spell doesn't know your architecture!" &&
+  false
 fi &&
 
+# set the asm headers to point to the correct architecture
+cd  $GLIBC_HEADERS_DIR/include  &&
+ln  -sf  asm-$GLIBC_ARCH  asm   &&
+
 # CPPFLAGS setting is needed so the check for cpp works on boxes that don't
 # have any kernel headers in /usr/include yet
-export CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/usr/include"  &&
+export CPPFLAGS="$CPPFLAGS -I$GLIBC_HEADERS_DIR/include"  &&
 #
 # End sanitised glibc-kernel-headers setup
 #
 
-# this is weird but nscd needs this header from libcap but not the rest of
-# the standard includes so doing this will make nscd pick it up
-mkdir -p $SOURCE_DIRECTORY/nscd/sys &&
-ln -s /usr/include/sys/capability.h $SOURCE_DIRECTORY/nscd/sys/capability.h &&
-
 #
 # Change to where we're going to actually build
 #
@@ -138,6 +147,6 @@ $SOURCE_DIRECTORY/configure  --host=$HOST                       \
                              --with-elf                         \
                            --enable-shared                      \
                           --disable-profile                     \
-                     --with-headers=$GLIBC_HEADERS_DIR/usr/include  \
+                     --with-headers=$GLIBC_HEADERS_DIR/include  \
                                     $OPTS                       &&
 make
diff --git a/libs/glibc/DEPENDS b/libs/glibc/DEPENDS
index 7d79478265..b6e22145f0 100755
--- a/libs/glibc/DEPENDS
+++ b/libs/glibc/DEPENDS
@@ -4,7 +4,6 @@ depends  gnupg          &&
 depends  perl           &&
 depends  smgl-fhs       &&
 depends  smgl-archspecs &&
-optional_depends libselinux '--with-selinux' '--without-selinux' 'for selinux support' &&
 
 if  [  "$GLIBC_USEIDN" = "y"  ]; then
 	depends libidn
diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 496601855e..b5776bcf90 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,52 +1,13 @@
            SPELL=glibc
 if  [  "$GLIBC_NPTL"  =  "y"  ];  then
-         VERSION=2.6.1
- HEADERS_VERSION=2.6.22.6
+         VERSION=2.4
+ HEADERS_VERSION=2.6.12.0
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.sig
-case "${SMGL_COMPAT_ARCHS[1]}" in
-  ia32)
-      GLIBC_ARCH=i386
-         SOURCE3=linux-headers-${HEADERS_VERSION}-i386.tar.bz2
-    SOURCE3_HASH=sha512:e328abe55c7d3c239ec3dbede78ce405a662d3159382a2cb3db8dbf5b7783d230a237d44c23280171893c9213b55c4f9bf8963f193fc50158803078e3875ecef
-  ;;
-  x86_64)
-      GLIBC_ARCH=x86_64
-	 SOURCE3=linux-headers-${HEADERS_VERSION}-x86_64.tar.bz2
-    SOURCE3_HASH=sha512:1d032b35eee2593896cdffd779ed3f695f5abb552c83f96fcabec46d5977b649db0741690be5dd40d712779b0f3816c6e04e7840991dad4e0a6881adee097852 
-  ;;
-  ppc)
-      GLIBC_ARCH=ppc
-	 SOURCE3=linux-headers-${HEADERS_VERSION}-powerpc.tar.bz2
-    SOURCE3_HASH=sha512:06c5ff0fdbe39367df6538000358058fb6a804bc3711ad621fd825fa2887b2cb13b6992c32fe64da3381402b681b9ac526ac2b7eb2320966fcb9a6f6b1830737 
-  ;;
-  alpha)
-      GLIBC_ARCH=alpha
-         SOURCE3=linux-headers-${HEADERS_VERSION}-alpha.tar.bz2
-    SOURCE3_HASH=sha512:a462e6ee9c446a71181e189d36b430fbdbf7070f2499d06e234b50f91ec3f0172a3428ecd37e7dad85bb153bfc985cea39e33785b7cffa9ac371a579412e6361
-  ;;
-  sparc)
-    if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]]
-    then
-      GLIBC_ARCH=sparc
-         SOURCE3=linux-headers-${HEADERS_VERSION}-sparc64.tar.bz2
-    SOURCE3_HASH=sha512:45665ceb4c8622615c3e9bbcbe57e8f9bd96d1cfd7d50aa7269ca8be9f6400c35feddc4b93251e56a7e0d5fbb48cf1b1e0f81bd9ca2853dc154cd38c1bd5ebe8
-    else
-      GLIBC_ARCH=sparc64
-         SOURCE3=linux-headers-${HEADERS_VERSION}-sparc.tar.bz2
-    SOURCE3_HASH=sha512:264bf8f30dcfd72b8fcdb8e9486c8ffe59ec20bbb5f7379b9e300510d761128f636f2d6945ba97f7672fae878a0976e0dabf500a0c53702d67bf7790562a9484 
-    fi
-  ;;
-  *)
-      GLIBC_ARCH=UNKNOWN
-         SOURCE3=UNKNOWN
-         message "${PROBLEM_COLOR}You have an unknown architecture, you should file a bug for this${DEFAULT_COLOR}"
-         return -1
-  ;;
-esac
+         SOURCE3=linux-libc-headers-$HEADERS_VERSION.tar.bz2
    SOURCE_URL[0]=$GNU_URL/$SPELL/$SOURCE
   SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
-  SOURCE3_URL[0]=http://dmlb2000.homelinux.org/pub/kernel-headers/$SOURCE3
+  SOURCE3_URL[0]=http://ep09.pld-linux.org/~mmazur/linux-libc-headers/$SOURCE3
   if [ "$GLIBC_USEIDN" = "y" ]; then
          SOURCE4=$SPELL-libidn-$VERSION.tar.bz2
          SOURCE5=$SOURCE4.sig
@@ -57,6 +18,8 @@ esac
   fi
       SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY
   SOURCE2_IGNORE=signature
+    SOURCE3_HASH=sha512:e7ee7a09880d19dea3d2c0d498631ee9d269738e7acdeba0a346da3b8bd0629628582973de33e6ac0c913e8c691806a50e07d520d6f6d078b76a3e74b9b61fd7
+      PATCHLEVEL=1
 else
          VERSION=2.3.6
  HEADERS_VERSION=2.4.24
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 2b46f214f8..2480ef0c25 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,14 +1,3 @@
-2007-09-15 David Brown <dmlb2000@gmail.com>
-	* BUILD: changed out old headers for new headers and removed GLIBC_ARCH
-	* DEPENDS: optionally on selinux some of the apps glibc builds use it
-	* DETAILS: updated to 2.6.1 and moved checks for GLIBC_ARCH to here
-	* INSTALL: install all the headers not just asm and linux
-	* PREPARE: add GLIBC_ARCH as persistant here so it gets tracked before
-	  details sets it
-	* PRE_BUILD: added a patch for autoconf not setting as_test_x for egrep
-	* as-test-x.patch: added to add as_text_x to the appropriate configure
-	* config.h.patch: changed file to patch so p stays the same
-
 2007-08-06 Treeve Jelbert <treeve@sourcemage.org>
 	* BUILD: fix typo (bug #13925)
 
diff --git a/libs/glibc/INSTALL b/libs/glibc/INSTALL
index ce2d9483e7..35d8accf53 100755
--- a/libs/glibc/INSTALL
+++ b/libs/glibc/INSTALL
@@ -3,7 +3,7 @@
 # glibc decides to compile stuff during 'make install', which it does in 2.4
 #
 install  -d  ${INSTALL_ROOT}/usr/include  &&
-cd  $GLIBC_HEADERS_DIR/usr/include        &&
+cd  $GLIBC_HEADERS_DIR/include            &&
 
 if [  !  "$GLIBC_NPTL"  =  "y"  ];  then
   echo  "installing asm-generic headers"                &&
@@ -12,11 +12,15 @@ if [  !  "$GLIBC_NPTL"  =  "y"  ];  then
 fi  &&
 
 echo  "installing glibc linux headers"               &&
-for dir in *
-do
-  install  -d  ${INSTALL_ROOT}/usr/include/$dir       &&
-  cp  -fa  $dir/*  ${INSTALL_ROOT}/usr/include/$dir 
-done
+install  -d  ${INSTALL_ROOT}/usr/include/linux       &&
+cp  -fa  linux/*  ${INSTALL_ROOT}/usr/include/linux  &&
+
+echo  "installing asm-$GLIBC_ARCH headers to /usr/include/asm"  &&
+#
+#  asm is a symlink to asm-$GLIBC-ARCH
+#
+install  -d  ${INSTALL_ROOT}/usr/include/asm     &&
+cp  -fa  asm/*  ${INSTALL_ROOT}/usr/include/asm  &&
 
 cd $SOURCE_DIRECTORY.bld  &&
 
diff --git a/libs/glibc/PREPARE b/libs/glibc/PREPARE
index ed07e7cf2b..aba6486cbb 100755
--- a/libs/glibc/PREPARE
+++ b/libs/glibc/PREPARE
@@ -10,5 +10,4 @@ fi  &&
 
 if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]]; then
   config_query GLIBC_NOLIB64  "Shall the dynamic linker install to /lib (not /lib64) (lib64 purge  part 2 of 2)?"  n
-fi &&
-persistent_add GLIBC_ARCH
+fi
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index f9c4a6920b..7528daa904 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -4,7 +4,7 @@ default_pre_build  &&
 # Set GLIBC_HEADERS_DIR for use later
 #
 persistent_add  GLIBC_HEADERS_DIR                                        &&
-GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linux-headers-${HEADERS_VERSION}-${GLIBC_ARCH}  &&
+GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/linux-libc-headers-$HEADERS_VERSION  &&
 
 #
 # Set GLIBC_LIBIDN_DIR for use later; the variable was needlessly persistent
@@ -31,7 +31,11 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   # Unpack glibc-kernel-headers
   #
   unpack_file 3                         &&
-  cd  $GLIBC_HEADERS_DIR/usr/include                  &&
+  cd  $GLIBC_HEADERS_DIR                              &&
+  patch  -p1  <  $SCRIPT_DIRECTORY/config.h.patch     &&
+  cd  $GLIBC_HEADERS_DIR/include                      &&
+  # fix the agpgart.h header, this is needed for at least xorg 6.9.0
+  sedit  '53i#include <asm/types.h>'  linux/agpgart.h &&
   chmod  -R  +r  *                                    &&
   find  .  -type  d  -exec  chmod  +x  '{}'  ';'
 else
@@ -43,8 +47,8 @@ else
   #
   # Unpack glibc-kernel-headers
   #
-  mkdir  -p  $GLIBC_HEADERS_DIR/usr/include         &&
-  cd  $GLIBC_HEADERS_DIR/usr/include                &&
+  mkdir  -p  $GLIBC_HEADERS_DIR/include             &&
+  cd  $GLIBC_HEADERS_DIR/include                    &&
   unpack_file 5
 fi  &&
 
@@ -54,7 +58,6 @@ fi  &&
 cd  $SOURCE_DIRECTORY                               &&
 patch  -p1  <  $SCRIPT_DIRECTORY/glibcshared.patch  &&
 patch  -p0  <  $SCRIPT_DIRECTORY/Makefile.patch     &&
-patch  -p1  <  $SCRIPT_DIRECTORY/as-test-x.patch &&
 
 # disabled libgd detection/building memusagestat for now until a better
 # fix has been found, bug #8277
diff --git a/libs/glibc/as-test-x.patch b/libs/glibc/as-test-x.patch
deleted file mode 100644
index b0f299ccdb..0000000000
--- a/libs/glibc/as-test-x.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/sysdeps/unix/sysv/linux/configure.in	2007-09-13 17:56:51.519950207 -0700
-+++ b/sysdeps/unix/sysv/linux/configure.in	2007-09-13 17:40:35.186895935 -0700
-@@ -24,6 +24,7 @@
-   CPPFLAGS="$CPPFLAGS $SYSINCLUDES"
- fi
- define([libc_cv_linuxVER], [libc_cv_linux]patsubst(LIBC_LINUX_VERSION,[\.]))dnl
-+as_test_x="test -x"
- AC_CACHE_CHECK(installed Linux kernel header files, libc_cv_linuxVER, [dnl
- AC_EGREP_CPP([eat flaming death], [#include <linux/version.h>
- #if !defined LINUX_VERSION_CODE || LINUX_VERSION_CODE < ]dnl
diff --git a/libs/glibc/config.h.patch b/libs/glibc/config.h.patch
index 2055042079..98b61279ab 100644
--- a/libs/glibc/config.h.patch
+++ b/libs/glibc/config.h.patch
@@ -1,5 +1,6 @@
---- a/usr/include/linux/config.h	2004-11-29 21:24:16.893466608 -0800
-+++ b/usr/include/linux/config.h	2004-11-29 21:24:46.574954336 -0800
+diff -urpN linux-libc-headers-2.6.8.1.orig/include/linux/config.h linux-libc-headers-2.6.8.1/include/linux/config.h
+--- linux-libc-headers-2.6.8.1.orig/include/linux/config.h	2004-11-29 21:24:16.893466608 -0800
++++ linux-libc-headers-2.6.8.1/include/linux/config.h	2004-11-29 21:24:46.574954336 -0800
 @@ -1,3 +1,3 @@
 -#error "Compilation aborted. Please read the FAQ for linux-libc-headers package."
 -#error "(can be found at http://ep09.pld-linux.org/~mmazur/linux-libc-headers/doc/)"