diff --git a/glibc-rh1592270.patch b/glibc-rh1592270.patch new file mode 100644 index 0000000..1bc7bfd --- /dev/null +++ b/glibc-rh1592270.patch @@ -0,0 +1,33 @@ +commit 14beef7575099f6373f9a45b4656f1e3675f7372 +Author: Florian Weimer +Date: Thu Jun 14 22:34:09 2018 +0200 + + localedata: Make IBM273 compatible with ISO-8859-1 [BZ #23290] + + Reviewed-by: Carlos O'Donell + +diff --git a/iconvdata/ibm273.c b/iconvdata/ibm273.c +index c303cf306db56d81..132c06f0eb629f6e 100644 +--- a/iconvdata/ibm273.c ++++ b/iconvdata/ibm273.c +@@ -23,6 +23,6 @@ + #define TABLES + + #define CHARSET_NAME "IBM273//" +-#define HAS_HOLES 1 /* Not all 256 character are defined. */ ++#define HAS_HOLES 0 + + #include <8bit-gap.c> +diff --git a/localedata/charmaps/IBM273 b/localedata/charmaps/IBM273 +index c3f70e2a6f7c4595..4401101b5013c706 100644 +--- a/localedata/charmaps/IBM273 ++++ b/localedata/charmaps/IBM273 +@@ -194,7 +194,7 @@ CHARMAP + /xb9 VULGAR FRACTION THREE QUARTERS + /xba NOT SIGN + /xbb VERTICAL LINE +- /xbc OVERLINE ++ /xbc MACRON + /xbd DIAERESIS + /xbe ACUTE ACCENT + /xbf MULTIPLICATION SIGN diff --git a/glibc.spec b/glibc.spec index 95560da..bb3f086 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ %define glibcsrcdir glibc-2.27-63-g80c83e9114 %define glibcversion 2.27 -%define glibcrelease 17%{?dist} +%define glibcrelease 18%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -236,6 +236,7 @@ Patch2055: glibc-collation-cldr-13.patch Patch2056: glibc-collation-cldr-14.patch Patch2057: glibc-collation-cldr-15.patch Patch2058: glibc-python3.patch +Patch2059: glibc-rh1592270.patch ############################################################################## # End of glibc patches. @@ -779,6 +780,7 @@ microbenchmark tests on the system. %patch2056 -p1 %patch2057 -p1 %patch2058 -p1 +%patch2059 -p1 ############################################################################## # %%prep - Additional prep required... @@ -1974,6 +1976,9 @@ fi %endif %changelog +* Mon Jun 18 2018 Florian Weimer - 2.27-18 +- iconv: Make IBM273 equivalent to ISO-8859-1 (#1592270) + * Mon Jun 18 2018 Florian Weimer - 2.27-17 - Align build flags inheritance with master (downstream only)