From 82db94894e53df4bc9da3922f0b368aa0817cf57 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Sun, 21 Aug 2016 16:48:12 +0200 Subject: [PATCH] Auto-sync with upstream master Upstream commit: 66abf9bfbe24ac1e7207d26ccad725ed938dc52c --- glibc.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index d82448e..c787c7a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.24-69-gd9067fc +%define glibcsrcdir glibc-2.24-86-g66abf9b %define glibcversion 2.24.90 -%define glibcrelease 3%{?dist} +%define glibcrelease 4%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -2266,6 +2266,11 @@ rm -f *.filelist* %endif %changelog +* Sun Aug 21 2016 Florian Weimer - 2.24.90-4 +- Auto-sync with upstream master, + commit 66abf9bfbe24ac1e7207d26ccad725ed938dc52c, fixing: +- argp: Do not override GCC keywords with macros (#1366830) + * Wed Aug 17 2016 Florian Weimer - 2.24.90-3 - Auto-sync with upstream master, commit d9067fca40b8aac156d73cfa44d6875813555a6c, with these changes: diff --git a/sources b/sources index abd2b43..089f04f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fec2a6802f12b384722e41b18578953 glibc-2.24-69-gd9067fc.tar.gz +10a95e88867a907ac3c90e1d0d5f265c glibc-2.24-86-g66abf9b.tar.gz