summaryrefslogtreecommitdiffstats
path: root/source/current
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-08-03 22:50:36 +0000
committer Eric Hameleers <alien@slackware.com>2017-08-03 22:50:36 +0000
commit05aace5778f606d6ff29bb6000e4409eef25b7b3 (patch)
tree9be21f85b46251739d820f0b5fefac244f6bbef8 /source/current
parentbdd4620e8364a9c3290fd7b2a0a2be03f9097cf6 (diff)
downloadmultilib-05aace5778f606d6ff29bb6000e4409eef25b7b3.tar.gz
multilib-05aace5778f606d6ff29bb6000e4409eef25b7b3.tar.xz
glibc-multilib: updated to 2.26
Diffstat (limited to 'source/current')
-rwxr-xr-xsource/current/glibc/glibc-multilib.SlackBuild12
1 files changed, 4 insertions, 8 deletions
diff --git a/source/current/glibc/glibc-multilib.SlackBuild b/source/current/glibc/glibc-multilib.SlackBuild
index f670782..02e267a 100755
--- a/source/current/glibc/glibc-multilib.SlackBuild
+++ b/source/current/glibc/glibc-multilib.SlackBuild
@@ -28,9 +28,9 @@
# by Eric Hameleers <alien@slackware.com>
-VERSION=${VERSION:-2.25}
+VERSION=${VERSION:-2.26}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-3alien}
+BUILD=${BUILD:-1alien}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
@@ -167,12 +167,8 @@ apply_patches() {
# Revert patches that cause spurious warnings about IFUNC symbols:
zcat $CWD/glibc.IFUNC.i386.revert.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/glibc.IFUNC.x86_64.revert.diff.gz | patch -p1 --verbose || exit 1
- # Upstream git patches for security hardening (CVE-2017-1000366):
- zcat $CWD/glibc.3776f38f.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/glibc.46703a39.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/glibc.CVE-2017-1000366.3c7cd212.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/glibc.adc7e06f.diff.gz | patch -p1 --verbose || exit 1
- zcat $CWD/glibc.c69d4a0f.diff.gz | patch -p1 --verbose || exit 1
+ # Fix a compiler error that occurs when using -O3:
+ zcat $CWD/glibc.malloc.array.bounds.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;