[packages/glibc] - partial update to glibc 2.18
arekm
arekm at pld-linux.org
Tue Aug 13 09:43:03 CEST 2013
commit 48876fe61fcfadc4e8533852343508ba2f8b2662
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Aug 13 09:42:57 2013 +0200
- partial update to glibc 2.18
glibc-bug-12492.patch | 15 ---------------
glibc-git.patch | 21 ---------------------
glibc-missing-nls.patch | 30 ------------------------------
glibc-new-charsets.patch | 11 +++++------
glibc-posix-sh.patch | 4 ++--
glibc-sotruss-sh.patch | 2 +-
glibc.spec | 17 +++++++++--------
7 files changed, 17 insertions(+), 83 deletions(-)
---
diff --git a/glibc.spec b/glibc.spec
index 2a62e9f..4fbcbd5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -21,7 +21,7 @@
%undefine with_memusage
%endif
-%define core_version 2.17
+%define core_version 2.18
%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: 87bf675c8ee523ebda4803e8e1cec638
+# Source0-md5: 88fbbceafee809e82efd52efa1e3c58f
Source2: nscd.init
Source3: nscd.sysconfig
Source4: nscd.logrotate
@@ -64,7 +64,7 @@ Patch9: %{name}-java-libc-wait.patch
Patch10: %{name}-info.patch
Patch11: %{name}-autoconf.patch
Patch12: %{name}-format.patch
-Patch13: %{name}-git.patch
+
Patch14: %{name}-sparc-errno_fix.patch
Patch15: %{name}-new-charsets.patch
Patch16: %{name}-tzfile-noassert.patch
@@ -79,7 +79,7 @@ Patch25: %{name}-cv_gnu89_inline.patch
Patch26: %{name}-posix-sh.patch
Patch29: %{name}-arm-alignment-fix.patch
-Patch30: %{name}-bug-12492.patch
+
Patch31: %{name}-origin.patch
Patch32: %{name}-Os-fail-workaround.patch
@@ -947,12 +947,13 @@ exit 1
%patch10 -p1
%patch11 -p1
%patch12 -p1
-%patch13 -p1
+
%patch14 -p0
%patch15 -p1
%patch16 -p1
%patch17 -p1
-%patch18 -p1
+# FIXME
+#%patch18 -p1
%patch19 -p1
%patch20 -p1
%{?with_cross:%patch21 -p1}
@@ -963,7 +964,7 @@ exit 1
%patch26 -p1
%patch29 -p1
-%patch30 -p0
+
%patch31 -p1
%patch32 -p1
diff --git a/glibc-bug-12492.patch b/glibc-bug-12492.patch
deleted file mode 100644
index 2d0c129..0000000
--- a/glibc-bug-12492.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- elf/dl-load.c 2011-01-26 22:02:02.000000000 +0100
-+++ elf/dl-load.c 2011-01-26 22:30:22.000000000 +0100
-@@ -1398,7 +1398,11 @@
- if (__builtin_expect (p + s <= relro_end, 1))
- {
- /* The variable lies in the region protected by RELRO. */
-- __mprotect ((void *) p, s, PROT_READ|PROT_WRITE);
-+ if (__mprotect ((void *) p, s, PROT_READ|PROT_WRITE) < 0)
-+ {
-+ errstring = N_("cannot change memory protections");
-+ goto call_lose_errno;
-+ }
- __stack_prot |= PROT_READ|PROT_WRITE|PROT_EXEC;
- __mprotect ((void *) p, s, PROT_READ);
- }
diff --git a/glibc-git.patch b/glibc-git.patch
deleted file mode 100644
index ab801b0..0000000
--- a/glibc-git.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0b57daebab36f59af1d2a02616ee636a7b13ba12
-Author: Siddhesh Poyarekar <siddhesh at redhat.com>
-Date: Fri Jan 18 14:16:25 2013 +0530
-
- Fix application of the exception mask
-
- Fixes BZ #14496.
-
-diff --git a/sysdeps/i386/fpu/fenv_private.h b/sysdeps/i386/fpu/fenv_private.h
-index 03f4c97..1f8336c 100644
---- a/sysdeps/i386/fpu/fenv_private.h
-+++ b/sysdeps/i386/fpu/fenv_private.h
-@@ -176,7 +176,7 @@ libc_feupdateenv_test_sse (fenv_t *e, int ex)
-
- /* Raise SIGFPE for any new exceptions since the hold. Expect that
- the normal environment has all exceptions masked. */
-- if (__builtin_expect ((old_mxcsr >> 7) & cur_ex, 0))
-+ if (__glibc_unlikely (~(old_mxcsr >> 7) & cur_ex))
- __feraiseexcept (cur_ex);
-
- /* Test for exceptions raised since the hold. */
diff --git a/glibc-missing-nls.patch b/glibc-missing-nls.patch
index b21d98a..484ce3a 100644
--- a/glibc-missing-nls.patch
+++ b/glibc-missing-nls.patch
@@ -18,34 +18,4 @@
(void) memset ((char *) &cmd, 0, sizeof (struct commandline));
clear_args ();
if (!parseargs (argc, argv, &cmd))
---- glibc-2.3.1/argp/argp-parse.c.orig Mon Apr 8 10:19:12 2002
-+++ glibc-2.3.1/argp/argp-parse.c Mon Nov 11 14:09:28 2002
-@@ -99,8 +99,8 @@
- {
- {"help", '?', 0, 0, N_("Give this help list"), -1},
- {"usage", OPT_USAGE, 0, 0, N_("Give a short usage message")},
-- {"program-name",OPT_PROGNAME,"NAME", OPTION_HIDDEN, N_("Set the program name")},
-- {"HANG", OPT_HANG, "SECS", OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
-+ {"program-name",OPT_PROGNAME,N_("NAME"), OPTION_HIDDEN, N_("Set the program name")},
-+ {"HANG", OPT_HANG, N_("SECS"), OPTION_ARG_OPTIONAL | OPTION_HIDDEN,
- N_("Hang for SECS seconds (default 3600)")},
- {0, 0}
- };
---- glibc-2.4/po/pl.po.orig 2006-06-30 23:24:08.618916500 +0200
-+++ glibc-2.4/po/pl.po 2006-06-30 23:30:04.281144000 +0200
-@@ -67,9 +67,13 @@
- msgid "Set the program name"
- msgstr "Określenie nazwy programu"
-
-+#: argp/argp-parse.c:105
-+msgid "SECS"
-+msgstr "SEK"
-+
- #: argp/argp-parse.c:105
- msgid "Hang for SECS seconds (default 3600)"
--msgstr "Zatrzymanie na SECS sekund (domyślnie 3600)"
-+msgstr "Zatrzymanie na SEK sekund (domyślnie 3600)"
-
- #: argp/argp-parse.c:166
- msgid "Print program version"
diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch
index bf8fdaf..02b628b 100644
--- a/glibc-new-charsets.patch
+++ b/glibc-new-charsets.patch
@@ -733,15 +733,14 @@ diff -uNr libc/localedata/charmaps/ISIRI-3342 libc.charsets/localedata/charmaps/
% source: Iranian standard ISIRI 3342 (1993)
% author: Pablo Saratxaga, and Roozbeh Pournader
% email: pablo at mandrakesoft.com, roozbeh at sina.sharif.ac.ir
--
-+
+
+% Changes from 0.2 to 0.3:
+%
-+% Changed the mnemonic for 0xA6 from <.+> to <.a>
++% Changed the mnemonic for 0xA6 from <.+> to <.a>
+%
-+% Exchanged the Unicode equilavents for 0xE6 and 0xE7, to reflect
-+% the change in the mirroring behaviour of U+00AB and U+00BB
-+% between versions 2.1.5 and 2.1.8 of the Unicode Standard.
++% Exchanged the Unicode equilavents for 0xE6 and 0xE7, to reflect
++% the change in the mirroring behaviour of U+00AB and U+00BB
++% between versions 2.1.5 and 2.1.8 of the Unicode Standard.
+
% I think the mnemonic for upper space (0xA0) should be different from
% lower space (0x20). Because the semantics are different, although they
diff --git a/glibc-posix-sh.patch b/glibc-posix-sh.patch
index daacd53..6e862d4 100644
--- a/glibc-posix-sh.patch
+++ b/glibc-posix-sh.patch
@@ -3,7 +3,7 @@
@@ -1,4 +1,4 @@
-#! @BASH@
+#! /bin/sh
- # Copyright (C) 1996-2011, 2012 Free Software Foundation, Inc.
+ # Copyright (C) 1996-2013 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.
- " "2012"
+ " "2013"
- printf $"Written by %s and %s.
+ printf "Written by %s and %s.
" "Roland McGrath" "Ulrich Drepper"
diff --git a/glibc-sotruss-sh.patch b/glibc-sotruss-sh.patch
index 1cb0c4f..a301c1e 100644
--- a/glibc-sotruss-sh.patch
+++ b/glibc-sotruss-sh.patch
@@ -4,6 +4,6 @@ Despite ksh shebang, sotruss is apparently bash script (function keyword, $"" NL
@@ -1,4 +1,4 @@
-#! @KSH@
+#! /bin/bash
- # Copyright (C) 2011, 2012 Free Software Foundation, Inc.
+ # Copyright (C) 2011-2013 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/glibc.git/commitdiff/48876fe61fcfadc4e8533852343508ba2f8b2662
More information about the pld-cvs-commit
mailing list