X-Git-Url: http://gitweb/?a=blobdiff_plain;f=glibc%2FPkgfile;h=0a0ef97a2ef6f69fa8f1ec195d71b50cb82ada0b;hb=0d4730959a4b6607fdbd91d6817b5dd2727280cd;hp=e6cbb56aeba8da57971437640f77c9ca02bad92b;hpb=34fed911139b190f47f37daf0735f17e51dadd48;p=ports%2Fcore-arm.git

diff --git a/glibc/Pkgfile b/glibc/Pkgfile
index e6cbb56..0a0ef97 100644
--- a/glibc/Pkgfile
+++ b/glibc/Pkgfile
@@ -5,55 +5,53 @@
 # Depends on:
 
 name=glibc
-version=2.13
-release=1
+version=2.22
+release=2
 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
-        ftp://ftp.gnu.org/gnu/$name/$name-ports-$version.tar.bz2 \
-        ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.35.6.tar.gz \
-        glibc-ignore_origin.patch \
-        Optimize-__getpagesize-a-bit.patch \
-        $name-$version-gnueabihf.patch \
-        $name-$version-prelink.patch \
+        http://ftp.kernel.org/pub/linux/kernel/v4.x/linux-4.1.13.tar.xz \
+        CVE-2015-8779.patch CVE-2015-8778.patch CVE-2015-8777.patch CVE-2015-8776.patch \
         hosts resolv.conf nsswitch.conf host.conf ld.so.conf)
 
 build() {
-  # install build kernel headers
-  cd linux-2.6.35.6
+  # install kernel headers
+  cd linux-4.1.13
   make mrproper
   make ARCH=arm headers_check
   make ARCH=arm INSTALL_HDR_PATH=$PKG/usr headers_install
 
-  cd $SRC
-  mv $name-ports-$version $name-$version/ports
-
-  pushd $name-$version
-  patch -p1 -i $SRC/$name-$version-gnueabihf.patch
-  patch -p1 -i $SRC/$name-$version-prelink.patch
-  patch -R -p1 -i $SRC/Optimize-__getpagesize-a-bit.patch
-  patch -p1 -i $SRC/$name-ignore_origin.patch
-  popd
-
-  mkdir build
-  cd build
+  patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8779.patch
+  patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8778.patch
+  patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8777.patch
+  patch -p1 -d $SRC/$name-$version -i $SRC/CVE-2015-8776.patch
 
+  mkdir $SRC/build
+  cd $SRC/build
   ../$name-$version/configure --prefix=/usr \
-                              --build=$MACHTYPE \
+                              --build=arm-unknown-linux-gnueabihf \
                               --libexecdir=/usr/lib \
                               --with-headers=$PKG/usr/include \
-                              --with-tls \
-                              --enable-kernel=2.6.0 \
+                              --enable-kernel=2.6.25 \
                               --enable-add-ons \
+                              --enable-static-nss \
                               --disable-profile \
+                              --disable-werror \
                               --without-gd \
-                              --with-__thread 
+                              --enable-obsolete-rpc
 
-  make 
-  #make check
+  make
   make install_root=$PKG install
 
-  cp $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc
+  install -m 0644 $SRC/$name-$version/nscd/nscd.conf $PKG/etc
+  install -d $PKG/var/{db,run}/nscd
+
+  install -m 0644 $SRC/{hosts,resolv.conf,nsswitch.conf,host.conf,ld.so.conf} $PKG/etc
+
   ln -sf ../usr/share/zoneinfo/UTC $PKG/etc/localtime
-  mkdir -p $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale
+	ln -s stubs-hard.h $PKG/usr/include/gnu/stubs-soft.h
+  install -d $PKG/etc/ld.so.conf.d $PKG/usr/lib/locale
+  touch $PKG/etc/ld.so.cache
 
-  rm -rf $PKG/usr/share/{info,locale}
+  rm -rf $PKG/usr/share/{info,locale} \
+        $PKG/usr/bin/tzselect \
+        $PKG/usr/sbin/z{dump,ic}
 }