From 9b10c51dd9324b0e970e5b7dbd768e2919b43b05 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 21 Oct 2010 09:16:16 +0000
Subject: Add patch to fix the CVE-2010-3847 local root hole

---
 13.0/glibc/glibc-multilib.SlackBuild | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to '13.0')

diff --git a/13.0/glibc/glibc-multilib.SlackBuild b/13.0/glibc/glibc-multilib.SlackBuild
index 3277668..6b01d43 100755
--- a/13.0/glibc/glibc-multilib.SlackBuild
+++ b/13.0/glibc/glibc-multilib.SlackBuild
@@ -30,11 +30,18 @@
 
 VERSION=${VERSION:-2.9}
 CHECKOUT=${CHECKOUT:--20090316}
-BUILD=${BUILD:-3alien}
+BUILD=${BUILD:-4alien_slack13.0}
 # $ARCH may be preset, otherwise i486 compatibility with i686 binary
 # structuring is the Slackware default, since this is what gcc-3.2+
 # requires for binary compatibility with previous releases.
-ARCH=${ARCH:-x86_64}
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
 
 CVSVER=${VERSION}${CHECKOUT}
 
@@ -123,6 +130,8 @@ apply_patches() {
   # This reverts a patch that was made to glibc to fix "namespace leakage",
   # which seems to cause some build failures (e.g. with conntrack):
   zcat $CWD/glibc.revert.to.fix.build.breakages.diff.gz | patch -p1 --verbose || exit 1
+  # This fixes a security issue in glibc 2.12.1 and earlier:
+  zcat $CWD/glibc.CVE-2010-3847.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;
@@ -130,14 +139,14 @@ apply_patches() {
   fi
   # Update the timezone information.
   ( cd timezone
-    tar xzf $CWD/tzdata2009d.tar.gz
+    tar xzf $CWD/tzdata?????.tar.gz
     chown root:root *
     mv yearistype.sh yearistype
     chmod 644 *
     chmod 755 yearistype
     mkdir tzcode
     cd tzcode
-    tar xzf $CWD/tzcode2009d.tar.gz
+    tar xzf $CWD/tzcode?????.tar.gz
     chown -R root:root .
     chmod 644 *
     cp -a *.c *.h ..
-- 
cgit v1.2.3