- up to 2.12.1

Changed files:
    glibc-dl.patch -> 1.2
    glibc-morelocales.patch -> 1.65
    glibc.spec -> 1.876

diff --git a/glibc-dl.patch b/glibc-dl.patch
deleted file mode 100644 (file)
index 7a0b021..0000000
--- a/glibc-dl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c
-index a52120d..6847eda 100644
---- a/elf/dl-runtime.c
-+++ b/elf/dl-runtime.c
-@@ -1,5 +1,5 @@
- /* On-demand PLT fixup for shared objects.
--   Copyright (C) 1995-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-+   Copyright (C) 1995-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
-@@ -144,7 +144,8 @@ _dl_fixup (
-   /* And now perhaps the relocation addend.  */
-   value = elf_machine_plt_value (l, reloc, value);
- 
--  if (__builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
-+  if (sym != NULL
-+      && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC, 0))
-     value = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) ();
- 
-   /* Finally, fix up the plt itself.  */
-@@ -231,8 +232,9 @@ _dl_profile_fixup (
-                                      ? LOOKUP_VALUE_ADDRESS (result)
-                                        + defsym->st_value : 0);
- 
--        if (__builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
--                              == STT_GNU_IFUNC, 0))
-+        if (defsym != NULL
-+            && __builtin_expect (ELFW(ST_TYPE) (defsym->st_info)
-+                                 == STT_GNU_IFUNC, 0))
-           value = ((DL_FIXUP_VALUE_TYPE (*) (void))
-                    DL_FIXUP_VALUE_ADDR (value)) ();
-       }
-@@ -369,7 +371,7 @@ _dl_profile_fixup (
-       struct audit_ifaces *afct = GLRO(dl_audit);
-       for (unsigned int cnt = 0; cnt < GLRO(dl_naudit); ++cnt)
-       {
--        if (afct->ARCH_LA_PLTENTER != NULL
-+        if (afct->ARCH_LA_PLTENTER != NULL
-             && (reloc_result->enterexit
-                 & (LA_SYMB_NOPLTENTER << (2 * (cnt + 1)))) == 0)
-           {

diff --git a/glibc-morelocales.patch b/glibc-morelocales.patch
index e95c356085b8d3c712b154553e997a6e05d24e9f..6ead0d35ae132479a82a36e33d70f3a79d7b8d53 100644 (file)
--- a/glibc-morelocales.patch
+++ b/glibc-morelocales.patch
@@ -1828,7 +1828,7 @@ diff -urN glibc-2.6.org/localedata/locales/sw_UG glibc-2.6/localedata/locales/sw
  ts_ZA/UTF-8 \
 +tt_RU.KOI8-K/KOI8-K \
  tt_RU.UTF-8/UTF-8 \
- tt_RU@iqtelif.UTF-8/UTF-8 \
+ tt_RU.UTF-8@iqtelif/UTF-8 \
 +tt_RU/TATAR-CYR \
  ug_CN/UTF-8 \
  uk_UA.UTF-8/UTF-8 \

diff --git a/glibc.spec b/glibc.spec
index 1e5386f58a8c0a1637fed2338b81eb7be26b7de6..90a4ef62190301aacca9ddcd483475fa1b30dd66 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -20,6 +20,7 @@
 %undefine      with_memusage
 %endif
 
+%define                ports_version   2.12
 %define                llh_version     7:2.6.20.4-1
 
 Summary:       GNU libc
@@ -32,16 +33,15 @@ Summary(ru.UTF-8):  GNU libc версии
 Summary(tr.UTF-8):     GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
-Version:       2.12
-Release:       4
+Version:       2.12.1
+Release:       1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
-# Source0:     ftp://sources.redhat.com/pub/glibc/releases/%{name}-%{version}.tar.bz2
-Source0:       %{name}-%{version}.tar.bz2
-# Source0-md5: 37526f1337474dffcf9cda5292957c24
+Source0:       http://ftp.gnu.org/pub/gnu/glibc/%{name}-%{version}.tar.xz
+# Source0-md5: 4802b783766b5b487c601a19b5ce35f1
 # Source1:     ftp://sources.redhat.com/pub/glibc/releases/%{name}-ports-%{version}.tar.bz2
-Source1:       %{name}-ports-%{version}.tar.bz2
+Source1:       %{name}-ports-%{ports_version}.tar.bz2
 # Source1-md5: edbf6b9a5b9aa2c441d78343fe282c64
 Source2:       nscd.init
 Source3:       nscd.sysconfig
@@ -74,7 +74,6 @@ Patch23:      %{name}-pt_pax.patch
 Patch25:       %{name}-cv_gnu89_inline.patch
 Patch26:       %{name}-posix-sh.patch
 Patch27:       %{name}-i686.patch
-Patch28:       %{name}-dl.patch
 Patch29:       %{name}-arm-alignment-fix.patch
 URL:           http://www.gnu.org/software/libc/
 %{?with_selinux:BuildRequires: audit-libs-devel}
@@ -896,7 +895,7 @@ Zabawka.
 
 %prep
 %setup -q -a1
-mv %{name}-ports-%{version} ports
+mv %{name}-ports-%{ports_version} ports
 #%patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -920,7 +919,6 @@ mv %{name}-ports-%{version} ports
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
-%patch28 -p1
 %patch29 -p1
 
 # cleanup backups after patching