From ebf75398f06dd27357d8a5321e8e5959633b8182 Mon Sep 17 00:00:00 2001 From: Patsy Franklin Date: Wed, 6 Nov 2019 15:01:44 -0500 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: 2a0356e1191804d57005e1cfe2a72f019b7a8cce - posix: Sync regex with gnulib - Add mnw language code [BZ #25139] - Add new locale: mnw_MM (Mon language spoken in Myanmar) [BZ #25139] - S390: Fp comparison are now raising FE_INVALID with gcc 10. - linux: pselect: Remove CALL_PSELECT6 macro - Fix run-one-test so that it runs elf tests - nptl: Fix niggles with pthread_clockjoin_np - hppa: Align __clone stack argument to 8 bytes (Bug 25066) - y2038: linux: Provide __futimens64 implementation - y2038: linux: Provide __utimensat64 implementation - nptl: Add pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test - nptl: Add pthread_clockjoin_np - manual: Add documentation for pthread_tryjoin_np and pthread_timedjoin_np - nptl: Convert tst-join3 to use libsupport - Sync time/mktime.c with gnulib - Sync timespec-{add,sub} with gnulib - Sync intprops.h with gnulib - Refactor adjtimex based on clock_adjtime - Refactor PI mutexes internal definitions - Remove pause and nanosleep not cancel wrappers - nptl: Replace non cancellable pause/nanosleep with futex - Consolidate lowlevellock-futex.h - Consolidate futex-internal.h - Base max_fast on alignment, not width, of bins (Bug 24903) - Revise the documentation of simple calendar time. - Make second argument of gettimeofday as 'void *' - Use clock_gettime to implement gettimeofday. - Use clock_gettime to implement timespec_get. - Consolidate and deprecate ftime - Change most internal uses of time to __clock_gettime. - Use clock_gettime to implement time. - Use clock_settime to implement settimeofday. - Use clock_settime to implement stime; withdraw stime. - Change most internal uses of __gettimeofday to __clock_gettime. - Linux/Alpha: don't use timeval32 system calls. - resolv/tst-idna_name_classify: Isolate from system libraries - hurd: Support for file record locking - Comment out initgroups from example nsswitch.conf (Bug 25146) --- SUPPORTED | 1 + glibc-fedora-nsswitch.patch | 7 +++--- glibc.spec | 49 +++++++++++++++++++++++++++++++++++-- sources | 2 +- 4 files changed, 53 insertions(+), 6 deletions(-) diff --git a/SUPPORTED b/SUPPORTED index 952f13d..d55e4e7 100644 --- a/SUPPORTED +++ b/SUPPORTED @@ -331,6 +331,7 @@ mk_MK/ISO-8859-5 \ ml_IN/UTF-8 \ mn_MN/UTF-8 \ mni_IN/UTF-8 \ +mnw_MM/UTF-8 \ mr_IN/UTF-8 \ ms_MY.UTF-8/UTF-8 \ ms_MY/ISO-8859-1 \ diff --git a/glibc-fedora-nsswitch.patch b/glibc-fedora-nsswitch.patch index 9101527..447a60e 100644 --- a/glibc-fedora-nsswitch.patch +++ b/glibc-fedora-nsswitch.patch @@ -3,7 +3,7 @@ version with minor downstream distribution modifications for use with SSSD and systemd. diff --git a/nss/nsswitch.conf b/nss/nsswitch.conf -index f55358811495c9f1..14c3cde8080a848c 100644 +index 4a6bcb1f7bc0b1f4..980a68e32e6a04b8 100644 --- a/nss/nsswitch.conf +++ b/nss/nsswitch.conf @@ -1,7 +1,7 @@ @@ -15,7 +15,7 @@ index f55358811495c9f1..14c3cde8080a848c 100644 # sorted with the most-used services at the beginning. # # Valid databases are: aliases, ethers, group, gshadow, hosts, -@@ -52,18 +52,20 @@ +@@ -52,19 +52,21 @@ # shadow: db files # group: db files @@ -34,7 +34,8 @@ index f55358811495c9f1..14c3cde8080a848c 100644 -group: files gshadow: files -hosts: files dns - initgroups: files + # Allow initgroups to default to the setting for group. + # initgroups: files -netgroup: files networks: files dns -passwd: files diff --git a/glibc.spec b/glibc.spec index c94ce8a..476f692 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.30.9000-194-g177a3d48a1 +%define glibcsrcdir glibc-2.30.9000-232-g2a0356e119 %define glibcversion 2.30.9000 # Pre-release tarballs are pulled in from git using a command that is # effectively: @@ -87,7 +87,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 16%{?dist} +Release: 17%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -124,6 +124,9 @@ Source3: glibc-bench-compare # A copy of localedata/SUPPORTED in the Source0 tarball. The # SUPPORTED file is used below to generate the list of locale # packages, using a Lua snippet. +# When the upstream SUPPORTED is out of sync with our copy, the +# prep phase will fail and you will need to update the local +# copy. Source11: SUPPORTED # Include in the source RPM for reference. Source12: ChangeLog.old @@ -2038,6 +2041,48 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Wed Nov 06 2019 Patsy Franklin - 2.30.9000-17 +- Auto-sync with upstream branch master, + commit 2a0356e1191804d57005e1cfe2a72f019b7a8cce. +- posix: Sync regex with gnulib +- Add mnw language code [BZ #25139] +- Add new locale: mnw_MM (Mon language spoken in Myanmar) [BZ #25139] +- S390: Fp comparison are now raising FE_INVALID with gcc 10. +- linux: pselect: Remove CALL_PSELECT6 macro +- Fix run-one-test so that it runs elf tests +- nptl: Fix niggles with pthread_clockjoin_np +- hppa: Align __clone stack argument to 8 bytes (Bug 25066) +- y2038: linux: Provide __futimens64 implementation +- y2038: linux: Provide __utimensat64 implementation +- nptl: Add pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test +- nptl: Add pthread_clockjoin_np +- manual: Add documentation for pthread_tryjoin_np and pthread_timedjoin_np +- nptl: Convert tst-join3 to use libsupport +- Sync time/mktime.c with gnulib +- Sync timespec-{add,sub} with gnulib +- Sync intprops.h with gnulib +- Refactor adjtimex based on clock_adjtime +- Refactor PI mutexes internal definitions +- Remove pause and nanosleep not cancel wrappers +- nptl: Replace non cancellable pause/nanosleep with futex +- Consolidate lowlevellock-futex.h +- Consolidate futex-internal.h +- Base max_fast on alignment, not width, of bins (Bug 24903) +- Revise the documentation of simple calendar time. +- Make second argument of gettimeofday as 'void *' +- Use clock_gettime to implement gettimeofday. +- Use clock_gettime to implement timespec_get. +- Consolidate and deprecate ftime +- Change most internal uses of time to __clock_gettime. +- Use clock_gettime to implement time. +- Use clock_settime to implement settimeofday. +- Use clock_settime to implement stime; withdraw stime. +- Change most internal uses of __gettimeofday to __clock_gettime. +- Linux/Alpha: don't use timeval32 system calls. +- resolv/tst-idna_name_classify: Isolate from system libraries +- hurd: Support for file record locking +- Comment out initgroups from example nsswitch.conf (Bug 25146) + * Mon Oct 28 2019 DJ Delorie - 2.30.9000-16 - Auto-sync with upstream branch master, commit 177a3d48a1c74d7b2cd6bfd48901519d25a5ecad. diff --git a/sources b/sources index 8e276a6..b97fab1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.30.9000-194-g177a3d48a1.tar.xz) = 78002730753afd0448d5d5d2736c70dcf833d041c3cd7999968d449c148f613b7a735c8c6d417f897ee426d0f1e83513df471b539f0180b7853079d49bcb18b3 +SHA512 (glibc-2.30.9000-232-g2a0356e119.tar.xz) = 58fe568ff23a46255ed6359c93ff13cd38fb81e077210e2cdba794927720eae9c4dbf1fc8fb9bbd4f3fbf75f37045c197a31ed79840b18d52e63e08227340084