summaryrefslogtreecommitdiffstats
path: root/current
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2015-02-13 09:31:41 +0000
committer Eric Hameleers <alien@slackware.com>2015-02-13 09:31:41 +0000
commitbcc372c3fd3937d851a2ebe408eb41a9b9182cf1 (patch)
treecee48589c9c54986786f1e5792c49e82de6e971d /current
parent17135d477fcde9d05f9200ffbcc1a92cb094a0c3 (diff)
downloadmultilib-bcc372c3fd3937d851a2ebe408eb41a9b9182cf1.tar.gz
multilib-bcc372c3fd3937d851a2ebe408eb41a9b9182cf1.tar.xz
glibc: update to 2.21 to accompany new kernel 3.14.33
Diffstat (limited to 'current')
-rwxr-xr-xcurrent/glibc/glibc-multilib.SlackBuild10
1 files changed, 3 insertions, 7 deletions
diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index e725718..fd620cc 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 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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.20}
+VERSION=${VERSION:-2.21}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2alien}
+BUILD=${BUILD:-1alien}
## Included in glibc now:
## glibc-libidn version
@@ -172,8 +172,6 @@ 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 -l --verbose || exit 1
- # This partial security patch still applies and might be needed:
- zcat $CWD/glibc.git-96611391ad8823ba58405325d78cefeae5cdf699-CVE-2010-3847b.patch.gz | patch -p1 --verbose || exit 1
# Make it harder for people to trick ldd into running code:
zcat $CWD/glibc.ldd.trace.through.dynamic.linker.diff.gz | patch -p1 --verbose || exit 1
# Make glibc compile with binutils using --enable-initfini-array.
@@ -186,8 +184,6 @@ apply_patches() {
## 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
- # Security hardening patch from Florian Weimer:
- patch -p1 --verbose < $CWD/glibc.hardening.diff || 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;