core updated.

This commit is contained in:
Ertuğrul Erata
2015-05-17 16:28:10 +03:00
parent 14d58aa1d0
commit 8e13c775be
558 changed files with 543408 additions and 27657 deletions
+5 -8
View File
@@ -11,7 +11,7 @@ from pisi.actionsapi import get
import os
WorkDir = "glibc-2.20"
WorkDir = "glibc-2.21"
arch = "x86-64" if get.ARCH() == "x86_64" and not get.buildTYPE() == "emul32" else "i686"
defaultflags = "-O3 -g -fasynchronous-unwind-tables -mtune=generic -march=%s" % arch
@@ -53,16 +53,13 @@ def setup():
--libexecdir=/usr/lib/misc \
--with-bugurl=https://bugs.pisilinux.org \
--enable-add-ons \
--enable-bind-now \
--enable-kernel=2.6.32 \
--enable-stackguard-randomization \
--without-selinux \
--without-gd \
--disable-profile \
--enable-obsolete-rpc \
--enable-kernel=2.6.32 \
--enable-bind-now --disable-profile \
--enable-stackguard-randomization \
--enable-lock-elision \
--enable-multi-arch \
--with-tls"
--disable-werror"
if get.buildTYPE() == "emul32":
options += "\
--libdir=/usr/lib32 \
@@ -0,0 +1,70 @@
diff --git a/ChangeLog b/ChangeLog
index dc1ed1b..45579de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-10 Evangelos Foutras <evangelos@foutrelis.com>
+
+ [BZ #17949]
+ * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Fix position of
+ jump label.
+
2015-02-06 Carlos O'Donell <carlos@systemhalted.org>
* version.h (RELEASE): Set to "stable".
@@ -7,6 +13,7 @@
* sysdeps/unix/sysv/linux/hppa/pthread.h: Sync with pthread.h.
2015-02-05 Paul Pluzhnikov <ppluzhnikov@google.com>
+ Paul Eggert <eggert@cs.ucla.edu>
[BZ #16618]
* stdio-common/tst-sscanf.c (main): Test for buffer overflow.
diff --git a/NEWS b/NEWS
index 617cdbb..ff79f0d 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,12 @@ See the end for copying conditions.
Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
using `glibc' in the "product" field.
+Version 2.21.1
+
+* The following bugs are resolved with this release:
+
+ 17949.
+
Version 2.21
* The following bugs are resolved with this release:
@@ -21,10 +27,11 @@ Version 2.21
17801, 17803, 17806, 17834, 17844, 17848, 17868, 17869, 17870, 17885,
17892.
-* CVE-2015-1472 Under certain conditions wscanf can allocate too little
- memory for the to-be-scanned arguments and overflow the allocated
- buffer. The implementation now correctly computes the required buffer
- size when using malloc.
+* CVE-2015-1472 CVE-2015-1473 Under certain conditions wscanf can allocate
+ too little memory for the to-be-scanned arguments and overflow the
+ allocated buffer. The implementation now correctly computes the required
+ buffer size when using malloc, and switches to malloc from alloca as
+ intended.
* A new semaphore algorithm has been implemented in generic C code for all
machines. Previous custom assembly implementations of semaphore were
diff --git a/sysdeps/i386/i686/multiarch/mempcpy_chk.S b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
index 207b648..b6fa202 100644
--- a/sysdeps/i386/i686/multiarch/mempcpy_chk.S
+++ b/sysdeps/i386/i686/multiarch/mempcpy_chk.S
@@ -36,8 +36,8 @@ ENTRY(__mempcpy_chk)
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)
+9 -2
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>GNU libc6 (also called glibc2) C library</Summary>
<Description>The GNU C library is used as the C library in the GNU system and most systems with the Linux kernel. It defines the system calls and other basic C programming language facilities.</Description>
<Archive sha1sum="0ddd02ceb41f7cd049fac691a7864047b87b6351" type="tarxz">http://ftp.gnu.org/gnu/libc/glibc-2.20.tar.xz</Archive>
<Archive sha1sum="1157be3fe63baa81b7ba104a103337775a6ed06f" type="tarxz">http://ftp.gnu.org/gnu/libc/glibc-2.21.tar.xz</Archive>
<BuildDependencies>
<Dependency>kernel-headers</Dependency>
<Dependency>gettext</Dependency>
@@ -21,7 +21,7 @@
</BuildDependencies>
<Patches>
<Patch>locale-no-archive.patch</Patch>
<Patch>glibc-2.20-roundup.patch</Patch>
<Patch>glibc-2.21-roundup.patch</Patch>
<!-- <Patch>glibc-2.20-getifaddrs_internal-segfault.patch</Patch> -->
<!-- <Patch>glibc-2.20-linux-3.16-additions.patch</Patch> -->
<!-- <Patch>glibc-2.20-do_ftell_wide-memleak.patch</Patch> -->
@@ -1757,6 +1757,13 @@
</Package>
<History>
<Update release="11">
<Date>2015-04-04</Date>
<Version>2.21</Version>
<Comment>Version bump.</Comment>
<Name>Yusuf Aydemir</Name>
<Email>yusuf.aydemir@pisilinux.org</Email>
</Update>
<Update release="10">
<Date>2014-11-28</Date>
<Version>2.20</Version>