[Lunar-commits] <moonbase-core> glibc: Added additional patches and removed sedits which are no longer required

[Stefan Wold]

commit 045b95f239f15ae8c5211d48337d7559c2d1cd22
Author: Stefan Wold <ratler at lunar-linux.org>
Date: Tue, 07 Aug 2012 15:27:03 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/045b95f239f15ae8c5211d48337d7559c2d1cd22

glibc: Added additional patches and removed sedits which are no longer required

- Removed commented out lines
- Added a patch to fix res_query assertion
- Added a patch that solves various hangs in some apps
---
  libs/glibc/BUILD        | +8/-11    
  libs/glibc/BUILD.x86_64 | +7/-10    
  libs/glibc/DETAILS      | +5/-2     
  3 files changed, 20 insertions(+), 23 deletions(-)

--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -2,8 +2,6 @@
   # The fortify compiler option cause the build to fail
   bad_flags -D_FORTIFY_SOURCE=2  &&
 
-# This sedit takes care of Bug Report 398 submitted by Striker.
-#  sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl  &&
   mkdir -p $SOURCE_DIRECTORY/tmp  &&
 
   export CC_OPTS=( Pipe )  &&
@@ -28,17 +26,16 @@
   patch_it $SOURCE2 1  &&
   patch_it $SOURCE3 1  &&
   patch_it $SOURCE4 1  &&
-
-  # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
-#  patch_it $SOURCE5 1  &&
-
-# disable final test
+  
+  # Fix res_query assertion
+  patch_it $SOURCE5 1  &&
+  
+  # Fix various hangs
+  patch_it $SOURCE6 1  &&
+
+  # disable final test
   sed -i '/test-installation.pl/d' Makefile  &&
 
-  sedit 's/^# \(.* := rpcinfo\)/\1/p'  sunrpc/Makefile  &&
-  sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile  &&
-  sedit '/libnss_test1/d' shlib-versions  &&
-
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
   mkdir -p $INSTALL_ROOT  &&
   cd $INSTALL_ROOT  &&
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -2,8 +2,6 @@
   # The fortify compiler option cause the build to fail
   bad_flags -D_FORTIFY_SOURCE=2  &&
 
-# This sedit takes care of Bug Report 398 submitted by Striker.
-#  sedit "s:/tmp:$SOURCE_DIRECTORY/tmp:g" scripts/test-installation.pl  &&
   mkdir -p $SOURCE_DIRECTORY/tmp  &&
 
   export CC_OPTS=( Pipe )  &&
@@ -25,23 +23,22 @@
   fi  &&
   unset LDFLAGS  &&
 
-# fix the compile for x86_64
+  # fix the compile for x86_64
   sedit "s:s_floor-c s_ceil-c s_floorf-c s_ceilf-c:s_floorf-c s_ceilf-c:g"  sysdeps/x86_64/fpu/multiarch/Makefile  &&
 
   patch_it $SOURCE2 1  &&
   patch_it $SOURCE3 1  &&
   patch_it $SOURCE4 1  &&
 
-  # Fixes nvidia-settings and other apps segfault http://www.nvnews.net/vbulletin/showpost.php?p=2501574
-#  patch_it $SOURCE5 1  &&
+  # Fix res_query assertion
+  patch_it $SOURCE5 1  &&
+  
+  # Fix various hangs
+  patch_it $SOURCE6 1  &&
 
-# disable final test
+  # disable final test
   sed -i '/test-installation.pl/d' Makefile  &&
 
-  sedit 's/^# \(.* := rpcinfo\)/\1/p'  sunrpc/Makefile  &&
-  sedit 's/test-netdb tst-nss-test1/test-netdb/' nss/Makefile  &&
-  sedit '/libnss_test1/d' shlib-versions  &&
-
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
   mkdir -p $INSTALL_ROOT  &&
   cd $INSTALL_ROOT  &&
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -5,7 +5,8 @@
          SOURCE2=$MODULE-2.11-no_timezones.patch.bz2
          SOURCE3=$MODULE-2.11.1-__i686.patch.bz2
          SOURCE4=$MODULE-2.15-fixes-1.patch.bz2
-         SOURCE5=$MODULE-2.14.1-fixes-1.patch.bz2
+         SOURCE5=$MODULE-2.15-fix-res_query-assert.patch
+         SOURCE6=$MODULE-2.15-revert-c5a0802a.patch
    SOURCE_URL[0]=$GNU_URL/$MODULE
    SOURCE_URL[1]=ftp://ftp.gnu.org/pub/gnu/$MODULE
    SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.gnu.org/gnu/glibc
@@ -13,11 +14,13 @@
      SOURCE3_URL=$PATCH_URL
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
+     SOURCE6_URL=$PATCH_URL
       SOURCE_VFY=sha1:9d4fffc9c4ac93e7919e124fa38bb51dcaff5216
      SOURCE2_VFY=sha1:fc5bf75815daeeef52f7558f27992e02c2cdc87d
      SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
      SOURCE4_VFY=sha1:7e53ec5daaf29d13ff3e9a9b2450da1f93000add
-     SOURCE5_VFY=sha1:5e26fb8800dd974527b4b73443ddfe134beae7f9
+     SOURCE5_VFY=sha1:fa4f4ce87a08f40d70f4d88d1ee62cf63b644bcc
+     SOURCE6_VFY=sha1:aad4d183fc2509e87f0986802117a45772cc0a0c
         WEB_SITE=http://www.gnu.org/software/libc
          ENTERED=20010922
          UPDATED=20120712