From bb83f920be3ae02a1ba179b08072281ac0cff3ab Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 4 Dec 2017 13:59:23 +0100 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: 7863a7118112fe502e8020a0db0fa74fef281f29 - math: New generic sinf (swbz#5997) - is_IS locale: Base collation on iso14651_t1 (swbz#22519) - intl: Improve reproducibility by using bison (swbz#22432) - sr_RS, bs_BA locales: make collation rules the same as for hr_HR (wbz#22534) - hr_HR locale: various updates (swbz#10580) - x86: Make a space in jmpbuf for shadow stack pointer - malloc: Fix integer overflow when tcache is enabled (swbz#22375) - locale: make forward accent sorting the default in collating (swbz#17750) --- glibc.spec | 20 ++++++++++++++++++-- sources | 2 +- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index 154aa7c..eae6918 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.26.9000-853-ga55430cb0e +%define glibcsrcdir glibc-2.26.9000-911-g7863a71181 %define glibcversion 2.26.9000 -%define glibcrelease 29%{?dist} +%define glibcrelease 30%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -309,6 +309,9 @@ Conflicts: kernel < %{enablekernel} # GNU make 4.0 introduced the -O option. BuildRequires: make >= 4.0 +# The intl subsystem generates a parser using bison. +BuildRequires: bison >= 2.7 + BuildRequires: binutils >= 2.25 # Earlier releases have broken support for IRELATIVE relocations Conflicts: prelink < 0.4.2 @@ -2117,6 +2120,19 @@ fi %endif %changelog +* Mon Dec 04 2017 Florian Weimer - 2.26.9000-30 +- Add build dependency on bison +- Auto-sync with upstream branch master, + commit 7863a7118112fe502e8020a0db0fa74fef281f29: +- math: New generic sinf (swbz#5997) +- is_IS locale: Base collation on iso14651_t1 (swbz#22519) +- intl: Improve reproducibility by using bison (swbz#22432) +- sr_RS, bs_BA locales: make collation rules the same as for hr_HR (wbz#22534) +- hr_HR locale: various updates (swbz#10580) +- x86: Make a space in jmpbuf for shadow stack pointer +- malloc: Fix integer overflow when tcache is enabled (swbz#22375) +- locale: make forward accent sorting the default in collating (swbz#17750) + * Wed Nov 29 2017 Florian Weimer - 2.26.9000-29 - Enable -fstack-clash-protection (#1512531) - Auto-sync with upstream branch master, diff --git a/sources b/sources index 979fd09..beb9e50 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.26.9000-853-ga55430cb0e.tar.gz) = 0f2bba65a4837cff3bbc2a3b833b7278a7f18875ce150169254c0379fdf85383519b6d65069a0dd05b301ebb6f9d754962db3a7d5c997ade4908cf7fd7240827 +SHA512 (glibc-2.26.9000-911-g7863a71181.tar.gz) = 3f4a684e7185ec394d706096d2a1ac7468a5a9c98c76790065967d5c9a71514063d011c7384f962633b4c41ee9110f1f1c54e10f541f1b74fb13c0e6bc37bf28