diff options
| author |   Eric Hameleers <alien@slackware.com> | 2016-02-23 22:47:09 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2016-02-23 22:47:09 +0000 |
| commit | d66be5bf60a1a96241428efc2de22ed50a50d55a (patch) | |
| tree | bc1a0ad08bea95d964ac039f8d877d596a555826 /14.1 | |
| parent | 02d51a78e53a31098dd71815a1344d1edd7e3122 (diff) | |
| download | multilib-d66be5bf60a1a96241428efc2de22ed50a50d55a.tar.gz multilib-d66be5bf60a1a96241428efc2de22ed50a50d55a.tar.xz | |
Patch CVE-2015-7547
Diffstat (limited to '14.1')
| -rwxr-xr-x | 14.1/glibc/glibc-multilib.SlackBuild | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/14.1/glibc/glibc-multilib.SlackBuild b/14.1/glibc/glibc-multilib.SlackBuild index 701c958..e050464 100755 --- a/14.1/glibc/glibc-multilib.SlackBuild +++ b/14.1/glibc/glibc-multilib.SlackBuild @@ -30,11 +30,7 @@ VERSION=${VERSION:-2.17} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-10alien} - -## Included in glibc now: -## glibc-libidn version -#LIBIDNVER=2.10.1 +BUILD=${BUILD:-11alien} # I was considering disabling NSCD, but MoZes talked me out of it. :) #DISABLE_NSCD=" --disable-nscd " @@ -231,6 +227,8 @@ apply_patches() { patch -p1 --verbose < $CWD/glibc-2.17_gcc48-unsafe-optim.diff || exit 1 # Fix parsing of numeric hosts in gethostbyname_r: zcat $CWD/glibc.CVE-2015-0235.glibc217.diff.gz | patch -p1 --verbose || exit 1 + # Patch CVE-2015-7547: + zcat $CWD/glibc-2.17_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; @@ -278,8 +276,6 @@ tar xvf $CWD/glibc-$CVSVER.tar.xz \ || tar xvf $CWD/glibc-$CVSVER.tar.bz2 \ || tar xvf $CWD/glibc-$CVSVER.tar.gz cd glibc-$CVSVER -#tar xvf $CWD/glibc-libidn-$LIBIDNVER.tar.?z* -#mv glibc-libidn-$LIBIDNVER libidn # If we use this script to bootstrap a multilib glibc using a bare # statically compiled gcc, we need to disable linking to libgcc_eh: |