[Lunar-commits] <moonbase-core> Merge branch 'glibc'

v4hn me at v4hn.de
Tue Nov 19 00:12:01 CET 2013


commit 4c99a9e7af5869ce7cf993821067220e571f11a3
Author: v4hn <me at v4hn.de>
Date: Mon, 18 Nov 2013 15:11:43 -0800
URL: https://github.com/lunar-linux/moonbase-core/commit/4c99a9e7af5869ce7cf993821067220e571f11a3

Merge branch 'glibc'
---
  libs/glibc/BUILD        | +12/-17   
  libs/glibc/BUILD.x86_64 | +11/-18   
  libs/glibc/DETAILS      | +30/-8    
  libs/glibc/PRE_BUILD    | +14/-1    
  4 files changed, 67 insertions(+), 44 deletions(-)

--- a/libs/glibc/BUILD
+++ b/libs/glibc/BUILD
@@ -1,3 +1,4 @@
+
   # The fortify compiler option cause the build to fail
   bad_flags -D_FORTIFY_SOURCE=2  &&
 
@@ -8,7 +9,7 @@
   KVER=`installed_version kernel-headers`  &&
 
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER"  &&
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER --with-headers=/usr/include"  &&
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
@@ -22,21 +23,10 @@
   fi  &&
   unset LDFLAGS  &&
 
-  patch_it $SOURCE2 1  &&
-  patch_it $SOURCE3 1  &&
-  patch_it $SOURCE4 1  &&
-  patch_it $SOURCE5 1  &&
-  patch_it $SOURCE6 1  &&
-
-  # disable final test
-  sed -i '/test-installation.pl/d' Makefile  &&
-
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
   mkdir -p $INSTALL_ROOT  &&
   cd $INSTALL_ROOT  &&
 
-  OPTS+=" --with-headers=/usr/include"  &&
-
   ../configure --prefix=/usr              \
                --infodir=/usr/share/info  \
                --mandir=/usr/share/man    \
@@ -51,9 +41,7 @@
                --enable-bind-now          \
                --enable-stackguard-randomization \
                $OPTS  &&
-
-  # explicitly exit here since the following code unsets $?
-  make || exit 1  &&
+  make &&
 
   # Preserve the old glibc temporarily
   LD=/lib/ld-linux.so.2         &&
@@ -137,9 +125,16 @@
   # Remove the temporary libc
   rm /lib/{ld,lib{c,dl,m,rt,pthread,nss_files,util,nsl,crypt}}-lunar.so  &&
 
+  if [ ! -e /etc/nscd.conf ]; then
+    install -m644 $SOURCE_DIRECTORY/nscd/nscd.conf /etc/nscd.conf
+  fi &&
+  if [ ! -e /etc/gai.conf ]; then
+    install -m644 $SOURCE_DIRECTORY/posix/gai.conf /etc/gai.conf
+  fi &&
+
   # Generate locale info
   if [ -z "$GLIBC_LOCALES" ]; then
-    make localedata/install-locales || exit 1
+    make localedata/install-locales
   else
     devoke_installwatch  &&
     for LOCALE in $GLIBC_LOCALES; do
@@ -149,7 +144,7 @@
       mkdir -p /usr/lib/locale/$OUTPUTFILE      &&
       echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"  &&
       localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
-    done
+    done &&
     invoke_installwatch  &&
     touch /usr/lib/locale/locale-archive
   fi  &&
--- a/libs/glibc/BUILD.x86_64
+++ b/libs/glibc/BUILD.x86_64
@@ -8,7 +8,7 @@
   KVER=`installed_version kernel-headers`  &&
 
   # There is no other option but nptl
-  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER"  &&
+  OPTS+=" --enable-add-ons=nptl,libidn --with-__thread --with-tls --disable-profile --enable-kernel=$KVER --with-headers=/usr/include"  &&
 
   if [ -n "$MAKES" ] && [ "$MAKES" -gt 1 ] ; then
     sedit "s/# PARALLELMFLAGS = -j 4/PARALLELMFLAGS = -j $MAKES/" Makefile.in
@@ -22,24 +22,10 @@
   fi  &&
   unset LDFLAGS  &&
 
-  # 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  &&
-  patch_it $SOURCE5 1  &&
-  patch_it $SOURCE6 1  &&
-
-  # disable final test
-  sed -i '/test-installation.pl/d' Makefile  &&
-
   INSTALL_ROOT=$SOURCE_DIRECTORY/glibcroot  &&
   mkdir -p $INSTALL_ROOT  &&
   cd $INSTALL_ROOT  &&
 
-  OPTS+=" --with-headers=/usr/include"  &&
-
   ../configure --prefix=/usr              \
                --infodir=/usr/share/info  \
                --mandir=/usr/share/man    \
@@ -56,7 +42,7 @@
                $OPTS  &&
 
   # explicitly exit here since the following code unsets $?
-  make || exit 1  &&
+  make &&
 
   # Preserve the old glibc temporarily
   LD=/lib/ld-linux-x86-64.so.2  &&
@@ -127,9 +113,16 @@
   # Remove the temporary libc
   rm /lib/{ld,lib{c,dl,m,rt,pthread,nss_files,util,nsl,crypt}}-lunar.so  &&
 
+  if [ ! -e /etc/nscd.conf ]; then
+    install -m644 $SOURCE_DIRECTORY/nscd/nscd.conf /etc/nscd.conf
+  fi &&
+  if [ ! -e /etc/gai.conf ]; then
+    install -m644 $SOURCE_DIRECTORY/posix/gai.conf /etc/gai.conf
+  fi &&
+
   # Generate locale info
   if [ -z "$GLIBC_LOCALES" ]; then
-    make localedata/install-locales || exit 1
+    make localedata/install-locales
   else
     devoke_installwatch  &&
     for LOCALE in $GLIBC_LOCALES; do
@@ -139,7 +132,7 @@
       mkdir -p /usr/lib/locale/$OUTPUTFILE      &&
       echo "localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE"  &&
       localedef -i $INPUTFILE -f $CHARMAP $OUTPUTFILE
-    done
+    done &&
     invoke_installwatch  &&
     touch /usr/lib/locale/locale-archive
   fi  &&
--- a/libs/glibc/DETAILS
+++ b/libs/glibc/DETAILS
@@ -1,12 +1,19 @@
           MODULE=glibc
-         VERSION=2.17
+         VERSION=2.18
            MAJOR=${VERSION::4}
           SOURCE=$MODULE-$VERSION.tar.xz
-         SOURCE2=$MODULE-2.17-no_timezones.patch
+         SOURCE2=$MODULE-2.18-no_timezones.patch
          SOURCE3=$MODULE-2.11.1-__i686.patch.bz2
          SOURCE4=$MODULE-2.15-fixes-1.patch.bz2
          SOURCE5=$MODULE-2.15-math64crash.patch
-         SOURCE6=$MODULE-2.17-sync-with-linux37.patch.bz2
+         SOURCE6=glibc-2.18-readdir_r-CVE-2013-4237.patch
+         SOURCE7=glibc-2.18-malloc-corrupt-CVE-2013-4332.patch
+         SOURCE8=glibc-2.18-strcoll-CVE-2012-4412+4424.patch
+         SOURCE9=glibc-2.18-ptr-mangle-CVE-2013-4788.patch
+        SOURCE10=glibc-2.18-getaddrinfo-CVE-2013-4458.patch
+        SOURCE11=glibc-2.18-getaddrinfo-assertion.patch
+        SOURCE12=glibc-2.18-scanf-parse-0e-0.patch
+        SOURCE13=glibc-2.18-strstr-hackfix.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
@@ -15,17 +22,32 @@
      SOURCE4_URL=$PATCH_URL
      SOURCE5_URL=$PATCH_URL
      SOURCE6_URL=$PATCH_URL
-      SOURCE_VFY=sha1:e210daf1d5d6d6da7bf216fbaad4922bd642952b
-     SOURCE2_VFY=sha1:5b6d568ef5c6f4a03a6ce75e9e8397edefb70426
+     SOURCE7_URL=$PATCH_URL
+     SOURCE8_URL=$PATCH_URL
+     SOURCE9_URL=$PATCH_URL
+    SOURCE10_URL=$PATCH_URL
+    SOURCE11_URL=$PATCH_URL
+    SOURCE12_URL=$PATCH_URL
+    SOURCE12_URL=$PATCH_URL
+    SOURCE13_URL=$PATCH_URL
+      SOURCE_VFY=sha1:1f0e4e7ba5fe1f45ffd0548b6c36caef0bc7e51f
+     SOURCE2_VFY=sha1:86c3b8d2424a27e05937b50fb545b250834b69a9
      SOURCE3_VFY=sha1:e3f36e2bb17e51e31035f2cd405d099c624d0e9e
      SOURCE4_VFY=sha1:7e53ec5daaf29d13ff3e9a9b2450da1f93000add
      SOURCE5_VFY=sha1:cbf649a7cf3648a5c4ce93ebe4d68a61349f3036
-     SOURCE6_VFY=sha1:05cbd8de46c215db66b644e643f2be96a43eedc0
+     SOURCE6_VFY=sha1:7ecd9abb03495a620f0e4a2d45a6046310649fde
+     SOURCE7_VFY=sha1:d3dd647f2f292c44f31311ea3cf9e39db7ba798e
+     SOURCE8_VFY=sha1:04f38fe8508e2541c9d946a9d788c60f160c1cc0
+     SOURCE9_VFY=sha1:f0117b071f5f24c2522231aa9452342bea0d0c3f
+    SOURCE10_VFY=sha1:7c02334013be3cd41f242e8d65b27996d4df5f19
+    SOURCE11_VFY=sha1:ca210fa5c7751af73899f73d4cfbc901af4f70d8
+    SOURCE12_VFY=sha1:20ae27fd59e942442ef02f0624d9c30d568a0fde
+    SOURCE13_VFY=sha1:f928cedf0fb3d2bf046975680c637d6b09ad93cf
         WEB_SITE=http://www.gnu.org/software/libc
          ENTERED=20010922
-         UPDATED=20130821
+         UPDATED=20131116
            SHORT="C library for use with GNU/Hurd and GNU/Linux"
-           PSAFE=no
+PSAFE=no
 
 cat << EOF
 glibc - Library for use with GNU/Hurd and GNU/Linux.
--- a/libs/glibc/PRE_BUILD
+++ b/libs/glibc/PRE_BUILD
@@ -1,3 +1,16 @@
 default_pre_build &&
 
-sedit 's@^#\s*warning \+_FORTIFY_SOURCE requires compiling with optimization.*$@/* Disabled by lunar as there is no better solution: \0*/@' include/features.h
+sedit 's@^#\s*warning \+_FORTIFY_SOURCE requires compiling with optimization.*$@/* Disabled by lunar as there is no better solution: \0*/@' include/features.h &&
+
+patch_it $SOURCE2 1 &&
+patch_it $SOURCE3 1 &&
+patch_it $SOURCE4 1 &&
+patch_it $SOURCE5 1 &&
+patch_it $SOURCE6 1 &&
+patch_it $SOURCE7 1 &&
+patch_it $SOURCE8 1 &&
+patch_it $SOURCE9 1 &&
+patch_it $SOURCE10 1 &&
+patch_it $SOURCE11 1 &&
+patch_it $SOURCE12 1 &&
+patch_it $SOURCE13 1




More information about the Lunar-commits mailing list