From 9dc918bfdab6dcf7055a54eb4631ec7eae8ace1b Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mar 29 2018 10:53:37 +0000 Subject: Auto-sync with upstream branch release/2.27/master Upstream commit: 55ad82e45c313454de657931898e974a7a036cad - i386: Fix memmove issue (swbz#22644) - RISC-V: fmax/fmin: Handle signalling NaNs correctly (swbz#22884) - RISC-V: Do not initialize $gp in TLS macros - cs_CZ locale: Add alternative month names (swbz#22963) - Greek (el_CY, el_GR) locales: Introduce ab_alt_mon (swbz#22937) - lt_LT locale: Update abbreviated month names (swbz#22932) - ca_ES locale: Update LC_TIME (swbz#22848) - i386: Fix i386 sigaction sa_restorer initialization (swbz#21269) - Fix multiple definitions of __nss_*_database (swbz#22918) - Fix netgroup cache keys (swbz#22342) - linux/powerpc: sync sys/ptrace.h with Linux 4.15 (swbz#22433, swbz#22807) - powerpc: Undefine Linux ptrace macros that conflict with __ptrace_request - Add missing “reorder-end” in LC_COLLATE of et_EE (swbz#22517) - linux/aarch64: sync sys/ptrace.h with Linux 4.15 (swbz#22433) - [RISC-V] Fix parsing flags in ELF64 files (swbz#22827) --- diff --git a/glibc-collation-cldr-14.patch b/glibc-collation-cldr-14.patch index 413a704..5bc6504 100644 --- a/glibc-collation-cldr-14.patch +++ b/glibc-collation-cldr-14.patch @@ -80978,7 +80978,7 @@ index 03732a01d3f431ff..5ea04787b2f48e3b 100644 LC_MESSAGES diff --git a/localedata/locales/ca_ES b/localedata/locales/ca_ES -index 914c066dabff526b..c20d393c2a334286 100644 +index f0d744d53729faf7..5d8297823e530d3b 100644 --- a/localedata/locales/ca_ES +++ b/localedata/locales/ca_ES @@ -49,21 +49,7 @@ category "i18n:2012";LC_MEASUREMENT @@ -81158,7 +81158,7 @@ index c27d54ccfd38b621..b2ac8c66d78521b0 100644 reorder-end diff --git a/localedata/locales/cs_CZ b/localedata/locales/cs_CZ -index f80d3e1b37f72a5b..16a2b02972fd4e80 100644 +index 8f4c69e4934e262f..41fbd2be934604bd 100644 --- a/localedata/locales/cs_CZ +++ b/localedata/locales/cs_CZ @@ -142,6 +142,17 @@ LC_COLLATE @@ -84624,7 +84624,7 @@ index c66d574b5297d42e..42f67670d02d3763 100644 LC_CTYPE diff --git a/localedata/locales/et_EE b/localedata/locales/et_EE -index 9cb55b568f343975..f5c47149a6288beb 100644 +index bab7493c98722c38..f5c47149a6288beb 100644 --- a/localedata/locales/et_EE +++ b/localedata/locales/et_EE @@ -63,6 +63,7 @@ copy "iso14651_t1" @@ -84635,7 +84635,7 @@ index 9cb55b568f343975..f5c47149a6288beb 100644 collating-symbol collating-symbol collating-symbol -@@ -80,28 +81,30 @@ reorder-after +@@ -80,28 +81,28 @@ reorder-after @@ -84676,10 +84676,8 @@ index 9cb55b568f343975..f5c47149a6288beb 100644 + ;;;IGNORE % Ö + ;;;IGNORE % ü + ;;;IGNORE % Ü -+ -+reorder-end - END LC_COLLATE + reorder-end diff --git a/localedata/locales/fa_IR b/localedata/locales/fa_IR index 06270c0548c30c4d..3714a30932189ab4 100644 @@ -87590,7 +87588,7 @@ index 00fff2ddca8bfaa5..ed6404a1e5ea1a6e 100644 reorder-end END LC_COLLATE diff --git a/localedata/locales/lt_LT b/localedata/locales/lt_LT -index c935fcf75e0fcfaf..6497ad739fcbcc01 100644 +index bec67726e9b3d213..e9834bd2003123da 100644 --- a/localedata/locales/lt_LT +++ b/localedata/locales/lt_LT @@ -117,42 +117,42 @@ collating-symbol diff --git a/glibc-rh1452750-libidn2.patch b/glibc-rh1452750-libidn2.patch index 38c17a3..26bc165 100644 --- a/glibc-rh1452750-libidn2.patch +++ b/glibc-rh1452750-libidn2.patch @@ -88,10 +88,10 @@ index 80f7f1487947f578..b29efe01084af28c 100644 Copyright (C) 1998 WIDE Project. diff --git a/config.h.in b/config.h.in -index d928e7dd867c68ce..d55a3c3834f91a0d 100644 +index b0b7cf26cb4b3aa0..141db213a9046eb4 100644 --- a/config.h.in +++ b/config.h.in -@@ -119,9 +119,6 @@ +@@ -124,9 +124,6 @@ /* Mach/i386 specific: define if the `i386_set_gdt' RPC is available. */ #undef HAVE_I386_SET_GDT @@ -19463,10 +19463,10 @@ index c7e67ca563f87627..0000000000000000 - return stringprep_convert (str, stringprep_locale_charset (), "UTF-8"); -} diff --git a/manual/contrib.texi b/manual/contrib.texi -index fbf42db31df08e3b..f2a38459856a67ae 100644 +index 0da6dcbb596f7608..2be9122469bd91c8 100644 --- a/manual/contrib.texi +++ b/manual/contrib.texi -@@ -176,7 +176,7 @@ software floating-point support and for +@@ -178,7 +178,7 @@ software floating-point support and for his direction as part of @theglibc{} steering committee. @item @@ -19476,16 +19476,19 @@ index fbf42db31df08e3b..f2a38459856a67ae 100644 @item Geoffrey Keating for the port to Linux on PowerPC diff --git a/nscd/gai.c b/nscd/gai.c -index d00a184c46cc0dd7..eb53bd7889ca3fea 100644 +index 576fd0045b4abf36..24bdfee1db3791e2 100644 --- a/nscd/gai.c +++ b/nscd/gai.c -@@ -40,6 +40,3 @@ +@@ -42,9 +42,6 @@ /* Support code. */ #include #include -#ifdef HAVE_LIBIDN -# include -#endif + + /* Some variables normally defined in libc. */ + service_user *__nss_hosts_database attribute_hidden; diff --git a/resolv/Makefile b/resolv/Makefile index 6e70ae9f6b4a29a9..ea395ac3eb4332e1 100644 --- a/resolv/Makefile diff --git a/glibc.spec b/glibc.spec index b8d9b95..3684838 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.27-5-g56170e064e +%define glibcsrcdir glibc-2.27-36-g55ad82e45c %define glibcversion 2.27 -%define glibcrelease 6%{?dist} +%define glibcrelease 7%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -1963,6 +1963,25 @@ fi %endif %changelog +* Thu Mar 29 2018 Florian Weimer - 2.27-7 +- Auto-sync with upstream branch release/2.27/master, + commit 55ad82e45c313454de657931898e974a7a036cad: +- i386: Fix memmove issue (swbz#22644) +- RISC-V: fmax/fmin: Handle signalling NaNs correctly (swbz#22884) +- RISC-V: Do not initialize $gp in TLS macros +- cs_CZ locale: Add alternative month names (swbz#22963) +- Greek (el_CY, el_GR) locales: Introduce ab_alt_mon (swbz#22937) +- lt_LT locale: Update abbreviated month names (swbz#22932) +- ca_ES locale: Update LC_TIME (swbz#22848) +- i386: Fix i386 sigaction sa_restorer initialization (swbz#21269) +- Fix multiple definitions of __nss_*_database (swbz#22918) +- Fix netgroup cache keys (swbz#22342) +- linux/powerpc: sync sys/ptrace.h with Linux 4.15 (swbz#22433, swbz#22807) +- powerpc: Undefine Linux ptrace macros that conflict with __ptrace_request +- Add missing “reorder-end” in LC_COLLATE of et_EE (swbz#22517) +- linux/aarch64: sync sys/ptrace.h with Linux 4.15 (swbz#22433) +- [RISC-V] Fix parsing flags in ELF64 files (swbz#22827) + * Fri Mar 2 2018 Florian Weimer - 2.27-6 - Collation update and sync with CLDR (#1551009) diff --git a/sources b/sources index 3d4272b..ea30e0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.27-5-g56170e064e.tar.gz) = de3d8d1c847a7042e813dd56d4b2aa3950fc391579fc40ab4e9a7ebea279593e01326752c11484a78edb4734ea6408872580fa2147bb4ea8abc0bf1c9f08c7df +SHA512 (glibc-2.27-36-g55ad82e45c.tar.gz) = 4cd6d85523b45c1891a6490e94d2defe2af7cb393ba3250069c960adb6c1d7120b797ec15202671d6813c85236e7dba7196bbcc9574dfce17a853ab81298d668