[arch-commits] Commit in glibc/trunk (4 files)

2018-08-10 Thread Bartłomiej Piotrowski via arch-commits 
Date: Friday, August 10, 2018 @ 16:41:47
  Author: bpiotrowski
Revision: 331347

2.28-2: backport fix for BZ#23497 and revert commit breaking proprietary 
electron apps

The problem is in fact in lld[1] used to build Electron but it's too serious
regression to fool around.

[1] https://github.com/electron/electron/issues/13972#issuecomment-411532741

Added:
  glibc/trunk/0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
  glibc/trunk/bz23497.patch
Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/bz20338.patch

-+
 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch |  195 +++
 PKGBUILD|   10 
 bz20338.patch   |  114 
 bz23497.patch   |  262 
++
 4 files changed, 463 insertions(+), 118 deletions(-)

Added: 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch
===
--- 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch 
(rev 0)
+++ 0001-Revert-elf-Correct-absolute-SHN_ABS-symbol-run-time-.patch 
2018-08-10 16:41:47 UTC (rev 331347)
@@ -0,0 +1,195 @@
+From 2cbf10ae2ea9e378ff91b8f5c4d8cb77ed05378e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= 
+Date: Fri, 10 Aug 2018 14:12:40 +
+Subject: [PATCH] Revert "elf: Correct absolute (SHN_ABS) symbol run-time
+ calculation [BZ #19818]"
+
+This reverts commit e7feec374c635b6a29d65c39ae5e1855528fed39.
+---
+ elf/Makefile | 14 ++---
+ elf/dl-addr.c|  2 --
+ elf/tst-absolute-sym-lib.c   | 25 
+ elf/tst-absolute-sym-lib.lds | 19 --
+ elf/tst-absolute-sym.c   | 38 
+ sysdeps/generic/ldsodefs.h   |  3 +--
+ 6 files changed, 3 insertions(+), 98 deletions(-)
+ delete mode 100644 elf/tst-absolute-sym-lib.c
+ delete mode 100644 elf/tst-absolute-sym-lib.lds
+ delete mode 100644 elf/tst-absolute-sym.c
+
+diff --git a/elf/Makefile b/elf/Makefile
+index cd0771307f..5084ba4f6f 100644
+--- a/elf/Makefile
 b/elf/Makefile
+@@ -186,7 +186,7 @@ tests += restest1 preloadtest loadfail multiload origtest 
resolvfail \
+tst-tlsalign tst-tlsalign-extern tst-nodelete-opened \
+tst-nodelete2 tst-audit11 tst-audit12 tst-dlsym-error tst-noload \
+tst-latepthread tst-tls-manydynamic tst-nodelete-dlclose \
+-   tst-debug1 tst-main1 tst-absolute-sym tst-absolute-zero tst-big-note
++   tst-debug1 tst-main1
+ #  reldep9
+ tests-internal += loadtest unload unload2 circleload1 \
+neededtest neededtest2 neededtest3 neededtest4 \
+@@ -272,9 +272,7 @@ modules-names = testobj1 testobj2 testobj3 testobj4 
testobj5 testobj6 \
+   tst-audit12mod1 tst-audit12mod2 tst-audit12mod3 tst-auditmod12 \
+   tst-latepthreadmod $(tst-tls-many-dynamic-modules) \
+   tst-nodelete-dlclose-dso tst-nodelete-dlclose-plugin \
+-  tst-main1mod tst-libc_dlvsym-dso tst-absolute-sym-lib \
+-  tst-absolute-zero-lib tst-big-note-lib
+-
++  tst-main1mod tst-libc_dlvsym-dso
+ ifeq (yes,$(have-mtls-dialect-gnu2))
+ tests += tst-gnu2-tls1
+ modules-names += tst-gnu2-tls1mod
+@@ -1465,14 +1463,6 @@ tst-main1-no-pie = yes
+ LDLIBS-tst-main1 = $(libsupport)
+ tst-main1mod.so-no-z-defs = yes
+ 
+-LDLIBS-tst-absolute-sym-lib.so = tst-absolute-sym-lib.lds
+-$(objpfx)tst-absolute-sym-lib.so: $(LDLIBS-tst-absolute-sym-lib.so)
+-$(objpfx)tst-absolute-sym: $(objpfx)tst-absolute-sym-lib.so
+-
+-LDLIBS-tst-absolute-zero-lib.so = tst-absolute-zero-lib.lds
+-$(objpfx)tst-absolute-zero-lib.so: $(LDLIBS-tst-absolute-zero-lib.so)
+-$(objpfx)tst-absolute-zero: $(objpfx)tst-absolute-zero-lib.so
+-
+ # Both the main program and the DSO for tst-libc_dlvsym need to link
+ # against libdl.
+ $(objpfx)tst-libc_dlvsym: $(libdl)
+diff --git a/elf/dl-addr.c b/elf/dl-addr.c
+index e6c7d02094..2250617a73 100644
+--- a/elf/dl-addr.c
 b/elf/dl-addr.c
+@@ -59,7 +59,6 @@ determine_info (const ElfW(Addr) addr, struct link_map 
*match, Dl_info *info,
+we can omit that test here.  */
+ if ((symtab[symndx].st_shndx != SHN_UNDEF
+  || symtab[symndx].st_value != 0)
+-&& symtab[symndx].st_shndx != SHN_ABS
+ && ELFW(ST_TYPE) (symtab[symndx].st_info) != STT_TLS
+ && DL_ADDR_SYM_MATCH (match, [symndx],
+   matchsym, addr)
+@@ -92,7 +91,6 @@ determine_info (const ElfW(Addr) addr, struct link_map 
*match, Dl_info *info,
+   && ELFW(ST_TYPE) (symtab->st_info) != STT_TLS
+   && (symtab->st_shndx != SHN_UNDEF
+   || symtab->st_value != 0)
+-  &&

[arch-commits] Commit in glibc/trunk (4 files)

2017-11-26 Thread Bartłomiej Piotrowski via arch-commits 
Date: Sunday, November 26, 2017 @ 22:01:04
  Author: bpiotrowski
Revision: 310969

2.26-7: add lib32 split package

Added:
  glibc/trunk/lib32-glibc.conf
Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch
  glibc/trunk/0002-x86-Add-x86_64-to-x86-64-HWCAP-BZ-22093.patch

-+
 0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch |  110 
 0002-x86-Add-x86_64-to-x86-64-HWCAP-BZ-22093.patch  |  223 
--
 PKGBUILD|  154 --
 lib32-glibc.conf|1 
 4 files changed, 103 insertions(+), 385 deletions(-)

Deleted: 0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch
===
--- 0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch 
2017-11-26 21:49:47 UTC (rev 310968)
+++ 0001-Don-t-use-IFUNC-resolver-for-longjmp-or-system-in-li.patch 
2017-11-26 22:01:04 UTC (rev 310969)
@@ -1,110 +0,0 @@
-From fc5ad7024c620cdfe9b76e94638aac83b99c5bf8 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab 
-Date: Tue, 8 Aug 2017 16:21:58 +0200
-Subject: [PATCH] Don't use IFUNC resolver for longjmp or system in libpthread
- (bug 21041)
-
-Unlike the vfork forwarder and like the fork forwarder as in bug 19861,
-there won't be a problem when the compiler does not turn this into a tail
-call.

- nptl/pt-longjmp.c | 31 ++-
- nptl/pt-system.c  | 24 
- 3 files changed, 18 insertions(+), 37 deletions(-)
-
-diff --git a/nptl/pt-longjmp.c b/nptl/pt-longjmp.c
-index 2ef757e687f..8f3c6b3a09f 100644
 a/nptl/pt-longjmp.c
-+++ b/nptl/pt-longjmp.c
-@@ -25,21 +25,14 @@
-symbol in libpthread, but the historical ABI requires it.  For static
-linking, there is no need to provide anything here--the libc version
-will be linked in.  For shared library ABI compatibility, there must be
--   longjmp and siglongjmp symbols in libpthread.so; so we define them using
--   IFUNC to redirect to the libc function.  */
-+   longjmp and siglongjmp symbols in libpthread.so.
- 
--#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
--
--# if HAVE_IFUNC
--
--#  undef INIT_ARCH
--#  define INIT_ARCH()
--#  define DEFINE_LONGJMP(name) libc_ifunc (name, &__libc_longjmp)
--
--extern __typeof(longjmp) longjmp_ifunc;
--extern __typeof(siglongjmp) siglongjmp_ifunc;
-+   With an IFUNC resolver, it would be possible to avoid the indirection,
-+   but the IFUNC resolver might run before the __libc_longjmp symbol has
-+   been relocated, in which case the IFUNC resolver would not be able to
-+   provide the correct address.  */
- 
--# else  /* !HAVE_IFUNC */
-+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
- 
- static void __attribute__ ((noreturn, used))
- longjmp_compat (jmp_buf env, int val)
-@@ -47,14 +40,10 @@ longjmp_compat (jmp_buf env, int val)
-   __libc_longjmp (env, val);
- }
- 
--# define DEFINE_LONGJMP(name) strong_alias (longjmp_compat, name)
--
--# endif  /* HAVE_IFUNC */
--
--DEFINE_LONGJMP (longjmp_ifunc)
--compat_symbol (libpthread, longjmp_ifunc, longjmp, GLIBC_2_0);
-+strong_alias (longjmp_compat, longjmp_alias)
-+compat_symbol (libpthread, longjmp_alias, longjmp, GLIBC_2_0);
- 
--strong_alias (longjmp_ifunc, siglongjmp_ifunc)
--compat_symbol (libpthread, siglongjmp_ifunc, siglongjmp, GLIBC_2_0);
-+strong_alias (longjmp_alias, siglongjmp_alias)
-+compat_symbol (libpthread, siglongjmp_alias, siglongjmp, GLIBC_2_0);
- 
- #endif
-diff --git a/nptl/pt-system.c b/nptl/pt-system.c
-index f8ca6ba0d94..b30ddf2b398 100644
 a/nptl/pt-system.c
-+++ b/nptl/pt-system.c
-@@ -25,29 +25,21 @@
-libpthread, but the historical ABI requires it.  For static linking,
-there is no need to provide anything here--the libc version will be
-linked in.  For shared library ABI compatibility, there must be a
--   'system' symbol in libpthread.so; so we define it using IFUNC to
--   redirect to the libc function.  */
-+   'system' symbol in libpthread.so.
- 
--#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
--
--# if HAVE_IFUNC
--
--extern __typeof(system) system_ifunc;
--#  undef INIT_ARCH
--#  define INIT_ARCH()
--libc_ifunc (system_ifunc, &__libc_system)
-+   With an IFUNC resolver, it would be possible to avoid the indirection,
-+   but the IFUNC resolver might run before the __libc_system symbol has
-+   been relocated, in which case the IFUNC resolver would not be able to
-+   provide the correct address.  */
- 
--# else  /* !HAVE_IFUNC */
-+#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
- 
- static int __attribute__ ((used))
- system_compat (const char *line)
- {
-   return __libc_system (line);
- }
--strong_alias (system_compat, system_ifunc)
--
--# endif  /* HAVE_IFUNC */
--
--compat_symbol (libpthread,

[arch-commits] Commit in glibc/trunk (4 files)

2016-02-16 Thread Allan McRae 
Date: Wednesday, February 17, 2016 @ 01:55:30
  Author: allan
Revision: 259872

fix CVE-2015-7547 CVE-2015-8776 CVE-2015-8777 CVE-2015-8778 CVE-2015-8779

Added:
  glibc/trunk/glibc-2.22-CVE-2015-7547.patch
Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-2.22-roundup.patch
  glibc/trunk/glibc.install

+
 PKGBUILD   |   11 
 glibc-2.22-CVE-2015-7547.patch |  572 
 glibc-2.22-roundup.patch   | 1822 ++-
 glibc.install  |8 
 4 files changed, 2396 insertions(+), 17 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 259871:259872 to see the changes.

[arch-commits] Commit in glibc/trunk (4 files)

2015-02-10 Thread Allan McRae 
Date: Tuesday, February 10, 2015 @ 13:22:30
  Author: allan
Revision: 231213

upgpkg: glibc 2.21-2

upstream patchbump

Added:
  glibc/trunk/glibc-2.21-roundup.patch
Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc.install
Deleted:
  glibc/trunk/glibc-2.20-roundup.patch

--+
 PKGBUILD |8 
 glibc-2.20-roundup.patch |  890 -
 glibc-2.21-roundup.patch |   70 +++
 glibc.install|2 
 4 files changed, 76 insertions(+), 894 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-02-10 05:30:54 UTC (rev 231212)
+++ PKGBUILD2015-02-10 12:22:30 UTC (rev 231213)
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.21
-pkgrel=1
+pkgrel=2
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -22,10 +22,12 @@
 options=('!strip' 'staticlibs')
 install=glibc.install
 source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
+glibc-2.21-roundup.patch
 locale.gen.txt
 locale-gen)
 md5sums=('9cb398828e8f84f57d1f7d5588cf40cd'
  'SKIP'
+ 'bf9d96b11c76b113606aae102da63d9d'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
 validpgpkeys=('F37CDAB708E65EA183FD1AF625EF0A436C2A4AFF')  # Carlos O'Donell
@@ -33,8 +35,8 @@
 prepare() {
   cd ${srcdir}/glibc-${pkgver}
 
-  # glibc-2.21..
-  #patch -p1 -i $srcdir/glibc-2.21-roundup.patch
+  # glibc-2.21..75adf430
+  patch -p1 -i $srcdir/glibc-2.21-roundup.patch
 
   mkdir ${srcdir}/glibc-build
 }

Deleted: glibc-2.20-roundup.patch
===
--- glibc-2.20-roundup.patch2015-02-10 05:30:54 UTC (rev 231212)
+++ glibc-2.20-roundup.patch2015-02-10 12:22:30 UTC (rev 231213)
@@ -1,890 +0,0 @@
-diff --git a/ChangeLog b/ChangeLog
-index f343428..e416cd0 100644
 a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,109 @@
-+2014-12-16  Florian Weimer  fwei...@redhat.com
-+
-+  [BZ #17630]
-+  * resolv/nss_dns/dns-network.c (getanswer_r): Iterate over alias
-+  names.
-+
-+2014-12-15  Jeff Law  l...@redhat.com
-+
-+  [BZ #16617]
-+  * stdio-common/vfprintf.c (vfprintf): Allocate large specs array
-+  on the heap.  (CVE-2012-3406)
-+  * stdio-common/bug23-2.c, stdio-common/bug23-3.c: New file.
-+  * stdio-common/bug23-4.c: New file.  Test case by Joseph Myers.
-+  * stdio-common/Makefile (tests): Add bug23-2, bug23-3, bug23-4.
-+
-+2014-11-24  Siddhesh Poyarekar  siddh...@redhat.com
-+
-+  [BZ #17266]
-+  * misc/sys/cdefs.h: Define __extern_always_inline for clang
-+  4.2 and newer.
-+
-+2014-11-19  Carlos O'Donell  car...@redhat.com
-+  Florian Weimer  fwei...@redhat.com
-+  Joseph Myers  jos...@codesourcery.com
-+  Adam Conrad  adcon...@0c3.net
-+  Andreas Schwab  sch...@suse.de
-+  Brooks  bmo...@google.com
-+
-+  [BZ #17625]
-+  * wordexp-test.c (__dso_handle): Add prototype.
-+  (__register_atfork): Likewise.
-+  (__app_register_atfork): New function.
-+  (registered_forks): New global.
-+  (register_fork): New function.
-+  (test_case): Add 3 new tests for WRDE_CMDSUB.
-+  (main): Call __app_register_atfork.
-+  (testit): If WRDE_NOCMD set registered_forks to zero, run test, and if
-+  fork count is non-zero fail the test.
-+  * posix/wordexp.c (exec_comm): Return WRDE_CMDSUB if WRDE_NOCMD flag
-+  is set.
-+  (parse_dollars): Remove check for WRDE_NOCMD.
-+  (parse_dquote): Likewise.
-+
-+2014-11-10  Renlin Li  renlin...@arm.com
-+
-+  [BZ #17555]
-+  * sysdeps/aarch64/start.S (_start): Delete x29 overwritten assignment.
-+
-+2014-10-22  Maciej W. Rozycki  ma...@codesourcery.com
-+
-+  [BZ #17485]
-+  * sysdeps/unix/sysv/linux/mips/vfork.S (__libc_vfork): Define.
-+
-+2014-10-08  Roland McGrath  rol...@hack.frob.com
-+
-+  [BZ #17460]
-+  * nscd/nscd.c (more_help): Rewrite list of tables collection
-+  using xstrdup and asprintf.
-+
-+  * nscd/nscd_conf.c: Remove local xstrdup declaration.
-+
-+2014-10-09  Allan McRae  al...@archlinux.org
-+
-+  * po/fr.po: Update French translation from translation project.
-+
-+2014-09-16  Siddhesh Poyarekar  siddh...@redhat.com
-+
-+  [BZ #17370]
-+  * libio/wfileops.c (do_ftell_wide): Free OUT on error path.
-+
-+2014-09-11  Tim Lammens  tim.lamm...@gmail.com
-+
-+  [BZ #17370]
-+  * libio/wfileops (do_ftell_wide): Free OUT.
-+
-+2014-09-16  Siddhesh Poyarekar  siddh...@redhat.com
-+  Jakub Jelinek  ja...@redhat.com
-+
-+  [BZ #17266]
-+  * libio/stdio.h: Check definition of __fortify_function
-+  instead of __extern_always_inline to include bits/stdio2.h.
-+  * math/bits/math-finite.h [__USE_XOPEN || __USE_ISOC99]: Also
-+  check if __extern_always_inline is defined.
-+

[arch-commits] Commit in glibc/trunk (4 files)

2012-06-08 Thread Allan McRae 
Date: Friday, June 8, 2012 @ 08:36:53
  Author: allan
Revision: 161270

upgpkg: glibc 2.15-11

rebuild to fix mq_getattr issue (FS#30189), remove unneeded patch, compress 
large patch, add patch to fix test-suite failures with --as-needed, thidy 
configure options

Added:
  glibc/trunk/glibc-2.15-gb18030.patch.gz
  glibc/trunk/glibc-2.15-testsuite.patch
Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/glibc-2.15-gb18030.patch

-+
 PKGBUILD|   31 
 glibc-2.15-gb18030.patch|49081 --
 glibc-2.15-gb18030.patch.gz |1 
 glibc-2.15-testsuite.patch  |  110 
 4 files changed, 124 insertions(+), 49099 deletions(-)

The diff is longer than the limit of 200KB.
Use svn diff -r 161269:161270 to see the changes.

[arch-commits] Commit in glibc/trunk (4 files)

2012-03-28 Thread Allan McRae 
Date: Thursday, March 29, 2012 @ 01:42:38
  Author: allan
Revision: 154484

upgpkg: glibc 2.15-10

switch a couple of patches to those applied upstream

Added:
  glibc/trunk/glibc-2.15-confstr-local-buffer-extent.patch
Modified:
  glibc/trunk/PKGBUILD
  glibc/trunk/glibc-__i686.patch
Deleted:
  glibc/trunk/glibc-2.15-confstr-strdup.patch

--+
 PKGBUILD |   18 -
 glibc-2.15-confstr-local-buffer-extent.patch |  297 +
 glibc-2.15-confstr-strdup.patch  |   31 --
 glibc-__i686.patch   |   44 ++-
 4 files changed, 338 insertions(+), 52 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-03-29 03:43:53 UTC (rev 154483)
+++ PKGBUILD2012-03-29 05:42:38 UTC (rev 154484)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=9
+pkgrel=10
 _glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -49,14 +49,14 @@
 glibc-2.15-non-signalling-comparisons.patch
 glibc-2.15-rintf-rounding.patch
 glibc-2.15-nearbyintf-rounding.patch
-glibc-2.15-confstr-strdup.patch
+glibc-2.15-confstr-local-buffer-extent.patch
 nscd
 locale.gen.txt
 locale-gen)
 md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
  '7ef69c530a15106de93e4de2df2d393e'
  'b6c619e5cf91829a15ce34dccef676d5'
- '40cd342e21f71f5e49e32622b25acc52'
+ 'addfddd648a4bf832eb126aba944ebae'
  'e60e33591c9ec1447e4cddadcbb9cf3a'
  '6970bcfeb3bf88913436d5112d16f588'
  'c5de2a946215d647c8af5432ec4b0da0'
@@ -82,7 +82,7 @@
  'c483504cf404ed0b44480af627813a97'
  '1419d61fd1dbc6cdc48bb59da86fa66f'
  '7ff501435078b1a2622124fbeaafc921'
- '41f94da2f8db856b091a2d670d68eee3'
+ '8d1023a51e0932681b46440d5f8551ee'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -108,8 +108,7 @@
   patch -p1 -i ${srcdir}/glibc-2.15-do-not-install-timezone-files-2.patch
 
   # undefine __i686
-  # 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...
+  # http://sourceware.org/glibc/wiki/Release/2.15#Build_Failures
   patch -p1 -i ${srcdir}/glibc-__i686.patch
 
   # http://www.exploit-db.com/exploits/15274/
@@ -214,8 +213,10 @@
   # http://sourceware.org/git/?p=glibc.git;a=commit;h=6cbeae47
   patch -p1 -i ${srcdir}/glibc-2.15-nearbyintf-rounding.patch
 
-  # fix varaible scope issue exposed with gcc-4.7 and -O2
-  patch -p1 -i ${srcdir}/glibc-2.15-confstr-strdup.patch
+  # fix varaible scope issue in confstr
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=ac4c54f0
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=d6a403f9
+  patch -p1 -i ${srcdir}/glibc-2.15-confstr-local-buffer-extent.patch
 
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
@@ -226,6 +227,7 @@
 
   if [[ ${CARCH} = i686 ]]; then
 # Hack to fix NPTL issues with Xen, only required on 32bit platforms
+# TODO: make separate glibc-xen package for i686
 export CFLAGS=${CFLAGS} -mno-tls-direct-seg-refs
   fi
 

Added: glibc-2.15-confstr-local-buffer-extent.patch
===
--- glibc-2.15-confstr-local-buffer-extent.patch
(rev 0)
+++ glibc-2.15-confstr-local-buffer-extent.patch2012-03-29 05:42:38 UTC 
(rev 154484)
@@ -0,0 +1,297 @@
+diff --git a/posix/confstr.c b/posix/confstr.c
+index 3c9566d..cad6561 100644
+--- a/posix/confstr.c
 b/posix/confstr.c
+@@ -35,6 +34,10 @@ confstr (name, buf, len)
+   const char *string = ;
+   size_t string_len = 1;
+ 
++  /* Note that this buffer must be large enough for the longest strings
++ used below.  */
++  char restenvs[4 * sizeof POSIX_V7_LPBIG_OFFBIG];
++
+   switch (name)
+ {
+ case _CS_PATH:
+@@ -53,59 +56,55 @@ confstr (name, buf, len)
+wint_t types are no greater than the width of type long.
+ 
+Currently this means all environment which the system allows.  */
+-  {
+-  char restenvs[4 * sizeof POSIX_V7_LPBIG_OFFBIG];
+-
+-  string_len = 0;
++  string_len = 0;
+ #ifndef _POSIX_V7_ILP32_OFF32
+-  if (__sysconf (_SC_V7_ILP32_OFF32)  0)
++  if (__sysconf (_SC_V7_ILP32_OFF32)  0)
+ #endif
+ #if !defined _POSIX_V7_ILP32_OFF32 || _POSIX_V7_ILP32_OFF32  0
+-{
+-  memcpy (restenvs + string_len, POSIX_V7_ILP32_OFF32,
+-  sizeof POSIX_V7_ILP32_OFF32 - 1);
+-  string_len += sizeof POSIX_V7_ILP32_OFF32 - 1;
+-}
++  {
++memcpy (restenvs + string_len, POSIX_V7_ILP32_OFF32,
++sizeof POSIX_V7_ILP32_OFF32 - 1);
++string_len += sizeof POSIX_V7_ILP32_OFF32 - 1;
++  }
+

[arch-commits] Commit in glibc/trunk (4 files)

2012-02-13 Thread Allan McRae 
Date: Tuesday, February 14, 2012 @ 01:41:58
  Author: allan
Revision: 150167

upgpkg: glibc 2.15-6

disable AVX strcasecmp due to Xen issue, add ARENA_TEST fix, add fix for nscd 
caching transient negative results

Added:
  glibc/trunk/glibc-2.15-arena.patch
  glibc/trunk/glibc-2.15-negative-result-cache.patch
  glibc/trunk/glibc-2.15-strcasecmp-disable-avx.patch
Modified:
  glibc/trunk/PKGBUILD

-+
 PKGBUILD|   25 -
 glibc-2.15-arena.patch  |   29 ++
 glibc-2.15-negative-result-cache.patch  |  138 ++
 glibc-2.15-strcasecmp-disable-avx.patch |   48 ++
 4 files changed, 237 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-02-14 01:55:53 UTC (rev 150166)
+++ PKGBUILD2012-02-14 06:41:58 UTC (rev 150167)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=5
+pkgrel=6
 _glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -35,8 +35,11 @@
 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
 nscd
 locale.gen.txt
 locale-gen)
@@ -55,8 +58,11 @@
  '39353f53168f4a7509ba5fe0d9f218b8'
  '136eb969f5d6bb6f5155f72a1a7cf23e'
  '41ae047ac88e8f6f547c70b0a0bc3b72'
+ 'fccb89f6628f59752278e125c35941f8'
  'c4cd34f20ccd37817f6c1374bd4ee68e'
  '6771b0b2bb8aa3870a259fd2f46c424f'
+ 'a9ffadcfd2d357f91fee0b861fd4a7c6'
+ '2c46b8e294de24c531f2253ff69aeef3'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -80,8 +86,9 @@
   # 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/
@@ -115,6 +122,8 @@
 
   # 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
@@ -129,6 +138,8 @@
   # 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
@@ -137,10 +148,18 @@
   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
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 

Added: glibc-2.15-arena.patch
===
--- glibc-2.15-arena.patch  (rev 0)
+++ glibc-2.15-arena.patch  2012-02-14 06:41:58 UTC (rev 150167)
@@ -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

[arch-commits] Commit in glibc/trunk (4 files)

2012-01-25 Thread Allan McRae 
Date: Wednesday, January 25, 2012 @ 19:13:54
  Author: allan
Revision: 147651

upgpkg: glibc 2.15-4

fix Xen AVX issue, more extreme fix for multi-arch math issues, add regex fix

Added:
  glibc/trunk/glibc-2.15-regex.patch
  glibc/trunk/glibc-2.15-strcmp-disable-avx.patch
Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/glibc-2.15-math64crash.patch

-+
 PKGBUILD|   24 +++-
 glibc-2.15-math64crash.patch|  184 --
 glibc-2.15-regex.patch  |   16 ++
 glibc-2.15-strcmp-disable-avx.patch |   48 
 4 files changed, 81 insertions(+), 191 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-01-26 00:01:59 UTC (rev 147650)
+++ PKGBUILD2012-01-26 00:13:54 UTC (rev 147651)
@@ -6,7 +6,7 @@
 
 pkgname=glibc
 pkgver=2.15
-pkgrel=3
+pkgrel=4
 _glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
@@ -29,9 +29,10 @@
 glibc-2.14-revert-4768ae77.patch
 glibc-2.14-reexport-rpc-interface.patch
 glibc-2.14-reinstall-nis-rpc-headers.patch
+glibc-2.15-regex.patch
 glibc-2.15-lddebug-scopes.patch
 glibc-2.15-revert-c5a0802a.patch
-glibc-2.15-math64crash.patch
+glibc-2.15-strcmp-disable-avx.patch
 nscd
 locale.gen.txt
 locale-gen)
@@ -44,9 +45,10 @@
  '7da8c554a3b591c7401d7023b1928afc'
  'c5de2a946215d647c8af5432ec4b0da0'
  '55febbb72139ac7b65757df085024b83'
+ 'b3526cbd5e29773560dba725db99af5a'
  '3c219ddfb619b6df903cac4cc42c611d'
  '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
+ '7a44dd821835e4984aa75ad44fad3baf'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -94,6 +96,10 @@
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only 
fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
 
+  # Fix up regcomp/regexec
+  # http://sourceware.org/git/?p=glibc.git;a=commit;h=2ba92745
+  patch -Np1 -i ${srcdir}/glibc-2.15-regex.patch
+
   # propriety nvidia crash - 
https://bugzilla.redhat.com/show_bug.cgi?id=737223 
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64  (only 
fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
@@ -102,10 +108,14 @@
   # https://bugzilla.redhat.com/show_bug.cgi?id=769421
   patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
 
-  # revert optimized math routines that can cause crashes (FS#27736, FS#27743)
-  # obviously not a real fix...
-  patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
+  # Disable AVX in strcmp as this breaks Xen
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13583
+  patch -Np1 -i ${srcdir}/glibc-2.15-strcmp-disable-avx.patch
 
+  # revert optimized math routines that can cause crashes (FS#27736, 
FS#27743)
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=13618
+  rm sysdeps/x86_64/fpu/multiarch/*
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -132,7 +142,7 @@
   --with-tls --with-__thread \
   --enable-bind-now --without-gd \
   --without-cvs --disable-profile \
-  --enable-multi-arch
+  --enable-multi-arch  
 
   # build libraries with hardening disabled
   echo build-programs=no  configparms

Deleted: glibc-2.15-math64crash.patch
===
--- glibc-2.15-math64crash.patch2012-01-26 00:01:59 UTC (rev 147650)
+++ glibc-2.15-math64crash.patch2012-01-26 00:13:54 UTC (rev 147651)
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile 
b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
 a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
-   s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
- 
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c 
b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..000
 a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S 
b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..000
 a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
--   This file is part of the GNU C Library.
--   Contributed by Ulrich Drepper drep...@gmail.come, 2011.
--
--   The GNU C Library is free

[arch-commits] Commit in glibc/trunk (4 files)

2011-12-27 Thread Allan McRae 
Date: Tuesday, December 27, 2011 @ 05:18:41
  Author: allan
Revision: 145683

upgpkg: glibc 2.15-1

glibc-2.15 toolchain build, upstream update, remove unneed patches

Modified:
  glibc/trunk/PKGBUILD
Deleted:
  glibc/trunk/glibc-2.12.1-static-shared-getpagesize.patch
  glibc/trunk/glibc-2.13-futex.patch
  glibc/trunk/glibc-2.14.1-tzfile-overflow.patch

--+
 PKGBUILD |   38 +++--
 glibc-2.12.1-static-shared-getpagesize.patch |   11 ---
 glibc-2.13-futex.patch   |   31 --
 glibc-2.14.1-tzfile-overflow.patch   |   72 -
 4 files changed, 11 insertions(+), 141 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-12-27 10:17:45 UTC (rev 145682)
+++ PKGBUILD2011-12-27 10:18:41 UTC (rev 145683)
@@ -5,15 +5,15 @@
 # NOTE: valgrind requires rebuilt with each major glibc version
 
 pkgname=glibc
-pkgver=2.14.1
-pkgrel=4
-_glibcdate=20111025
+pkgver=2.15
+pkgrel=1
+_glibcdate=20111227
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
 license=('GPL' 'LGPL')
 groups=('base')
-depends=('linux-api-headers=3.1' 'tzdata')
+depends=('linux-api-headers=3.1.6' 'tzdata')
 makedepends=('gcc=4.6')
 backup=(etc/gai.conf
 etc/locale.gen
@@ -24,29 +24,23 @@
 glibc-2.10-dont-build-timezone.patch
 glibc-2.10-bz4781.patch
 glibc-__i686.patch
-glibc-2.12.1-static-shared-getpagesize.patch
 glibc-2.12.2-ignore-origin-of-privileged-program.patch
-glibc-2.13-futex.patch
 glibc-2.14-libdl-crash.patch
 glibc-2.14-revert-4768ae77.patch
 glibc-2.14-reexport-rpc-interface.patch
 glibc-2.14-reinstall-nis-rpc-headers.patch
-glibc-2.14.1-tzfile-overflow.patch
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('c52a15134dfa9f2c94f2ccd4cb155cf1'
+md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
- 'a3ac6f318d680347bb6e2805d42b73b2'
  'b042647ea7d6f22ad319e12e796bd13e'
- '7d0154b7e17ea218c9fa953599d24cc4'
  '6970bcfeb3bf88913436d5112d16f588'
  '7da8c554a3b591c7401d7023b1928afc'
  'c5de2a946215d647c8af5432ec4b0da0'
  '55febbb72139ac7b65757df085024b83'
- '178779bfaa1418c709f31c25eb3d8a3e'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -54,7 +48,8 @@
 mksource() {
   git clone git://sourceware.org/git/glibc.git
   pushd glibc
-  git checkout -b glibc-2.14-arch origin/release/2.14/master
+  #git checkout -b glibc-2.15-arch origin/release/2.15/master
+  git checkout -b glibc-2.15-arch origin/master
   popd
   tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
 }
@@ -72,24 +67,17 @@
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
-  # using Fedora fix as patch in that bug report causes breakages...
-  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
-
   # http://www.exploit-db.com/exploits/15274/
   # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora 
branch...)
   patch -Np1 -i 
${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=12403
-  patch -Np1 -i ${srcdir}/glibc-2.13-futex.patch
-
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only 
fedora branch...)
   # http://sourceware.org/ml/libc-alpha/2011-06/msg6.html
   patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
 
   # Revert commit causing issues with crappy DNS servers...
   # Will be removed when workaround becomes annoying to maintain - USE A 
BETTER DNS SERVER!
-  # Note that both these patches do not fix the issue completely:
+  # Note that both these patches appear not to fix the issue completely:
   # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only 
fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
@@ -100,10 +88,6 @@
   # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only 
fedora branch...)
   patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
 
-  # http://sourceware.org/bugzilla/show_bug.cgi?id=13506
-  # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=97ac2654
-  patch -Np1 -i ${srcdir}/glibc-2.14.1-tzfile-overflow.patch
-
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -195,8 +179,8 @@
 
   cd $pkgdir
   strip $STRIP_BINARIES sbin/{ldconfig,sln} \
-

[arch-commits] Commit in glibc/trunk (4 files)

2010-10-25 Thread Allan McRae 
Date: Monday, October 25, 2010 @ 02:51:35
  Author: allan
Revision: 96837

upgpkg: glibc 2.12.1-3
fix some expoits and other bugs

Added:
  glibc/trunk/glibc-2.12.1-fix-IPTOS_CLASS-definition.patch
  glibc/trunk/glibc-2.12.1-never-expand-origin-when-privileged.patch
  glibc/trunk/glibc-2.12.1-require-suid-on-audit.patch
Modified:
  glibc/trunk/PKGBUILD

+
 PKGBUILD   |   23 +
 glibc-2.12.1-fix-IPTOS_CLASS-definition.patch  |   34 ++
 glibc-2.12.1-never-expand-origin-when-privileged.patch |   85 +
 glibc-2.12.1-require-suid-on-audit.patch   |  218 +++
 4 files changed, 357 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-25 06:16:22 UTC (rev 96836)
+++ PKGBUILD2010-10-25 06:51:35 UTC (rev 96837)
@@ -7,8 +7,8 @@
 
 pkgname=glibc
 pkgver=2.12.1
-pkgrel=2
-_glibcdate=20101007
+pkgrel=3
+_glibcdate=20101025
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -28,16 +28,22 @@
 glibc-2.12.1-make-3.82-compatibility.patch
 glibc-2.12.1-static-shared-getpagesize.patch
 glibc-2.12.1-but-I-am-an-i686.patch
+glibc-2.12.1-fix-IPTOS_CLASS-definition.patch
+glibc-2.12.1-never-expand-origin-when-privileged.patch
+glibc-2.12.1-require-suid-on-audit.patch
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('17189b123cebeb71cf7b7e7416b601a6'
+md5sums=('b12192eff7306f2a6e919641b847e7cf'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
  '1deecaa78c0909f7175732da2af796b5'
  '3215ed6996e7ecdd35bc105937c6e0dc'
  'de17165e3fa721c4e056dacfc9ee1e52'
+ 'fdc0908c9971fcf9b32e1185954b6eeb'
+ 'e154dbe21d4e24968ab257ffd9c106f2'
+ 'bbc99319ad78fe9eb1ac217efc770ac6'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -73,6 +79,17 @@
   # proper fix will be in binutils-2.21
   patch -Np1 -i ${srcdir}/glibc-2.12.1-but-I-am-an-i686.patch
 
+  # http://www.exploit-db.com/exploits/15274/
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=2232b90f (only fedora 
branch...)
+  patch -Np1 -i 
${srcdir}/glibc-2.12.1-never-expand-origin-when-privileged.patch
+
+  # http://www.exploit-db.com/exploits/15304/
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=8e9f92e9
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-require-suid-on-audit.patch
+
+  # http://sources.redhat.com/git/?p=glibc.git;a=patch;h=15bac72b
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-fix-IPTOS_CLASS-definition.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 

Added: glibc-2.12.1-fix-IPTOS_CLASS-definition.patch
===
--- glibc-2.12.1-fix-IPTOS_CLASS-definition.patch   
(rev 0)
+++ glibc-2.12.1-fix-IPTOS_CLASS-definition.patch   2010-10-25 06:51:35 UTC 
(rev 96837)
@@ -0,0 +1,34 @@
+From 15bac72bac03faeb3b725b1d208c62160f0c3ad7 Mon Sep 17 00:00:00 2001
+From: Ulrich Drepper drep...@redhat.com
+Date: Wed, 11 Aug 2010 07:44:03 -0700
+Subject: [PATCH] Fix IPTOS_CLASS definition.
+
+---
+ ChangeLog|4 
+ NEWS |4 ++--
+ sysdeps/generic/netinet/ip.h |5 ++---
+ 3 files changed, 8 insertions(+), 5 deletions(-)
+
+diff --git a/sysdeps/generic/netinet/ip.h b/sysdeps/generic/netinet/ip.h
+index a837b98..4955fee 100644
+--- a/sysdeps/generic/netinet/ip.h
 b/sysdeps/generic/netinet/ip.h
+@@ -1,5 +1,4 @@
+-/* Copyright (C) 1991,92,93,95,96,97,98,99,2000,2009 Free Software
+-   Foundation, Inc.
++/* Copyright (C) 1991-1993,1995-2000,2009,2010 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+ 
+The GNU C Library is free software; you can redistribute it and/or
+@@ -194,7 +193,7 @@ struct ip_timestamp
+  */
+ 
+ #define   IPTOS_CLASS_MASK0xe0
+-#define   IPTOS_CLASS(class)  ((tos)  IPTOS_CLASS_MASK)
++#define   IPTOS_CLASS(class)  ((class)  IPTOS_CLASS_MASK)
+ #define   IPTOS_CLASS_CS0 0x00
+ #define   IPTOS_CLASS_CS1 0x20
+ #define   IPTOS_CLASS_CS2 0x40
+-- 
+1.7.2
+

Added: glibc-2.12.1-never-expand-origin-when-privileged.patch
===
--- glibc-2.12.1-never-expand-origin-when-privileged.patch  
(rev 0)
+++ glibc-2.12.1-never-expand-origin-when-privileged.patch  2010-10-25 
06:51:35 UTC (rev 96837)
@@ -0,0 +1,85 @@
+From 2232b90f0bd3a41b4d63cac98a5b60abbfaccd46 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab sch...@redhat.com
+Date: Mon, 18

[arch-commits] Commit in glibc/trunk (4 files)

2010-10-06 Thread Allan McRae 
Date: Wednesday, October 6, 2010 @ 19:19:50
  Author: allan
Revision: 94389

upgpkg: glibc 2.12.1-2
new upstream snapshot, patch for compatibility for not so compatible i686s..., 
fix static linked files error, make-3.82 compatibility patch

Added:
  glibc/trunk/glibc-2.12.1-but-I-am-an-i686.patch
  glibc/trunk/glibc-2.12.1-make-3.82-compatibility.patch
  glibc/trunk/glibc-2.12.1-static-shared-getpagesize.patch
Modified:
  glibc/trunk/PKGBUILD

--+
 PKGBUILD |   24 +
 glibc-2.12.1-but-I-am-an-i686.patch  |   22 +
 glibc-2.12.1-make-3.82-compatibility.patch   |   29 ++
 glibc-2.12.1-static-shared-getpagesize.patch |  338 +
 4 files changed, 409 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2010-10-06 22:31:34 UTC (rev 94388)
+++ PKGBUILD2010-10-06 23:19:50 UTC (rev 94389)
@@ -7,8 +7,8 @@
 
 pkgname=glibc
 pkgver=2.12.1
-pkgrel=1
-_glibcdate=20100811
+pkgrel=2
+_glibcdate=20101007
 pkgdesc=GNU C Library
 arch=('i686' 'x86_64')
 url=http://www.gnu.org/software/libc;
@@ -25,13 +25,19 @@
 glibc-2.10-dont-build-timezone.patch
 glibc-2.10-bz4781.patch
 glibc-__i686.patch
+glibc-2.12.1-make-3.82-compatibility.patch
+glibc-2.12.1-static-shared-getpagesize.patch
+glibc-2.12.1-but-I-am-an-i686.patch
 nscd
 locale.gen.txt
 locale-gen)
-md5sums=('3f0d64de5a9fc5614d8acc0f1d5846ed'
+md5sums=('17189b123cebeb71cf7b7e7416b601a6'
  '4dadb9203b69a3210d53514bb46f41c3'
  '0c5540efc51c0b93996c51b57a8540ae'
  '40cd342e21f71f5e49e32622b25acc52'
+ '1deecaa78c0909f7175732da2af796b5'
+ '3215ed6996e7ecdd35bc105937c6e0dc'
+ 'de17165e3fa721c4e056dacfc9ee1e52'
  'b587ee3a70c9b3713099295609afde49'
  '07ac979b6ab5eeb778d55f041529d623'
  '476e9113489f93b348b21e144b6a8fcf')
@@ -57,6 +63,16 @@
   # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
   patch -Np1 -i ${srcdir}/glibc-__i686.patch
 
+  # http://sourceware.org/git/?p=glibc.git;a=patch;h=32cf4069
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-make-3.82-compatibility.patch
+
+  # http://sourceware.org/bugzilla/show_bug.cgi?id=11929
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-static-shared-getpagesize.patch
+  
+  # fedora fix for excess linker optimization on i686
+  # proper fix will be in binutils-2.21
+  patch -Np1 -i ${srcdir}/glibc-2.12.1-but-I-am-an-i686.patch
+
   install -dm755 ${pkgdir}/etc
   touch ${pkgdir}/etc/ld.so.conf
 
@@ -108,7 +124,7 @@
 
   if [[ ${CARCH} = x86_64 ]]; then
 # fix for the linker
-sed -i '/RTLDLIST/s%/ld-linux.so.2 /lib64%%' ${pkgdir}/usr/bin/ldd
+sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
 #Comply with multilib binaries, they look for the linker in /lib64
 mkdir ${pkgdir}/lib64
 cd ${pkgdir}/lib64

Added: glibc-2.12.1-but-I-am-an-i686.patch
===
--- glibc-2.12.1-but-I-am-an-i686.patch (rev 0)
+++ glibc-2.12.1-but-I-am-an-i686.patch 2010-10-06 23:19:50 UTC (rev 94389)
@@ -0,0 +1,22 @@
+--- glibc-2.12-62-gb08c89d/sysdeps/i386/i686/Makefile
 glibc-2.12.90-6/sysdeps/i386/i686/Makefile
+@@ -9,19 +9,3 @@ stack-align-test-flags += -msse
+ ifeq ($(subdir),string)
+ sysdep_routines += cacheinfo
+ endif
+-
+-ifeq (yes,$(config-asflags-i686))
+-CFLAGS-.o += -Wa,-mtune=i686
+-CFLAGS-.os += -Wa,-mtune=i686
+-CFLAGS-.op += -Wa,-mtune=i686
+-CFLAGS-.og += -Wa,-mtune=i686
+-CFLAGS-.ob += -Wa,-mtune=i686
+-CFLAGS-.oS += -Wa,-mtune=i686
+-
+-ASFLAGS-.o += -Wa,-mtune=i686
+-ASFLAGS-.os += -Wa,-mtune=i686
+-ASFLAGS-.op += -Wa,-mtune=i686
+-ASFLAGS-.og += -Wa,-mtune=i686
+-ASFLAGS-.ob += -Wa,-mtune=i686
+-ASFLAGS-.oS += -Wa,-mtune=i686
+-endif

Added: glibc-2.12.1-make-3.82-compatibility.patch
===
--- glibc-2.12.1-make-3.82-compatibility.patch  (rev 0)
+++ glibc-2.12.1-make-3.82-compatibility.patch  2010-10-06 23:19:50 UTC (rev 
94389)
@@ -0,0 +1,29 @@
+From 32cf40699346d37fabfa887bbd95e95004799ae1 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab sch...@redhat.com
+Date: Mon, 6 Sep 2010 14:55:59 +0200
+Subject: [PATCH 1/1] Don't mix pattern rules with normal rules
+
+---
+ ChangeLog   |4 
+ manual/Makefile |5 -
+ 2 files changed, 8 insertions(+), 1 deletions(-)
+
+diff --git a/manual/Makefile b/manual/Makefile
+index c5866eb..b1f5fa7 100644
+--- a/manual/Makefile
 b/manual/Makefile
+@@ -232,7 +232,10 @@ ifdef objpfx
+ .PHONY: stubs
+ stubs: $(objpfx)stubs
+ endif
+-$(objpfx)stubs ../po/manual.pot $(objpfx)stamp%:
++$(objpfx)stubs ../po/manual.pot:
++  $(make-target-directory)
++  touch $@
++$(objpfx)stamp%:
+   $(make-target-directory)
+   touch $@
+ 
+-- 
+1.7.2
+

Added: