Update to 2.19 to accompany the new linux-3.14.3 kernel

1 files changed, 10 insertions, 35 deletions

diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index a517d18..1b0929b 100755
--- a/current/glibc/glibc-multilib.SlackBuild
+++ b/current/glibc/glibc-multilib.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -28,9 +28,9 @@
 # by Eric Hameleers <alien@slackware.com>
 
 
-VERSION=${VERSION:-2.17}
+VERSION=${VERSION:-2.19}
 CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-7alien}
+BUILD=${BUILD:-1alien}
 
 ## Included in glibc now:
 ## glibc-libidn version
@@ -128,12 +128,6 @@ mkdir -p $TMP
 
 NUMJOBS=${NUMJOBS:--j4}
 
-# Sanity check on the version number in the install scripts:
-if ! grep -vq libutil-${VERSION}.so $CWD/doinst.sh-glibc ; then
-  echo "FATAL:  doinst.sh scripts have wrong version numbers."
-  exit 1
-fi
-
 # This function fixes a doinst.sh file for x86_64.
 # With thanks to Fred Emmott.
 fix_doinst() {
@@ -173,8 +167,6 @@ apply_patches() {
   zcat $CWD/glibc.nis-netgroups.diff.gz | patch -p1 --verbose || exit 1
   # Support ru_RU.CP1251 locale:
   zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
-  # Fix missing MAX macro in getcwd.c:
-  zcat $CWD/glibc.getcwd.max.macro.diff.gz | patch -p1 --verbose || exit 1
   # Fix resolver problem with glibc-2.9:
   zcat $CWD/glibc-2.10-dns-no-gethostbyname4.diff.gz | patch -p0 --verbose || exit 1
   # This reverts a patch that was made to glibc to fix "namespace leakage",
@@ -190,30 +182,10 @@ apply_patches() {
   # ***NOT READY***
   #zcat $CWD/glibc.git-4a531bb0b3b582cb693de9f76d2d97d970f9a5d5.patch.gz | patch -p1 --verbose || exit 1
   #
-  # Avoid the Intel optimized asm routines for now because they break
-  # the flash player.  We'll phase this in when it's safer to do so.
-  zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1
-  # Fix buffer overrun in regexp matcher.  This bug is deemed low impact since
-  # the buffer contents cannot be controlled, but could lead to a crash.
-  zcat $CWD/glibc.CVE-2013-0242.diff.gz | patch -p1 --verbose || exit 1
-  # Fix stack overflow in getaddrinfo with many results.  This bug can only be
-  # triggered through DNS poisoning or through the use of a hostile DNS
-  # server (in which case you already have problems), and requires large
-  # amounts of data to be sent to the targeted machine.  May lead to a
-  # crash.  Considered low impact.
-  zcat $CWD/glibc.CVE-2013-1914.diff.gz | patch -p1 --verbose || exit 1
-  # Remove pt_chown by default, as it can be used for a local privilege
-  # escalation.  However, although this is worth patching in the -current
-  # version, it requires a non-default (and known to weaken security) setting
-  # for FUSE.  Additionally, the patch is not portable to older versions of
-  # glibc (but thanks Mancha for porting it to 2.17!).  On older versions
-  # of glibc, making /usr/libexec/pt_chown a symlink to /bin/true will
-  # provide the same fix, if needed.  But the insecure setting for FUSE
-  # probably opens up many other possible exploits and should be avoided.
-  zcat $CWD/glibc.CVE-2013-2207.diff.gz | patch -p1 --verbose || exit 1
-  # Patch integer overflows in pvalloc, valloc, and
-  # posix_memalign/memalign/aligned_alloc (CVE-2013-4332).
-  zcat $CWD/glibc.CVE-2013-4332.diff.gz | patch -p1 --verbose || exit 1
+  # 2014-05:  We'll try building with the stock asm...
+  ## Avoid the Intel optimized asm routines for now because they break
+  ## the flash player.  We'll phase this in when it's safer to do so.
+  #zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1
   if [ $BOOTSTRP -eq 1 ] ; then
     # Multilib - Disable check for forced unwind (Patch from eglibc) since we
     # do not have a multilib glibc yet to link to;
@@ -372,6 +344,7 @@ sed -i "s,/etc/zoneinfo,/zoneinfo,g" Makefile
 make
 make install
 mkdir -p $PKG/usr/share/zoneinfo/{posix,right}
+cd etc
 cp -a zoneinfo/* $PKG/usr/share/zoneinfo
 cp -a zoneinfo-posix/* $PKG/usr/share/zoneinfo/posix
 cp -a zoneinfo-leaps/* $PKG/usr/share/zoneinfo/right
@@ -577,6 +550,7 @@ mkdir install
 cp -a $CWD/slack-desc.glibc-solibs install/slack-desc
 cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh
 fix_doinst
+sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
 # Ditch links:
 find . -type l -exec rm {} \;
 # Build the package:
@@ -596,6 +570,7 @@ mkdir install
 cp -a $CWD/slack-desc.glibc install/slack-desc
 cp -a $CWD/doinst.sh-glibc install/doinst.sh
 fix_doinst
+sed -i "s/@@VERSION@@/$VERSION/g" install/doinst.sh
 ( cd lib${LIBDIRSUFFIX}
   mkdir incoming
   mv *so* incoming