- initial update to 0.14; force ld.bfd

Changed files:
    0050_all_glibc-2.13-ldso-prelink-segv.patch -> 1.2
    0055_all_glibc-2.12-static-shared-getpagesize.patch -> 1.2
    0060_all_glibc-2.13-static-memmove-ssse3.patch -> 1.2
    1070_all_glibc-fadvise64_64.patch -> 1.2
    glibc-morelocales.patch -> 1.66
    glibc-new-charsets.patch -> 1.11
    glibc-pr12775.patch -> 1.2
    glibc.spec -> 1.904

diff --git a/0050_all_glibc-2.13-ldso-prelink-segv.patch b/0050_all_glibc-2.13-ldso-prelink-segv.patch
deleted file mode 100644 (file)
index 8c94ed2..0000000
--- a/0050_all_glibc-2.13-ldso-prelink-segv.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-http://bugs.gentoo.org/353814
-http://sources.redhat.com/bugzilla/show_bug.cgi?id=12489
-
-From 25b3aadaf646bff18d6527e03717c87bf50b3a50 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 28 Sep 2010 15:11:48 +0200
-Subject: [PATCH] Don't try to write to _rtld_global_ro after performing relro protection
-
----
- ChangeLog  |    5 +++++
- elf/rtld.c |    8 ++++----
- 2 files changed, 9 insertions(+), 4 deletions(-)
-
-2010-09-28  Andreas Schwab  <schwab@redhat.com>
-
-       * elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
-       before performing relro protection.
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 9a560b3..201c9cf 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-      we need it in the memory handling later.  */
-   GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
- 
-+  /* Remember the last search directory added at startup, now that
-+     malloc will no longer be the one from dl-minimal.c.  */
-+  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
-+
-   if (prelinked)
-     {
-       if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
-@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
-                         lossage);
-     }
- 
--  /* Remember the last search directory added at startup, now that
--     malloc will no longer be the one from dl-minimal.c.  */
--  GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
--
-   if (! prelinked && rtld_multiple_ref)
-     {
-       /* There was an explicit ref to the dynamic linker as a shared lib.
--- 
-1.7.4.rc2
-

diff --git a/0055_all_glibc-2.12-static-shared-getpagesize.patch b/0055_all_glibc-2.12-static-shared-getpagesize.patch
index 60dadf5e505e60a6f3c1085b0104bb3190dca787..9153e235e01e26d8b8136de3bf7b9a3ded60fba1 100644 (file)
--- a/0055_all_glibc-2.12-static-shared-getpagesize.patch
+++ b/0055_all_glibc-2.12-static-shared-getpagesize.patch
@@ -74,14 +74,15 @@ diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
 index 4302bd3..37c56a3 100644
 --- a/sysdeps/unix/sysv/linux/Makefile
 +++ b/sysdeps/unix/sysv/linux/Makefile
-@@ -147,7 +147,9 @@ sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
+@@ -148,8 +148,10 @@
  endif
  
  ifeq ($(subdir),elf)
--sysdep-rtld-routines += dl-brk dl-sbrk
 +sysdep-dl-routines += dl-static
 +sysdep_routines += dl-static
-+sysdep-rtld-routines += dl-brk dl-sbrk dl-static
+ sysdep-rtld-routines += dl-brk dl-sbrk dl-getcwd dl-openat64 dl-opendir \
+-                      dl-fxstatat64
++                      dl-fxstatat64 dl-static
  
  CPPFLAGS-lddlibc4 += -DNOT_IN_libc
  endif

diff --git a/0060_all_glibc-2.13-static-memmove-ssse3.patch b/0060_all_glibc-2.13-static-memmove-ssse3.patch
deleted file mode 100644 (file)
index 42c9c87..0000000
--- a/0060_all_glibc-2.13-static-memmove-ssse3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-http://bugs.gentoo.org/353816
-http://sourceware.org/ml/libc-alpha/2011-02/msg00015.html
-
-From 7da767805f0a7301c0c719a6c0fd51d87e193c22 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Sun, 6 Feb 2011 12:39:08 -0500
-Subject: [PATCH] memcpy-ssse3: enable chk symbols in static builds
-
-Building static apps on i686/x86_64 systems which use memmove such as:
-       #include <string.h>
-       char buf[8192];
-       main(int argc, char **argv) { memmove(buf, buf + argc, argc % 4); }
-
-Result in linking errors along the lines of:
-       .../libc.a(memmove_chk.o): In function `__memmove_chk':
-       (.text+0x1b4): undefined reference to `__memmove_chk_ssse3_back'
-       .../libc.a(memmove_chk.o): In function `__memmove_chk':
-       (.text+0x1b9): undefined reference to `__memmove_chk_ssse3'
-       collect2: ld returned 1 exit status
-
-This is due to the new ssse3 funcs only enabling their chk symbols when
-being compiled into shared code.
-
-URL: https://bugs.gentoo.org/353816
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-
-2011-02-06  Mike Frysinger  <vapier@gentoo.org>
-
-       * sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S: Only protect
-       MEMCPY_CHK with USE_AS_BCOPY ifdef check.
-       * sysdeps/i386/i686/multiarch/memcpy-ssse3.S: Likewise.
-       * sysdeps/x86_64/multiarch/memcpy-ssse3.S: Likewise.
-       * sysdeps/x86_64/multiarch/memcpy-ssse3-back.S: Likewise.
----
- sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S |    2 +-
- sysdeps/i386/i686/multiarch/memcpy-ssse3.S     |    2 +-
- sysdeps/x86_64/multiarch/memcpy-ssse3-back.S   |    2 +-
- sysdeps/x86_64/multiarch/memcpy-ssse3.S        |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
-index 48a109c..8e81183 100644
---- a/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
-+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3-rep.S
-@@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx:
- #endif
- 
-       .section .text.ssse3,"ax",@progbits
--#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY
-+#if !defined USE_AS_BCOPY
- ENTRY (MEMCPY_CHK)
-       movl    12(%esp), %eax
-       cmpl    %eax, 16(%esp)
-diff --git a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
-index ec9eeb9..f64f8d2 100644
---- a/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
-+++ b/sysdeps/i386/i686/multiarch/memcpy-ssse3.S
-@@ -110,7 +110,7 @@ __i686.get_pc_thunk.bx:
- #endif
- 
-       .section .text.ssse3,"ax",@progbits
--#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BCOPY
-+#if !defined USE_AS_BCOPY
- ENTRY (MEMCPY_CHK)
-       movl    12(%esp), %eax
-       cmpl    %eax, 16(%esp)
-diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
-index 48c974e..bdd114a 100644
---- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
-+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S
-@@ -49,7 +49,7 @@
-   ud2
- 
-       .section .text.ssse3,"ax",@progbits
--#if defined SHARED && !defined NOT_IN_libc
-+#if !defined USE_AS_BCOPY
- ENTRY (MEMCPY_CHK)
-       cmpq    %rdx, %rcx
-       jb      HIDDEN_JUMPTARGET (__chk_fail)
-diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S
-index 9a878d3..cd7e45f 100644
---- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S
-+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S
-@@ -49,7 +49,7 @@
-   ud2
- 
-       .section .text.ssse3,"ax",@progbits
--#if defined SHARED && !defined NOT_IN_libc
-+#if !defined USE_AS_BCOPY
- ENTRY (MEMCPY_CHK)
-       cmpq    %rdx, %rcx
-       jb      HIDDEN_JUMPTARGET (__chk_fail)
--- 
-1.7.4.rc2
-

diff --git a/1070_all_glibc-fadvise64_64.patch b/1070_all_glibc-fadvise64_64.patch
deleted file mode 100644 (file)
index b05c09f..0000000
--- a/1070_all_glibc-fadvise64_64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-ripped from Debian
-
----
- sysdeps/unix/sysv/linux/posix_fadvise.c |   13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
---- a/sysdeps/unix/sysv/linux/posix_fadvise.c
-+++ b/sysdeps/unix/sysv/linux/posix_fadvise.c
-@@ -35,6 +35,19 @@
-     return INTERNAL_SYSCALL_ERRNO (ret, err);
-   return 0;
- #else
-+# ifdef __NR_fadvise64_64
-+  INTERNAL_SYSCALL_DECL (err);  
-+  int ret = INTERNAL_SYSCALL (fadvise64_64, err, 6, fd,
-+                            __LONG_LONG_PAIR ((long) (offset >> 31),
-+                                              (long) offset),
-+                            __LONG_LONG_PAIR ((long) (len >> 31),
-+                                              (long) len),
-+                            advise);
-+  if (INTERNAL_SYSCALL_ERROR_P (ret, err))
-+    return INTERNAL_SYSCALL_ERRNO (ret, err);
-+  return 0;
-+# else
-   return ENOSYS;
-+# endif
- #endif
- }

diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index 6ead0d35ae132479a82a36e33d70f3a79d7b8d53..b560c6815ff746b9faab4eaa72cb851bc0524393 100644 (file)
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -1132,365 +1132,6 @@ diff -urN glibc-2.6.org/localedata/locales/rm_CH glibc-2.6/localedata/locales/rm
 +lang_term    "<U0072><U006F><U0068>" % Three-letter code for language (ISO 639-2).
 +lang_lib     "<U0072><U006F><U0068>" % Three-letter code for language (ISO 639-2).
 +END LC_ADDRESS
-diff -urN glibc-2.6.org/localedata/locales/sw_KE glibc-2.6/localedata/locales/sw_KE
---- glibc-2.6.org/localedata/locales/sw_KE     1970-01-01 01:00:00.000000000 +0100
-+++ glibc-2.6/localedata/locales/sw_KE 2007-05-18 12:14:58.623621321 +0200
-@@ -0,0 +1,355 @@
-+comment_char %
-+escape_char  /
-+%
-+% Swahili Language Locale for Kenya
-+% Source: Based on data from Debian/Mandriva
-+% Contact: ankry at mif dot pg dot gda dot pl
-+% Email: 
-+% Language: sw
-+% Territory: Kenya
-+% Revision: 0.3
-+% Date: 2005-10-14
-+% Users: general
-+% Repertoiremap: mnemonic,ds
-+% Charset: UTF-8
-+% Distribution and use is free, also
-+% for commercial purposes.
-+
-+LC_IDENTIFICATION
-+title      "Swahili locale for Kenya"
-+source     "Based on data from Debian/Mandriva"
-+address    ""
-+contact    ""
-+email      ""
-+tel        ""
-+fax        ""
-+language   "Swahili"
-+territory  "Kenya"
-+revision   "0.2"
-+date       "2004-08-01"
-+%
-+category  "i18n:1997";LC_IDENTIFICATION
-+category  "i18n:1997";LC_CTYPE
-+category  "i18n:1997";LC_COLLATE
-+category  "i18n:1997";LC_TIME
-+category  "i18n:1997";LC_NUMERIC
-+category  "i18n:1997";LC_MONETARY
-+category  "i18n:1997";LC_MESSAGES
-+category  "i18n:1997";LC_PAPER
-+category  "i18n:1997";LC_NAME
-+category  "i18n:1997";LC_ADDRESS
-+category  "i18n:1997";LC_TELEPHONE
-+END LC_IDENTIFICATION
-+
-+%%%%%%%%%%%%%%%%
-+% TODO: check LC_MONETARY, LC_NUMERIC, LC_MESSAGES, LC_COLLATE
-+%     check time and date formats
-+%%%%%%%%%%%%%%%%
-+
-+LC_COLLATE
-+% Copy the template from ISO/IEC 14651 i.e.
-+% use the rules there when making ordered lists of words.
-+%
-+copy "iso14651_t1"
-+% a b c ch d dh e f g gh h i j k kh l m mb mv n nd ng ng' nj ny nz o p q r
-+% s sh t th u v w x y z
-+
-+collating-symbol  <ch>
-+collating-element <C-H> from "<U0043><U0048>"
-+collating-element <C-h> from "<U0043><U0068>"
-+collating-element <c-H> from "<U0063><U0048>"
-+collating-element <c-h> from "<U0063><U0068>"
-+
-+collating-symbol  <dh>
-+collating-element <D-H> from "<U0044><U0048>"
-+collating-element <D-h> from "<U0044><U0068>"
-+collating-element <d-H> from "<U0064><U0048>"
-+collating-element <d-h> from "<U0064><U0068>"
-+
-+collating-symbol  <gh>
-+collating-element <G-H> from "<U0047><U0043>"
-+collating-element <G-h> from "<U0047><U0063>"
-+collating-element <g-H> from "<U0067><U0043>"
-+collating-element <g-h> from "<U0067><U0063>"
-+
-+collating-symbol  <kh>
-+collating-element <K-H> from "<U004B><U0048>"
-+collating-element <K-h> from "<U004B><U0068>"
-+collating-element <k-H> from "<U006B><U0048>"
-+collating-element <k-h> from "<U006B><U0068>"
-+
-+collating-symbol  <mb>
-+collating-element <M-B> from "<U004D><U0042>"
-+collating-element <M-b> from "<U004D><U0062>"
-+collating-element <m-B> from "<U006D><U0042>"
-+collating-element <m-b> from "<U006D><U0062>"
-+
-+collating-symbol  <mv>
-+collating-element <M-V> from "<U004D><U0056>"
-+collating-element <M-v> from "<U004D><U0076>"
-+collating-element <m-V> from "<U006D><U0056>"
-+collating-element <m-v> from "<U006D><U0076>"
-+
-+collating-symbol  <nd>
-+collating-element <N-D> from "<U004E><U0044>"
-+collating-element <N-d> from "<U004E><U0064>"
-+collating-element <n-D> from "<U006E><U0044>"
-+collating-element <n-d> from "<U006E><U0064>"
-+
-+collating-symbol  <ng>
-+collating-element <N-G> from "<U004E><U0047>"
-+collating-element <N-g> from "<U004E><U0067>"
-+collating-element <n-G> from "<U006E><U0047>"
-+collating-element <n-g> from "<U006E><U0067>"
-+
-+collating-symbol  <ng'>
-+collating-element <N-G-'> from "<U004E><U0047><U0027>"
-+collating-element <N-g-'> from "<U004E><U0067><U0027>"
-+collating-element <n-G-'> from "<U006E><U0047><U0027>"
-+collating-element <n-g-'> from "<U006E><U0067><U0027>"
-+
-+collating-symbol  <nj>
-+collating-element <N-J> from "<U004E><U004A>"
-+collating-element <N-j> from "<U004E><U006A>"
-+collating-element <n-J> from "<U006E><U004A>"
-+collating-element <n-j> from "<U006E><U006A>"
-+
-+collating-symbol  <ny>
-+collating-element <N-Y> from "<U004E><U0059>"
-+collating-element <N-y> from "<U004E><U0079>"
-+collating-element <n-Y> from "<U006E><U0059>"
-+collating-element <n-y> from "<U006E><U0079>"
-+
-+collating-symbol  <nz>
-+collating-element <N-Z> from "<U004E><U005A>"
-+collating-element <N-z> from "<U004E><U007A>"
-+collating-element <n-Z> from "<U006E><U005A>"
-+collating-element <n-z> from "<U006E><U007A>"
-+
-+collating-symbol  <sh>
-+collating-element <S-H> from "<U0053><U0048>"
-+collating-element <S-h> from "<U0053><U0068>"
-+collating-element <s-H> from "<U0073><U0048>"
-+collating-element <s-h> from "<U0073><U0068>"
-+
-+% symbol <th> is already used in iso14651_t1
-+collating-symbol  <th0>
-+collating-element <T-H> from "<U0054><U0048>"
-+collating-element <T-h> from "<U0054><U0068>"
-+collating-element <t-H> from "<U0074><U0048>"
-+collating-element <t-h> from "<U0074><U0068>"
-+
-+collating-symbol <CAP-CAP>
-+collating-symbol <CAP-MIN>
-+collating-symbol <MIN-CAP>
-+collating-symbol <MIN-MIN>
-+
-+reorder-after <MIN>
-+<MIN-MIN>
-+<MIN-CAP>
-+
-+reorder-after <CAP>
-+<CAP-MIN>
-+<CAP-CAP>
-+
-+reorder-after <c>
-+<ch>
-+reorder-after <d>
-+<dh>
-+reorder-after <g>
-+<gh>
-+reorder-after <k>
-+<kh>
-+reorder-after <m>
-+<mb>
-+<mv>
-+reorder-after <n>
-+<nd>
-+<ng>
-+<ng'>
-+<nj>
-+<ny>
-+<nz>
-+reorder-after <s>
-+<sh>
-+reorder-after <t>
-+<th0>
-+
-+reorder-after <U0043>
-+<C-h>         <ch>;<BAS>;<CAP-MIN>;IGNORE
-+<C-H>         <ch>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U0063>
-+<c-h>         <ch>;<BAS>;<MIN-MIN>;IGNORE
-+<c-H>         <ch>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U0044>
-+<D-h>         <dh>;<BAS>;<CAP-MIN>;IGNORE
-+<D-H>         <dh>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U0064>
-+<d-h>         <dh>;<BAS>;<MIN-MIN>;IGNORE
-+<d-H>         <dh>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U0047>
-+<G-h>         <gh>;<BAS>;<CAP-MIN>;IGNORE
-+<G-H>         <gh>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U0067>
-+<g-h>         <gh>;<BAS>;<MIN-MIN>;IGNORE
-+<g-H>         <gh>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U004B>
-+<K-h>         <kh>;<BAS>;<CAP-MIN>;IGNORE
-+<K-H>         <kh>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U006B>
-+<k-h>         <kh>;<BAS>;<MIN-MIN>;IGNORE
-+<k-H>         <kh>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U004D>
-+<M-b>         <mb>;<BAS>;<CAP-MIN>;IGNORE
-+<M-B>         <mb>;<BAS>;<CAP-CAP>;IGNORE
-+<M-v>         <mv>;<BAS>;<CAP-MIN>;IGNORE
-+<M-V>         <mv>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U006D>
-+<m-b>         <mb>;<BAS>;<MIN-MIN>;IGNORE
-+<m-B>         <mb>;<BAS>;<MIN-CAP>;IGNORE
-+<m-v>         <mv>;<BAS>;<MIN-MIN>;IGNORE
-+<m-V>         <mv>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U004E>
-+<N-d>         <nd>;<BAS>;<CAP-MIN>;IGNORE
-+<N-D>         <nd>;<BAS>;<CAP-CAP>;IGNORE
-+<N-g>         <ng>;<BAS>;<CAP-MIN>;IGNORE
-+<N-G>         <ng>;<BAS>;<CAP-CAP>;IGNORE
-+<N-g-'>               <ng'>;<BAS>;<CAP-MIN>;IGNORE
-+<N-G-'>               <ng'>;<BAS>;<CAP-CAP>;IGNORE
-+<N-j>         <nj>;<BAS>;<CAP-MIN>;IGNORE
-+<N-J>         <nj>;<BAS>;<CAP-CAP>;IGNORE
-+<N-y>         <ny>;<BAS>;<CAP-MIN>;IGNORE
-+<N-Y>         <ny>;<BAS>;<CAP-CAP>;IGNORE
-+<N-z>         <nz>;<BAS>;<CAP-MIN>;IGNORE
-+<N-Z>         <nz>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U006E>
-+<n-d>         <nd>;<BAS>;<MIN-MIN>;IGNORE
-+<n-D>         <nd>;<BAS>;<MIN-CAP>;IGNORE
-+<n-g>         <ng>;<BAS>;<MIN-MIN>;IGNORE
-+<n-G>         <ng>;<BAS>;<MIN-CAP>;IGNORE
-+<n-g-'>               <ng'>;<BAS>;<MIN-MIN>;IGNORE
-+<n-G-'>               <ng'>;<BAS>;<MIN-CAP>;IGNORE
-+<n-j>         <nj>;<BAS>;<MIN-MIN>;IGNORE
-+<n-J>         <nj>;<BAS>;<MIN-CAP>;IGNORE
-+<n-y>         <ny>;<BAS>;<MIN-MIN>;IGNORE
-+<n-Y>         <ny>;<BAS>;<MIN-CAP>;IGNORE
-+<n-z>         <nz>;<BAS>;<MIN-MIN>;IGNORE
-+<n-Z>         <nz>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U0053>
-+<S-h>         <sh>;<BAS>;<CAP-MIN>;IGNORE
-+<S-H>         <sh>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U0073>
-+<s-h>         <sh>;<BAS>;<MIN-MIN>;IGNORE
-+<s-H>         <sh>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-after <U0054>
-+<T-h>         <th0>;<BAS>;<CAP-MIN>;IGNORE
-+<T-H>         <th0>;<BAS>;<CAP-CAP>;IGNORE
-+reorder-after <U0074>
-+<t-h>         <th0>;<BAS>;<MIN-MIN>;IGNORE
-+<t-H>         <th0>;<BAS>;<MIN-CAP>;IGNORE
-+
-+reorder-end
-+
-+END LC_COLLATE
-+
-+LC_CTYPE
-+copy "i18n"
-+END LC_CTYPE
-+
-+LC_MONETARY
-+copy "om_KE"
-+END LC_MONETARY
-+
-+LC_NUMERIC
-+copy "om_KE"
-+END LC_NUMERIC
-+
-+LC_TELEPHONE
-+copy "om_KE"
-+END LC_TELEPHONE
-+
-+LC_TIME
-+abday   "<U004A><U0070><U0069>";"<U004A><U0074><U0061>";/
-+        "<U004A><U006E><U0065>";"<U004A><U0074><U006E>";/
-+        "<U0041><U006C><U0068>";"<U0049><U006A><U0075>";/
-+        "<U004A><U006D><U006F>"
-+day     "<U004A><U0075><U006D><U0061><U0070><U0069><U006C><U0069>";/
-+        "<U004A><U0075><U006D><U0061><U0074><U0061><U0074><U0075>";/
-+        "<U004A><U0075><U006D><U0061><U006E><U006E><U0065>";/
-+        "<U004A><U0075><U006D><U0061><U0074><U0061><U006E><U006F>";/
-+        "<U0041><U006C><U0068><U0061><U006D><U0069><U0073><U0069>";/
-+        "<U0049><U006A><U0075><U006D><U0061><U0061>";/
-+        "<U004A><U0075><U006D><U0061><U006D><U006F><U0073><U0069>"
-+abmon   "<U004A><U0061><U006E>";"<U0046><U0065><U0062>";/
-+        "<U004D><U0061><U0063>";"<U0041><U0070><U0072>";/
-+        "<U004D><U0065><U0069>";"<U004A><U0075><U006E>";/
-+        "<U004A><U0075><U006C>";"<U0041><U0075><U0067>";/
-+        "<U0053><U0065><U0070>";"<U004F><U006B><U0074>";/
-+        "<U004E><U006F><U0076>";"<U0044><U0069><U0073>"
-+mon     "<U004A><U0061><U006E><U0075><U0061><U0072><U0069>";/
-+        "<U0046><U0065><U0062><U0072><U0075><U0061><U0072><U0069>";/
-+        "<U004D><U0061><U0063><U0068><U0069>";/
-+        "<U0041><U0070><U0072><U0069><U006C><U0069>";/
-+        "<U004D><U0065><U0069>";/
-+        "<U004A><U0075><U006E><U0069>";/
-+        "<U004A><U0075><U006C><U0061><U0069>";/
-+        "<U0041><U0075><U0067><U006F><U0073><U0074><U0069>";/
-+        "<U0053><U0065><U0070><U0074><U0065><U006D><U0062><U0061>";/
-+        "<U004F><U006B><U0074><U006F><U0062><U0061>";/
-+        "<U004E><U006F><U0076><U0065><U006D><U0062><U0061>";/
-+        "<U0044><U0069><U0073><U0065><U006D><U0062><U0061>"
-+%
-+d_t_fmt     "<U0025><U0061><U0020><U0025><U0064><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0072><U0020><U0025><U005A>"
-+d_fmt       "<U0025><U006D><U002F><U0025><U0064><U002F><U0025><U0079>"
-+t_fmt       "<U0025><U0072>"
-+am_pm       "<U0041><U004D>";"<U0050><U004D>"
-+t_fmt_ampm  "<U0025><U0049><U003A><U0025><U004D><U003A><U0025><U0053><U0020><U0025><U0070>"
-+END LC_TIME
-+
-+LC_MESSAGES
-+% FIXME
-+copy "en_US"
-+END LC_MESSAGES
-+
-+% Default paper: A4
-+LC_PAPER
-+height 297
-+width 210
-+END LC_PAPER
-+
-+% Metric System (ISO 1000)
-+LC_MEASUREMENT
-+measurement 1
-+END LC_MEASUREMENT
-+
-+LC_ADDRESS
-+%
-+% This is the ISO_IEC TR14652 Locale definition for the LC_ADDRESS category.
-+%
-+postal_fmt    "<U0025><U007A><U0025><U0063><U0025><U0054><U0025><U0073>/
-+<U0025><U0062><U0025><U0065><U0025><U0072>"
-+%
-+country_name  "<U004B><U0065><U006E><U0079><U0061>"
-+country_post  "<U004B><U0045><U004E>"
-+country_ab2   "<U004B><U0045>"
-+country_ab3   "<U004B><U0045><U004E>"
-+country_num   404
-+country_car   "<U0045><U0041><U004B>"
-+country_isbn  "<U0039><U0039><U0036><U0036>"
-+lang_name     "<U004B><U0069><U0073><U0077><U0061><U0068><U0069><U006C><U0069>"
-+lang_ab       "<U0073><U0077>"
-+lang_term     "<U0073><U0077><U0061>"
-+lang_lib      "<U0073><U0077><U0061>"
-+END LC_ADDRESS
-+
-+LC_NAME
-+% FIXME!
-+copy "en_US"
-+END LC_NAME
 diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw_UG
 --- glibc-2.6.org/localedata/locales/sw_UG     1970-01-01 01:00:00.000000000 +0100
 +++ glibc-2.6/localedata/locales/sw_UG 2007-05-18 12:14:58.623621321 +0200
@@ -1608,23 +1249,16 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
 +END LC_NAME
 --- glibc-2.8/localedata/SUPPORTED.orig        2008-04-16 20:55:48.000000000 +0200
 +++ glibc-2.8/localedata/SUPPORTED     2008-10-08 19:06:05.514417473 +0200
-@@ -47,12 +47,15 @@
- ar_YE.UTF-8/UTF-8 \
- ar_YE/ISO-8859-6 \
- az_AZ.UTF-8/UTF-8 \
-+az_AZ/UTF-8 \
- as_IN.UTF-8/UTF-8 \
- ast_ES.UTF-8/UTF-8 \
- ast_ES/ISO-8859-15 \
+@@ -53,6 +53,8 @@
  be_BY.UTF-8/UTF-8 \
  be_BY/CP1251 \
  be_BY@latin/UTF-8 \
 +be_BY@alternative.UTF-8/UTF-8 \
 +be_BY@alternative/CP1251 \
+ bem_ZM/UTF-8 \
  ber_DZ/UTF-8 \
  ber_MA/UTF-8 \
- bg_BG.UTF-8/UTF-8 \
-@@ -132,6 +136,8 @@
+@@ -132,6 +134,8 @@
  en_ZA/ISO-8859-1 \
  en_ZW.UTF-8/UTF-8 \
  en_ZW/ISO-8859-1 \
@@ -1633,7 +1267,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  es_AR.UTF-8/UTF-8 \
  es_AR/ISO-8859-1 \
  es_BO.UTF-8/UTF-8 \
-@@ -179,10 +185,14 @@
+@@ -179,10 +183,14 @@
  eu_ES.UTF-8/UTF-8 \
  eu_ES/ISO-8859-1 \
  eu_ES@euro/ISO-8859-15 \
@@ -1641,14 +1275,14 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
 +eu_FR/ISO-8859-1 \
 +eu_FR@euro/ISO-8859-15 \
  fa_IR/UTF-8 \
+ ff_SN/UTF-8 \
  fi_FI.UTF-8/UTF-8 \
  fi_FI/ISO-8859-1 \
  fi_FI@euro/ISO-8859-15 \
 +fil_PH.ISO-8859-1/ISO-8859-1 \
  fil_PH/UTF-8 \
  fo_FO.UTF-8/UTF-8 \
- fo_FO/ISO-8859-1 \
-@@ -199,8 +209,14 @@
+@@ -199,8 +207,14 @@
  fr_LU.UTF-8/UTF-8 \
  fr_LU/ISO-8859-1 \
  fr_LU@euro/ISO-8859-15 \
@@ -1663,7 +1297,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  fy_DE/UTF-8 \
  ga_IE.UTF-8/UTF-8 \
  ga_IE/ISO-8859-1 \
-@@ -236,17 +236,19 @@
+@@ -236,17 +250,19 @@
  ha_NG/UTF-8 \
  he_IL.UTF-8/UTF-8 \
  he_IL/ISO-8859-8 \
@@ -1684,7 +1318,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  id_ID.UTF-8/UTF-8 \
  id_ID/ISO-8859-1 \
  ig_NG/UTF-8 \
-@@ -241,10 +260,9 @@
+@@ -241,10 +257,9 @@
  it_IT/ISO-8859-1 \
  it_IT@euro/ISO-8859-15 \
  iu_CA/UTF-8 \
@@ -1696,12 +1330,13 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  ka_GE.UTF-8/UTF-8 \
  ka_GE/GEORGIAN-PS \
  kk_KZ.UTF-8/UTF-8 \
-@@ -278,11 +278,17 @@
+@@ -278,11 +293,17 @@
  ku_TR/ISO-8859-9 \
  kw_GB.UTF-8/UTF-8 \
  kw_GB/ISO-8859-1 \
 +ky_KG.KOI8-K/KOI8-K \
  ky_KG/UTF-8 \
+ lb_LU/UTF-8 \
  lg_UG.UTF-8/UTF-8 \
  lg_UG/ISO-8859-10 \
 +li_BE.ISO-8859-1/ISO-8859-1 \
@@ -1710,11 +1345,11 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
 +li_NL.ISO-8859-1/ISO-8859-1 \
 +li_NL.ISO-8859-15/ISO-8859-15 \
  li_NL/UTF-8 \
+ lij_IT/UTF-8 \
 +lo_LA.MULELAO-1/MULELAO-1 \
  lo_LA/UTF-8 \
  lt_LT.UTF-8/UTF-8 \
- lt_LT/ISO-8859-13 \
-@@ -310,7 +310,11 @@
+@@ -310,7 +331,11 @@
  mt_MT/ISO-8859-3 \
  nb_NO.UTF-8/UTF-8 \
  nb_NO/ISO-8859-1 \
@@ -1726,7 +1361,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  nds_NL/UTF-8 \
  ne_NP/UTF-8 \
  nl_AW/UTF-8 \
-@@ -296,24 +326,33 @@
+@@ -296,24 +321,33 @@
  nl_NL@euro/ISO-8859-15 \
  nn_NO.UTF-8/UTF-8 \
  nn_NO/ISO-8859-1 \
@@ -1760,7 +1395,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
 +ro_RO.ISO-8859-16/ISO-8859-16 \
  ro_RO.UTF-8/UTF-8 \
  ro_RO/ISO-8859-2 \
-@@ -361,17 +361,21 @@
+@@ -361,17 +395,21 @@
  ru_RU/ISO-8859-5 \
  ru_UA.UTF-8/UTF-8 \
  ru_UA/KOI8-U \
@@ -1782,7 +1417,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  sl_SI.UTF-8/UTF-8 \
  sl_SI/ISO-8859-2 \
  so_DJ.UTF-8/UTF-8 \
-@@ -341,9 +387,13 @@
+@@ -341,9 +379,13 @@
  sq_AL.UTF-8/UTF-8 \
  sq_AL/ISO-8859-1 \
  sq_MK/UTF-8 \
@@ -1796,7 +1431,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  ss_ZA/UTF-8 \
  st_ZA.UTF-8/UTF-8 \
  st_ZA/ISO-8859-1 \
-@@ -352,10 +402,17 @@
+@@ -352,10 +394,17 @@
  sv_FI@euro/ISO-8859-15 \
  sv_SE.UTF-8/UTF-8 \
  sv_SE/ISO-8859-1 \
@@ -1814,7 +1449,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  th_TH.UTF-8/UTF-8 \
  th_TH/TIS-620 \
  ti_ER/UTF-8 \
-@@ -364,18 +421,24 @@
+@@ -364,18 +413,24 @@
  tk_TM/UTF-8 \
  tl_PH.UTF-8/UTF-8 \
  tl_PH/ISO-8859-1 \
@@ -1839,7 +1474,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  uz_UZ/ISO-8859-1 \
  uz_UZ@cyrillic/UTF-8 \
  ve_ZA/UTF-8 \
-@@ -384,6 +447,7 @@
+@@ -384,6 +439,7 @@
  wa_BE/ISO-8859-1 \
  wa_BE@euro/ISO-8859-15 \
  wa_BE.UTF-8/UTF-8 \

diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch
index 4ef17e50d93f2e9f1ec96baabe6e83756d78b958..13ee37e331a1cff3e1aa8228145d7733cdee8f02 100644 (file)
--- a/glibc-new-charsets.patch
+++ b/glibc-new-charsets.patch
@@ -24,7 +24,7 @@
                    ebcdic-dk-no-a ebcdic-es-s ebcdic-fi-se ebcdic-fi-se-a  \
                    ebcdic-fr ebcdic-it ebcdic-pt ebcdic-us \
                    ibm037 ibm038 ibm274 ibm275 ibm423 ibm500 ibm870 ibm871 \
--                  ibm891 ibm903 ibm904 ibm905 ibm1047   \
+-                  ibm891 ibm903 ibm904 ibm905 ibm1047
 +                  ibm891 ibm903 ibm904 ibm905 ibm1047 koi8-c
  
  gen-8bit-gap-modules := koi8-r latin-greek latin-greek-1 ibm256 ibm273           \

diff --git a/glibc-pr12775.patch b/glibc-pr12775.patch
deleted file mode 100644 (file)
index 4cc4f28..0000000
--- a/glibc-pr12775.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 8db736347c7aca3201f61e3f05b5f672bcdd5bd9 Mon Sep 17 00:00:00 2001
-From: H.J. Lu <hongjiu.lu@intel.com>
-Date: Wed, 18 May 2011 19:50:48 -0400
-Subject: [PATCH] Fix typo in x86-64 powl
-
---- a/sysdeps/x86_64/fpu/e_powl.S
-+++ b/sysdeps/x86_64/fpu/e_powl.S
-@@ -1,5 +1,5 @@
- /* ix87 specific implementation of pow function.
--   Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2007
-+   Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004, 2007, 2011
-    Free Software Foundation, Inc.
-    This file is part of the GNU C Library.
-    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
-@@ -154,7 +154,7 @@ ENTRY(__ieee754_powl)
-       fucompp                 // 1.0 : x : y
-       fnstsw
-       fxch                    // x : 1.0 : y
--      test    $4500,%eax
-+      test    $0x4500,%eax
-       jz      7f
-       fsub    %st(1)          // x-1 : 1.0 : y
-       fyl2xp1                 // log2(x) : y

diff --git a/glibc.spec b/glibc.spec
index cb06a2dcc54ed2c1acf3a2398f6d0794a64866cf..0bcf4ff6a7a8c85ec75d491f727d910bb92e6006 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -33,14 +33,14 @@ Summary(ru.UTF-8):  GNU libc версии
 Summary(tr.UTF-8):     GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
-Version:       2.13
-Release:       6
+Version:       2.14
+Release:       0.1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 #Source0:      http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
 Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 290b14e5ea57bafe19a637037519027c
+# Source0-md5: fab30e34209f6ea65adf173597887a7a
 Source1:       http://ftp.gnu.org/gnu/glibc/%{name}-ports-%{ports_version}.tar.bz2
 # Source1-md5: cb01ab976180e98287cef5079e35359e
 Source2:       nscd.init
@@ -79,13 +79,9 @@ Patch30:     %{name}-bug-12492.patch
 Patch31:       %{name}-origin.patch
 Patch32:       %{name}-Os-fail-workaround.patch
 Patch33:       0020_all_glibc-tweak-rfc1918-lookup.patch
-Patch34:       0050_all_glibc-2.13-ldso-prelink-segv.patch
 Patch35:       0055_all_glibc-2.12-static-shared-getpagesize.patch
-Patch36:       0060_all_glibc-2.13-static-memmove-ssse3.patch
 Patch37:       0061_all_glibc-2.13-static-memset.patch
 Patch38:       1055_all_glibc-resolv-dynamic.patch
-Patch39:       1070_all_glibc-fadvise64_64.patch
-Patch40:       %{name}-pr12775.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
 BuildRequires: autoconf
@@ -937,13 +933,11 @@ mv %{name}-ports-%{ports_version} ports
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
-%patch34 -p1
+
 %patch35 -p1
-%patch36 -p1
+
 %patch37 -p1
 %patch38 -p1
-%patch39 -p1
-%patch40 -p1
 
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -974,8 +968,14 @@ AddOns=nptl,libidn
 AddOns=$AddOns,ports
 %endif
 
+# force ld bfd (instead of gold)
+install -d alt-tools
+ln -sf %{_bindir}/ld.bfd alt-tools/ld
+PATH=$(pwd)/alt-tools:$PATH; export PATH
+
 AWK="gawk" \
 ../%configure \
+       --with-binutils=$(pwd)/alt-tools \
        --enable-kernel="%{min_kernel}" \
        --enable-omitfp \
        --with-headers=%{_includedir} \