glibc: fix SOURCE URLS for sigs of kernel versions >=3.0

PRE_BUILD: correctly verify files with GPG for Kernel headers >=3.1 and patches >3.0.4
(cherry picked from commit 9c5b31e1e6ab9f376a0ddc72280ab313fd01fad2)

3 files changed, 60 insertions, 15 deletions

diff --git a/libs/glibc/DETAILS b/libs/glibc/DETAILS
index 44cbac3f7b..82206a1e04 100755
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -55,24 +55,38 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
     local LINUX_DIRECTORY
  LINUX_DIRECTORY=$(gaze where -path linux | sed "s/linux -> //")
     . $LINUX_DIRECTORY/latest.defaults
-if  [[  $(uname -r)  =  3.*  ]];  then
+ 
+    if  [[  $(uname -r)  =  3.*  ]];  then
  HEADERS_VERSION=$(echo $LATEST_maintenance_patches_3 | sed "s/patch-//")
  HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_3}
          SOURCE3=linux-${LATEST_3}.tar.bz2
+     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
+      case $HEADERS_VERSION in
+        3.[1-9]*) 
+         SOURCE6="linux-${LATEST_3}.tar.sign"
+     SOURCE6_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE6}"
+                ;;
+               *)
          SOURCE6="${SOURCE3}.sign"
+     SOURCE6_URL="${SOURCE3_URL}.sign"
+                ;;
+      esac
   SOURCE6_IGNORE=signature
      SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE3}"
-     SOURCE6_URL="${SOURCE3_URL}.sign"
-    if [[ $HEADERS_VERSION != $LATEST_3 ]]; then
+      if [[ ${HEADERS_VERSION} != $LATEST_3 ]]; then
          SOURCE7=patch-${HEADERS_VERSION}.bz2
+     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
+        if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
+         SOURCE8="patch-${HEADERS_VERSION}.sign"
+     SOURCE8_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE8}"
+        else 
          SOURCE8="${SOURCE7}.sign"
+     SOURCE8_URL="${SOURCE7_URL}.sign"
+        fi
   SOURCE8_IGNORE=signature
      SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
-     SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v3.0/${SOURCE7}"
-     SOURCE8_URL="${SOURCE7_URL}.sign"
-    fi
-else
+      fi
+    else
  HEADERS_VERSION=$(echo $LATEST_maintenance_patches | sed "s/patch-//")
  HEADERS_VERSION=${HEADERS_VERSION:-$LATEST_2_6}
          SOURCE3=linux-${LATEST_2_6}.tar.bz2
@@ -81,15 +95,15 @@ else
      SOURCE3_GPG="kernel.gpg:${SOURCE6}:ESTABLISHED_UPSTREAM_KEY"
      SOURCE3_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE3}"
      SOURCE6_URL="${SOURCE3_URL}.sign"
-    if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
+      if [[ $HEADERS_VERSION != $LATEST_2_6 ]]; then
          SOURCE7=patch-${HEADERS_VERSION}.bz2
          SOURCE8="${SOURCE7}.sign"
   SOURCE8_IGNORE=signature
      SOURCE7_GPG="kernel.gpg:${SOURCE8}:ESTABLISHED_UPSTREAM_KEY"
      SOURCE7_URL="${KERNEL_URL}/pub/linux/kernel/v2.6/${SOURCE7}"
      SOURCE8_URL="${SOURCE7_URL}.sign"
-    fi
-fi
+      fi
+    fi  
   fi
 fi
         WEB_SITE=http://www.gnu.org/software/libc
diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY
index 7cc36586b6..5b8761cbd3 100644
--- a/libs/glibc/HISTORY
+++ b/libs/glibc/HISTORY
@@ -1,3 +1,8 @@
+2012-05-15 Sukneet Basuta <sukneet@sourcemage.org>
+	* DETAILS: fix SOURCE URLS for sigs of kernel versions >=3.0 
+	* PRE_BUILD: correctly verify files with GPG for Kernel headers >=3.1
+	  and patches >3.0.4
+
 2011-09-20 Ismael Luceno <ismael@sourcemage.org>
 	* DEPENDS, DETAILS, PREPARE: Use prepare_select_branch
 
diff --git a/libs/glibc/PRE_BUILD b/libs/glibc/PRE_BUILD
index 3ff8bad2e9..55bde861db 100755
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -14,7 +14,21 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   persistent_add  GLIBC_HEADERS_DIR                        &&
   GLIBC_HEADERS_DIR=$SOURCE_DIRECTORY/${SOURCE3/.tar.bz2}  &&
 
-  unpack_file 3                         &&
+  case ${HEADERS_VERSION} in
+    3.[1-9]*)
+            message "${MESSAGE_COLOR}bunzip2 $SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
+            bunzip2 -k $SOURCE_CACHE/$SOURCE3
+            SOURCE3_ORI=$SOURCE3
+            SOURCE3=${SOURCE3/.bz2}
+            unpack_file 3 || return 1
+            message "${MESSAGE_COLOR}rm $SOURCE_CACHE/$SOURCE3${DEFAULT_COLOR}"
+            rm $SOURCE_CACHE/$SOURCE3
+            SOURCE3=$SOURCE3_ORI
+            ;;
+           *)
+            unpack_file 3 || return 1
+            ;;
+  esac
   if [[ $GLIBC_SANITIZE_HEADERS == n ]]; then
     cd  $GLIBC_HEADERS_DIR &&
     if [ ! -z $SOURCE3 ]; then
@@ -24,10 +38,22 @@ if  [  "$GLIBC_NPTL"  =  "y"  ];  then
   else
     cd  $GLIBC_HEADERS_DIR &&
     if [ ! -z $SOURCE7 ]; then
-      verify_file 7 || return 1 &&
-      bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7%.bz2} &&
+      if [[ ${HEADERS_VERSION} > 3.0.4 ]]; then
+        message "${MESSAGE_COLOR}bunzip2 $SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
+        bunzip2 -k ${SOURCE_CACHE}/$SOURCE7 &&
+        SOURCE7_ORI=${SOURCE7}
+        SOURCE7=${SOURCE7/.bz2}
+	echo $SOURCE7_GPG
+        verify_file 7 || return 1
+        message "${MESSAGE_COLOR}rm $SOURCE_CACHE/$SOURCE7${DEFAULT_COLOR}"
+        rm $SOURCE_CACHE/$SOURCE7
+        SOURCE7=${SOURCE7_ORI}
+      else
+        verify_file 7 || return 1
+      fi
+      bzcat ${SOURCE_CACHE}/$SOURCE7 > ${SOURCE7/.bz2}
       message "${MESSAGE_COLOR}Patching ${!patch}${DEFAULT_COLOR}" &&
-      patch -p1 < ${SOURCE7%.bz2} &&
+      patch -p1 < ${SOURCE7/.bz2} &&
       if [[ $? != 0 ]]; then
         message "${PROBLEM_COLOR}Patch ${!patch} failed${DEFAULT_COLOR}" &&
         return 1