- update to 2.19; two ugly locale patches missing

diff --git a/glibc-cv_gnu89_inline.patch b/glibc-cv_gnu89_inline.patch
index 2b611063e30c1cc10b960bb299debee006fee956..e468d40c10928927ae1d4fb7ab48f2bacbd91ab8 100644 (file)
--- a/glibc-cv_gnu89_inline.patch
+++ b/glibc-cv_gnu89_inline.patch
@@ -1,5 +1,5 @@
---- glibc-2.12.2/configure.in~ 2010-12-13 11:47:26.000000000 +0100
-+++ glibc-2.12.2/configure.in  2010-12-19 11:04:54.011123038 +0100
+--- glibc-2.12.2/configure.ac~ 2010-12-13 11:47:26.000000000 +0100
++++ glibc-2.12.2/configure.ac  2010-12-19 11:04:54.011123038 +0100
 @@ -1786,7 +1786,7 @@
    libc_cv_gnu89_inline=no
  fi

diff --git a/glibc-hack-strstr.patch b/glibc-hack-strstr.patch
deleted file mode 100644 (file)
index 6149f88..0000000
--- a/glibc-hack-strstr.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sysdeps/x86_64/multiarch/strstr.c b/sysdeps/x86_64/multiarch/strstr.c
-index cd63b68..03d8b9a 100644
---- a/sysdeps/x86_64/multiarch/strstr.c
-+++ b/sysdeps/x86_64/multiarch/strstr.c
-@@ -86,7 +86,7 @@
- /* Simple replacement of movdqu to address 4KB boundary cross issue.
-    If EOS occurs within less than 16B before 4KB boundary, we don't
-    cross to next page.  */
--static __m128i
-+static inline __m128i
- __m128i_strloadu (const unsigned char * p, __m128i zero)
- {
-   if (__builtin_expect ((int) ((size_t) p & 0xfff) > 0xff0, 0))

diff --git a/glibc-make-ver.patch b/glibc-make-ver.patch
deleted file mode 100644 (file)
index 586bc41..0000000
--- a/glibc-make-ver.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure.in b/configure.in
-index 61c6f69..e603be5 100644
---- a/configure.in
-+++ b/configure.in
-@@ -989,7 +989,7 @@ AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
-   critic_missing="$critic_missing gcc")
- AC_CHECK_PROG_VER(MAKE, gnumake gmake make, --version,
-   [GNU Make[^0-9]*\([0-9][0-9.]*\)],
--  [3.79* | 3.[89]*], critic_missing="$critic_missing make")
-+  [3.79* | 3.[89]* | 4.*], critic_missing="$critic_missing make")
- 
- AC_CHECK_PROG_VER(MSGFMT, gnumsgfmt gmsgfmt msgfmt, --version,
-   [GNU gettext.* \([0-9]*\.[0-9.]*\)],

diff --git a/glibc-posix-sh.patch b/glibc-posix-sh.patch
index 6e862d4f3f9f124e3aad355ef67607df5ea07e41..01f356f8f65fa6a9b7f5359ab76681d12517d1b7 100644 (file)
--- a/glibc-posix-sh.patch
+++ b/glibc-posix-sh.patch
@@ -3,7 +3,7 @@
 @@ -1,4 +1,4 @@
 -#! @BASH@
 +#! /bin/sh
- # Copyright (C) 1996-2013 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2014 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  
 @@ -35,16 +35,16 @@
@@ -14,7 +14,7 @@
 +    printf "Copyright (C) %s Free Software Foundation, Inc.
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- " "2013"
+ " "2014"
 -    printf $"Written by %s and %s.
 +    printf "Written by %s and %s.
  " "Roland McGrath" "Ulrich Drepper"
@@ -54,22 +54,7 @@
      exit 1
      ;;
    *)
-@@ -112,20 +112,14 @@
- # environments where the executed program might not have permissions
- # to write to the console/tty.  But only bash 3.x supports the pipefail
- # option, and we don't bother to handle the case for older bash versions.
--if set -o pipefail 2> /dev/null; then
--  try_trace() {
--    eval $add_env '"$@"' | cat
--  }
--else
--  try_trace() {
--    eval $add_env '"$@"'
--  }
--fi
-+try_trace() {
-+  eval $add_env '"$@"'
-+}
+@@ -121,8 +121,8 @@
  
  case $# in
  0)

diff --git a/glibc-sotruss-sh.patch b/glibc-sotruss-sh.patch
index da873487ce4f41b8cfa2e246d11ed3a2cc8c38a9..9d4ca45bb1e08f5ae2fddcda1ba8b5c2df67e5de 100644 (file)
--- a/glibc-sotruss-sh.patch
+++ b/glibc-sotruss-sh.patch
@@ -5,6 +5,6 @@ However mksh also accepts this syntax leaving strings untranslated.
 @@ -1,4 +1,4 @@
 -#! @KSH@
 +#! /bin/mksh
- # Copyright (C) 2011-2013 Free Software Foundation, Inc.
+ # Copyright (C) 2011-2014 Free Software Foundation, Inc.
  # This file is part of the GNU C Library.
  

diff --git a/glibc.spec b/glibc.spec
index 9d6f72a48c4fb3e8216eba9ee6c2c39224f95998..b5b60105a472b0d0d31a9a82298a23074358c277 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -21,7 +21,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.18
+%define                core_version    2.19
 %define                llh_version     7:2.6.20.4-1
 
 Summary:       GNU libc
@@ -35,12 +35,12 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       7
+Release:       0.1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 88fbbceafee809e82efd52efa1e3c58f
+# Source0-md5: e26b8cc666b162f999404b03970f14e4
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -84,8 +84,6 @@ Patch29:      %{name}-arm-alignment-fix.patch
 
 Patch31:       %{name}-origin.patch
 Patch32:       %{name}-Os-fail-workaround.patch
-Patch33:       %{name}-hack-strstr.patch
-Patch34:       %{name}-make-ver.patch
 
 Patch38:       1055_all_glibc-resolv-dynamic.patch
 URL:           http://www.gnu.org/software/libc/
@@ -955,8 +953,9 @@ exit 1
 %patch14 -p0
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
-%patch18 -p1
+# DROP THESE TWO PATCHES OR MERGE UPSTREAM
+#%patch17 -p1
+#%patch18 -p1
 %patch19 -p1
 %patch20 -p1
 %{?with_cross:%patch21 -p1}
@@ -971,8 +970,6 @@ exit 1
 
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1
-%patch34 -p1
 
 %patch38 -p1
 
@@ -1100,8 +1097,6 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so     $RPM_BUILD_ROOT%{_libdir}
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
 rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 
-ln -sf libbsd-compat.a         $RPM_BUILD_ROOT%{_libdir}/libbsd.a
-
 # make symlinks across top-level directories absolute
 for l in BrokenLocale anl cidn crypt dl m nsl resolv rt thread_db util; do
        test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
@@ -1679,8 +1674,6 @@ fi
 %{_libdir}/libc.so
 %{_libdir}/libpthread.so
 # static-only libs
-%{_libdir}/libbsd-compat.a
-%{_libdir}/libbsd.a
 %{_libdir}/libc_nonshared.a
 %{_libdir}/libg.a
 %{_libdir}/libieee.a