diff options
Diffstat (limited to 'current/glibc/glibc-multilib.SlackBuild')
-rwxr-xr-x | current/glibc/glibc-multilib.SlackBuild | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild index 60e545e..9428b35 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, 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,7 +30,7 @@ VERSION=${VERSION:-2.22} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-4alien} +BUILD=${BUILD:-5alien} ## Included in glibc now: ## glibc-libidn version @@ -175,6 +175,9 @@ apply_patches() { zcat $CWD/glibc.ldd.trace.through.dynamic.linker.diff.gz | patch -p1 --verbose || exit 1 # Add a C.UTF-8 locale: zcat $CWD/glibc-c-utf8-locale.patch.gz | patch -p1 --verbose || exit 1 + # Revert an upstream patch for compatability, and then apply the CVE-2015-7547 fix: + zcat $CWD/glibc-rh1252570.patch.gz | patch -p1 --verbose || exit 1 + zcat $CWD/glibc.CVE-2015-7547.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; |