From 02d51a78e53a31098dd71815a1344d1edd7e3122 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 20 Feb 2016 18:33:19 +0000
Subject: glibc multilib: updated to 2.23

---
 current/glibc/glibc-multilib.SlackBuild | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'current')

diff --git a/current/glibc/glibc-multilib.SlackBuild b/current/glibc/glibc-multilib.SlackBuild
index 9428b35..7fde5f5 100755
--- a/current/glibc/glibc-multilib.SlackBuild
+++ b/current/glibc/glibc-multilib.SlackBuild
@@ -28,13 +28,9 @@
 # by Eric Hameleers <alien@slackware.com>
 
 
-VERSION=${VERSION:-2.22}
+VERSION=${VERSION:-2.23}
 CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-5alien}
-
-## Included in glibc now:
-## glibc-libidn version
-#LIBIDNVER=2.10.1
+BUILD=${BUILD:-1alien}
 
 # I was considering disabling NSCD, but MoZes talked me out of it.  :)
 #DISABLE_NSCD=" --disable-nscd "
@@ -162,8 +158,6 @@ apply_patches() {
   # not existing.  This patch reverts is_IS to the version shipped in
   # glibc-2.5:
   zcat $CWD/is_IS.diff.gz | patch -p1 --verbose || exit 1
-  # Fix NIS netgroups:
-  zcat $CWD/glibc.nis-netgroups.diff.gz | patch -p1 --verbose || exit 1
   # Support ru_RU.CP1251 locale:
   zcat $CWD/glibc.ru_RU.CP1251.diff.gz | patch -p1 --verbose || exit 1
   # Fix resolver problem with glibc-2.9:
@@ -175,9 +169,6 @@ 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;
@@ -224,8 +215,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:
-- 
cgit v1.2.3