[arch-commits] Commit in lib32-glibc/trunk (PKGBUILD glibc-2.21-roundup.patch)
Jan Steffens
heftig at archlinux.org
Fri Aug 7 13:09:53 UTC 2015
Date: Friday, August 7, 2015 @ 15:09:53
Author: heftig
Revision: 138056
2.22
Modified:
lib32-glibc/trunk/PKGBUILD
Deleted:
lib32-glibc/trunk/glibc-2.21-roundup.patch
--------------------------+
PKGBUILD | 40 +++++++++++-------
glibc-2.21-roundup.patch | 97 ---------------------------------------------
2 files changed, 25 insertions(+), 112 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2015-08-07 13:08:16 UTC (rev 138055)
+++ PKGBUILD 2015-08-07 13:09:53 UTC (rev 138056)
@@ -5,10 +5,11 @@
# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
+
_pkgbasename=glibc
pkgname=lib32-$_pkgbasename
-pkgver=2.21
-pkgrel=4
+pkgver=2.22
+pkgrel=1
pkgdesc="GNU C Library (32-bit)"
arch=('x86_64')
url="http://www.gnu.org/software/libc"
@@ -15,7 +16,7 @@
license=('GPL' 'LGPL')
groups=()
depends=()
-makedepends=('gcc-multilib>=4.9')
+makedepends=('gcc-multilib>=5.2')
backup=()
@@ -22,12 +23,12 @@
options=('!strip' 'staticlibs' '!emptydirs')
source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig}
- glibc-2.21-roundup.patch
lib32-glibc.conf)
-md5sums=('9cb398828e8f84f57d1f7d5588cf40cd'
+
+md5sums=('e51e02bf552a0a1fbbdc948fb2f5e83c'
'SKIP'
- 'feb826d5f4965e9892ee6e851fec43a9'
'6e052f1cb693d5d3203f50f9d4e8c33b')
+
validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF') # Carlos O'Donell
prepare() {
@@ -34,7 +35,7 @@
cd ${srcdir}/glibc-${pkgver}
# glibc-2.21..01b07c70
- patch -p1 -i $srcdir/glibc-2.21-roundup.patch
+ #patch -p1 -i $srcdir/glibc-2.21-roundup.patch
mkdir ${srcdir}/glibc-build
}
@@ -89,17 +90,18 @@
}
check() {
- # the linker commands need to be reordered - fixed in 2.19
- LDFLAGS=${LDFLAGS/--as-needed,/}
-
cd ${srcdir}/glibc-build
- # tst-cleanupx4 failure on i686 is "expected"
+ # some failures are "expected"
make check || true
}
package() {
cd ${srcdir}/glibc-build
+
+
+
+
make install_root=${pkgdir} install
rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
@@ -123,6 +125,9 @@
# in addition libcrypt appears widely required
rm $pkgdir/usr/lib32/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
+
+
+
# Do not strip the following files for improved debugging support
# ("improved" as in not breaking gdb and valgrind...):
# ld-${pkgver}.so
@@ -137,11 +142,16 @@
usr/lib32/getconf/*
+
+
strip $STRIP_STATIC usr/lib32/*.a
- strip $STRIP_SHARED usr/lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \
+ strip $STRIP_SHARED usr/lib32/lib{anl,BrokenLocale,cidn,crypt}-*.so \
usr/lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \
- usr/lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \
- usr/lib32/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib32/{audit,gconv}/*.so
+ usr/lib32/lib{dl,m,nsl,resolv,rt,util}-*.so \
+ usr/lib32/lib{memusage,pcprofile,SegFault}.so \
+ usr/lib32/{audit,gconv}/*.so || true
+
+
+
}
Deleted: glibc-2.21-roundup.patch
===================================================================
--- glibc-2.21-roundup.patch 2015-08-07 13:08:16 UTC (rev 138055)
+++ glibc-2.21-roundup.patch 2015-08-07 13:09:53 UTC (rev 138056)
@@ -1,97 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-index dc1ed1b..26feb07 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,15 @@
-+2015-04-21 Arjun Shankar <arjun.is at lostca.se>
-+
-+ [BZ #18287]
-+ * resolv/nss_dns/dns-host.c (getanswer_r): Adjust buffer length
-+ based on padding. (CVE-2015-1781)
-+
-+2015-02-10 Evangelos Foutras <evangelos at foutrelis.com>
-+
-+ [BZ #17949]
-+ * sysdeps/i386/i686/multiarch/mempcpy_chk.S: Fix position of
-+ jump label.
-+
- 2015-02-06 Carlos O'Donell <carlos at systemhalted.org>
-
- * version.h (RELEASE): Set to "stable".
-@@ -7,6 +19,7 @@
- * sysdeps/unix/sysv/linux/hppa/pthread.h: Sync with pthread.h.
-
- 2015-02-05 Paul Pluzhnikov <ppluzhnikov at google.com>
-+ Paul Eggert <eggert at cs.ucla.edu>
-
- [BZ #16618]
- * stdio-common/tst-sscanf.c (main): Test for buffer overflow.
-diff --git a/NEWS b/NEWS
-index 617cdbb..c9f6b58 100644
---- a/NEWS
-+++ b/NEWS
-@@ -5,6 +5,19 @@ 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, 18287.
-+
-+* A buffer overflow in gethostbyname_r and related functions performing DNS
-+ requests has been fixed. If the NSS functions were called with a
-+ misaligned buffer, the buffer length change due to pointer alignment was
-+ not taken into account. This could result in application crashes or,
-+ potentially arbitrary code execution, using crafted, but syntactically
-+ valid DNS responses. (CVE-2015-1781)
-+
- Version 2.21
-
- * The following bugs are resolved with this release:
-@@ -21,10 +34,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/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index f715ab0..40069a7 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
- 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/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 at GOTOFF(%ebx)
- jne 1f
- call __init_cpu_features
-- leal __mempcpy_chk_ia32 at GOTOFF(%ebx), %eax
--1: testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features at GOTOFF(%ebx)
-+1: leal __mempcpy_chk_ia32 at GOTOFF(%ebx), %eax
-+ testl $bit_SSE2, CPUID_OFFSET+index_SSE2+__cpu_features at GOTOFF(%ebx)
- jz 2f
- leal __mempcpy_chk_sse2_unaligned at GOTOFF(%ebx), %eax
- testl $bit_Fast_Unaligned_Load, FEATURE_OFFSET+index_Fast_Unaligned_Load+__cpu_features at GOTOFF(%ebx)
More information about the arch-commits
mailing list