diff --git a/.gitignore b/.gitignore deleted file mode 100644 index ccaf9cd..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/glibc-2.24-40-gbf79a33.tar.gz diff --git a/glibc.spec b/glibc.spec index 255fb55..d82448e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.24-47-gf792117 +%define glibcsrcdir glibc-2.24-69-gd9067fc %define glibcversion 2.24.90 -%define glibcrelease 2%{?dist} +%define glibcrelease 3%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -2266,6 +2266,13 @@ rm -f *.filelist* %endif %changelog +* Wed Aug 17 2016 Florian Weimer - 2.24.90-3 +- Auto-sync with upstream master, + commit d9067fca40b8aac156d73cfa44d6875813555a6c, with these changes: +- Avoid duplicating object files already in libc.a (#1352625) +- CVE-2016-6323: Backtraces can hang on ARM EABI (32-bit) (swbz#20435) +- et_EE: locale has wrong {p,n}_cs_precedes value (swbz#20459 + * Thu Aug 11 2016 Florian Weimer - 2.24.90-2 - Auto-sync with upstream master, commit f79211792127f38d5954419bb3784c8eb7f5e4e5 diff --git a/sources b/sources index 916c283..abd2b43 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9992aa4e6889e78895f27ea0b175eff7 glibc-2.24-47-gf792117.tar.gz +7fec2a6802f12b384722e41b18578953 glibc-2.24-69-gd9067fc.tar.gz