From 4283de10b68068003b98869faf2f7f0cf3210b82 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 18 Jun 2018 13:02:53 +0200 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: 14beef7575099f6373f9a45b4656f1e3675f7372 - iconv: Make IBM273 equivalent to ISO-8859-1 (#1592270) --- glibc.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/glibc.spec b/glibc.spec index 9f6b2a5..a50b8a7 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.27.9000-432-g104502102c +%define glibcsrcdir glibc-2.27.9000-469-g14beef7575 %define glibcversion 2.27.9000 -%define glibcrelease 23%{?dist} +%define glibcrelease 24%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1857,6 +1857,11 @@ fi %endif %changelog +* Mon Jun 18 2018 Florian Weimer - 2.27.9000-24 +- Auto-sync with upstream branch master, + commit 14beef7575099f6373f9a45b4656f1e3675f7372: +- iconv: Make IBM273 equivalent to ISO-8859-1 (#1592270) + * Mon Jun 18 2018 Florian Weimer - 2.27.9000-23 - Inherit the -msse2 build flag as well (#1592212) diff --git a/sources b/sources index 83072c0..70ba4db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.27.9000-432-g104502102c.tar.gz) = 8f6df2630b287f0a5a55d3c929d3361b2a076f421f7f7ea719632703203da6662532d80f934bb89aea3e33119f0024270db56299726849c8390af75711c213c3 +SHA512 (glibc-2.27.9000-469-g14beef7575.tar.gz) = d45f765d1fe462ff13b0eea6f91399071cf8139fd15033a7b3f58ccf977e4ba392851da71655030b0ff8b92c2b998fbbc8f7a9f376b1d279b5dbda6f02e62d2e