From 6d6cd349be3b0f1a1a7c638476da88dcaf078975 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Thu, 6 Aug 2015 07:49:02 +0200 Subject: [PATCH] glibc: update to 2.22. --- .../glibc/patches/glibc-32bit-regression.patch | 15 --------------- srcpkgs/glibc/patches/glibc-security-buflen.patch | 14 -------------- srcpkgs/glibc/template | 6 +++--- 3 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/glibc/patches/glibc-32bit-regression.patch delete mode 100644 srcpkgs/glibc/patches/glibc-security-buflen.patch diff --git a/srcpkgs/glibc/patches/glibc-32bit-regression.patch b/srcpkgs/glibc/patches/glibc-32bit-regression.patch deleted file mode 100644 index 3cea3ccd22..0000000000 --- a/srcpkgs/glibc/patches/glibc-32bit-regression.patch +++ /dev/null @@ -1,15 +0,0 @@ -Taken from http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html - ---- sysdeps/i386/i686/multiarch/mempcpy_chk.S 2015-02-06 07:40:18.000000000 +0100 -+++ sysdeps/i386/i686/multiarch/mempcpy_chk.S 2015-04-25 17:38:44.952119997 +0200 -@@ -36,8 +36,8 @@ - cmpl $0, KIND_OFFSET+__cpu_features@GOTOFF(%ebx) - jne 1f - call __init_cpu_features -- leal __mempcpy_chk_ia32@GOTOFF(%ebx), %eax --1: testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx) -+1: leal __mempcpy_chk_ia32@GOTOFF(%ebx), %eax -+ testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features@GOTOFF(%ebx) - jz 2f - leal __mempcpy_chk_sse2_unaligned@GOTOFF(%ebx), %eax - testl $bit_Fast_Unaligned_Load, FEATURE_OFFSET+index_Fast_Unaligned_Load+__cpu_features@GOTOFF(%ebx) diff --git a/srcpkgs/glibc/patches/glibc-security-buflen.patch b/srcpkgs/glibc/patches/glibc-security-buflen.patch deleted file mode 100644 index 0e331b6e35..0000000000 --- a/srcpkgs/glibc/patches/glibc-security-buflen.patch +++ /dev/null @@ -1,14 +0,0 @@ -Taken from http://www.linuxfromscratch.org/lfs/view/development/chapter06/glibc.html - ---- resolv/nss_dns/dns-host.c 2015-02-06 07:40:18.000000000 +0100 -+++ resolv/nss_dns/dns-host.c 2015-04-25 17:38:58.365119958 +0200 -@@ -615,7 +615,8 @@ - int have_to_map = 0; - uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data); - buffer += pad; -- if (__glibc_unlikely (buflen < sizeof (struct host_data) + pad)) -+ buflen = buflen > pad ? buflen - pad : 0; -+ if (__glibc_unlikely (buflen < sizeof (struct host_data))) - { - /* The buffer is too small. */ - too_small: diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 2f424c3c23..3d2afbd73c 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,14 +1,14 @@ # Template file for 'glibc' pkgname=glibc -version=2.21 -revision=9 +version=2.22 +revision=1 bootstrap=yes short_desc="The GNU C library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libc" license="GPL-2, LGPL-2.1, BSD" distfiles="${GNU_SITE}/glibc/glibc-${version}.tar.xz" -checksum=aeeb362437965a5d3f40b151094ca79def04a115bd363fdd4a9a0c69482923b8 +checksum=eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 # Do not strip these files, objcopy errors out. nostrip_files=" XBS5_ILP32_OFFBIG