Wed Feb 15 20:35:25 UTC 2012

5 files changed, 240 insertions, 6 deletions

diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
index 84b6714ed..6b8124e27 100644
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ b/multilib-testing/lib32-glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 63464 2012-02-04 11:00:52Z heftig $
+# $Id: PKGBUILD 64480 2012-02-14 08:41:39Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Allan McRae <allan@archlinux.org>
@@ -9,7 +9,7 @@
 _pkgbasename=glibc
 pkgname=lib32-$_pkgbasename
 pkgver=2.15
-pkgrel=5
+pkgrel=6
 _glibcdate=20111227
 pkgdesc="GNU C Library for multilib"
 arch=('x86_64')
@@ -33,8 +33,11 @@ source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcda
         glibc-2.15-scanf.patch
         glibc-2.15-ifunc.patch
         glibc-2.15-avx.patch
+        glibc-2.15-strcasecmp-disable-avx.patch
         glibc-2.15-gb18030.patch
         glibc-2.15-revert-netlink-cache.patch
+        glibc-2.15-arena.patch
+        glibc-2.15-negative-result-cache.patch
         lib32-glibc.conf)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '4dadb9203b69a3210d53514bb46f41c3'
@@ -51,8 +54,11 @@ md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
          '39353f53168f4a7509ba5fe0d9f218b8'
          '136eb969f5d6bb6f5155f72a1a7cf23e'
          '41ae047ac88e8f6f547c70b0a0bc3b72'
+         'fccb89f6628f59752278e125c35941f8'
          'c4cd34f20ccd37817f6c1374bd4ee68e'
          '6771b0b2bb8aa3870a259fd2f46c424f'
+         'a9ffadcfd2d357f91fee0b861fd4a7c6'
+         '2c46b8e294de24c531f2253ff69aeef3'
          '6e052f1cb693d5d3203f50f9d4e8c33b')
 
 build() {
@@ -64,8 +70,9 @@ build() {
   # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
   patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
 
-  # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
+  # Undefine __i686 for gcc <= 4.6
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
+  # fix in http://sourceware.org/git/?p=glibc.git;a=commit;h=d4a54ac6 requires additional backporting...
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
@@ -99,6 +106,8 @@ build() {
 
   # revert commit c5a0802a - causes various hangs
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
+  # Note: fedora may have actual fix (not submitted upstream yet...)
+  # http://pkgs.fedoraproject.org/gitweb/?p=glibc.git;a=blob_plain;f=glibc-rh552960-2.patch
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
   # fix realloc usage in vfscanf
@@ -113,6 +122,8 @@ build() {
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=afc5ed09
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=08cf777f
   patch -Np1 -i ${srcdir}/glibc-2.15-avx.patch
+  # and "fix" strcasecmp
+  patch -Np1 -i ${srcdir}/glibc-2.15-strcasecmp-disable-avx.patch
 
   # fix GB18030 charmap
   # http://sourceware.org/bugzilla/show_bug.cgi?id=11837
@@ -121,10 +132,18 @@ build() {
   patch -Np1 -i ${srcdir}/glibc-2.15-gb18030.patch
 
   # fix crash in __nscd_get_mapping if nscd not running
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13594 (potential "fix" in comment)
   # reverts commit 3a2c0242 and other necessary following changes...
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-netlink-cache.patch
 
+  # handle ARENA_TEST correctly
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=41b81892
+  patch -Np1 -i ${srcdir}/glibc-2.15-arena.patch
+
+  # Do not cache negative results in nscd if these are transient
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=3e1aa84e
+  patch -Np1 -i ${srcdir}/glibc-2.15-negative-result-cache.patch
+
 
   cd ${srcdir}
   mkdir glibc-build
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-arena.patch b/multilib-testing/lib32-glibc/glibc-2.15-arena.patch
new file mode 100644
index 000000000..46f52e98d
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-arena.patch
@@ -0,0 +1,29 @@
+diff --git a/malloc/arena.c b/malloc/arena.c
+index d3cf4b9..b1c9469 100644
+--- a/malloc/arena.c
++++ b/malloc/arena.c
+@@ -828,7 +828,7 @@ arena_get2(mstate a_tsd, size_t size)
+ 	{
+ 	  if (mp_.arena_max != 0)
+ 	    narenas_limit = mp_.arena_max;
+-	  else
++	  else if (narenas > mp_.arena_test)
+ 	    {
+ 	      int n  = __get_nprocs ();
+ 
+@@ -842,7 +842,14 @@ arena_get2(mstate a_tsd, size_t size)
+ 	}
+     repeat:;
+       size_t n = narenas;
+-      if (__builtin_expect (n <= mp_.arena_test || n < narenas_limit, 0))
++      /* NB: the following depends on the fact that (size_t)0 - 1 is a
++	 very large number and that the underflow is OK.  If arena_max
++	 is set the value of arena_test is irrelevant.  If arena_test
++	 is set but narenas is not yet larger or equal to arena_test
++	 narenas_limit is 0.  There is no possibility for narenas to
++	 be too big for the test to always fail since there is not
++	 enough address space to create that many arenas.  */
++      if (__builtin_expect (n <= narenas_limit - 1, 0))
+ 	{
+ 	  if (catomic_compare_and_exchange_bool_acq (&narenas, n + 1, n))
+ 	    goto repeat;
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch b/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch
new file mode 100644
index 000000000..c09e79a17
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-negative-result-cache.patch
@@ -0,0 +1,138 @@
+diff --git a/nscd/aicache.c b/nscd/aicache.c
+index aaaf80d..e1f1244 100644
+--- a/nscd/aicache.c
++++ b/nscd/aicache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2008, 2009, 2010, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2004-2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -514,8 +514,9 @@ next_nip:
+       if (fd != -1)
+ 	TEMP_FAILURE_RETRY (send (fd, &notfound, total, MSG_NOSIGNAL));
+ 
+-      /* If we cannot permanently store the result, so be it.  */
+-      if (__builtin_expect (db->negtimeout == 0, 0))
++      /* If we have a transient error or cannot permanently store the
++	 result, so be it.  */
++      if (rc4 == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	{
+ 	  /* Mark the old entry as obsolete.  */
+ 	  if (dh != NULL)
+diff --git a/nscd/grpcache.c b/nscd/grpcache.c
+index e9607c6..a698f36 100644
+--- a/nscd/grpcache.c
++++ b/nscd/grpcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for group lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -120,8 +120,9 @@ cache_addgr (struct database_dyn *db, int fd, request_header *req,
+ 	  else
+ 	    written = total;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (db->negtimeout == 0)
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/hstcache.c b/nscd/hstcache.c
+index 4d68ade..c72feaa 100644
+--- a/nscd/hstcache.c
++++ b/nscd/hstcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -141,8 +141,9 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
+ 					MSG_NOSIGNAL)) != total)
+ 	    all_written = false;
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/initgrcache.c b/nscd/initgrcache.c
+index 4ac9942..2019991 100644
+--- a/nscd/initgrcache.c
++++ b/nscd/initgrcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for host lookup.
+-   Copyright (C) 2004-2006, 2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2004-2006, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@redhat.com>, 2004.
+ 
+@@ -202,8 +202,9 @@ addinitgroupsX (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (all_tryagain || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/pwdcache.c b/nscd/pwdcache.c
+index 49e130c..e2ba09d 100644
+--- a/nscd/pwdcache.c
++++ b/nscd/pwdcache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for passwd lookup.
+-   Copyright (C) 1998-2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 1998-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
+ 
+@@ -124,8 +124,9 @@ cache_addpw (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errno == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
+diff --git a/nscd/servicescache.c b/nscd/servicescache.c
+index d3d5dce..a6337e3 100644
+--- a/nscd/servicescache.c
++++ b/nscd/servicescache.c
+@@ -1,5 +1,5 @@
+ /* Cache handling for services lookup.
+-   Copyright (C) 2007, 2008, 2009, 2011 Free Software Foundation, Inc.
++   Copyright (C) 2007, 2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+    Contributed by Ulrich Drepper <drepper@drepper.com>, 2007.
+ 
+@@ -108,8 +108,9 @@ cache_addserv (struct database_dyn *db, int fd, request_header *req,
+ 	    written = TEMP_FAILURE_RETRY (send (fd, &notfound, total,
+ 						MSG_NOSIGNAL));
+ 
+-	  /* If we cannot permanently store the result, so be it.  */
+-	  if (__builtin_expect (db->negtimeout == 0, 0))
++	  /* If we have a transient error or cannot permanently store
++	     the result, so be it.  */
++	  if (errval == EAGAIN || __builtin_expect (db->negtimeout == 0, 0))
+ 	    {
+ 	      /* Mark the old entry as obsolete.  */
+ 	      if (dh != NULL)
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch b/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
new file mode 100644
index 000000000..4c104fa55
--- /dev/null
+++ b/multilib-testing/lib32-glibc/glibc-2.15-strcasecmp-disable-avx.patch
@@ -0,0 +1,48 @@
+diff --git a/sysdeps/x86_64/multiarch/strcmp.S b/sysdeps/x86_64/multiarch/strcmp.S
+index f93c83d..d8aa889 100644
+--- a/sysdeps/x86_64/multiarch/strcmp.S
++++ b/sysdeps/x86_64/multiarch/strcmp.S
+@@ -105,11 +105,6 @@ ENTRY(__strcasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strcasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strcasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -128,11 +123,6 @@ ENTRY(__strncasecmp)
+	jne	1f
+	call	__init_cpu_features
+ 1:
+-#  ifdef HAVE_AVX_SUPPORT
+-	leaq	__strncasecmp_avx(%rip), %rax
+-	testl	$bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+-	jnz	2f
+-#  endif
+	leaq	__strncasecmp_sse42(%rip), %rax
+	testl	$bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
+	jnz	2f
+@@ -152,19 +142,6 @@ weak_alias (__strncasecmp, strncasecmp)
+ # include "strcmp-sse42.S"
+
+
+-# ifdef HAVE_AVX_SUPPORT
+-#  if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
+-#   define LABEL(l) .L##l##_avx
+-#   define GLABEL(l) l##_avx
+-#   define USE_AVX 1
+-#   undef STRCMP_SSE42
+-#   define STRCMP_SSE42 STRCMP_AVX
+-#   define SECTION avx
+-#   include "strcmp-sse42.S"
+-#  endif
+-# endif
+-
+-
+ # undef ENTRY
+ # define ENTRY(name) \
+	.type STRCMP_SSE2, @function; \
diff --git a/multilib-testing/lib32-libxcb/PKGBUILD b/multilib-testing/lib32-libxcb/PKGBUILD
index 141b91b96..b51422646 100644
--- a/multilib-testing/lib32-libxcb/PKGBUILD
+++ b/multilib-testing/lib32-libxcb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64458 2012-02-14 00:06:32Z bluewind $
+# $Id: PKGBUILD 64491 2012-02-14 11:43:17Z bluewind $
 # Maintainer: Alexander Baldeck <alexander@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 _pkgbasename=libxcb
 pkgname=lib32-$_pkgbasename
 pkgver=1.8
-pkgrel=1
+pkgrel=2
 pkgdesc="X11 client-side library (32-bit)"
 arch=(x86_64)
 url="http://xcb.freedesktop.org/"