From fdf2115d36548c89f99e39a43bc35e3a2411b3f0 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 14 Mar 2019 16:18:47 +0100 Subject: [PATCH] Auto-sync with upstream branch master Upstream commit: a0a0dc83173ce11ff45105fd32e5d14356cdfb9c - Drop glibc-fedora-streams-rh436349.patch. STREAMS was removed upstream. - Remove obsolete, never-implemented XSI STREAMS declarations - nss: Fix tst-nss-files-alias-truncated for default --as-needed linking - scripts/check-obsolete-constructs.py: Process all headers as UTF-8. - Use Linux 5.0 in build-many-glibcs.py. - hurd: Add no-op version of __res_enable_icmp [BZ #24047] - Move inttypes.h and stdint.h to stdlib. - Use a proper C tokenizer to implement the obsolete typedefs test. - Fix output of LD_SHOW_AUXV=1. --- glibc-fedora-streams-rh436349.patch | 38 ----------------------------- glibc.spec | 18 +++++++++++--- sources | 2 +- 3 files changed, 16 insertions(+), 42 deletions(-) delete mode 100644 glibc-fedora-streams-rh436349.patch diff --git a/glibc-fedora-streams-rh436349.patch b/glibc-fedora-streams-rh436349.patch deleted file mode 100644 index 0d8f7d9..0000000 --- a/glibc-fedora-streams-rh436349.patch +++ /dev/null @@ -1,38 +0,0 @@ -Short description: Do not define _XOPEN_STREAMS. -Author(s): Fedora glibc team -Origin: PATCH -Bug-Fedora: #436349 -Upstream status: not-submitted - -This patch should go upstream. Not defining _XOPEN_STREAMS is the -same as setting it to -1 for POSIX conformance. The headers setting -needs to be reviewed indepedently. - -This is part of commit glibc-2.3.3-1564-gd0b6ac6 - -* Fri Mar 14 2008 Jakub Jelinek 2.7.90-11 -- remove , define _XOPEN_STREAMS -1 (#436349) - -diff -Nrup a/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h b/nptl/sysdeps/unix/sysv/linux/bits/posix_opt.h ---- a/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-06-05 07:42:49.000000000 -0600 -+++ b/sysdeps/unix/sysv/linux/bits/posix_opt.h 2012-06-07 12:15:21.817318674 -0600 -@@ -188,4 +188,7 @@ - /* Typed memory objects are not available. */ - #define _POSIX_TYPED_MEMORY_OBJECTS -1 - -+/* Streams are not available. */ -+#define _XOPEN_STREAMS -1 -+ - #endif /* bits/posix_opt.h */ -diff -Nrup a/streams/Makefile b/streams/Makefile ---- a/streams/Makefile 2012-06-05 07:42:49.000000000 -0600 -+++ b/streams/Makefile 2012-06-07 12:15:21.824318649 -0600 -@@ -20,7 +20,7 @@ - - include ../Makeconfig - --headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h -+#headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h - routines = isastream getmsg getpmsg putmsg putpmsg fattach fdetach - - include ../Rules diff --git a/glibc.spec b/glibc.spec index bfaf8d8..950bf14 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.29.9000-124-g38b52865d4 +%define glibcsrcdir glibc-2.29.9000-132-ga0a0dc8317 %define glibcversion 2.29.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: 5%{?dist} +Release: 6%{?dist} # In general, GPLv2+ is used by programs, LGPLv2+ is used for # libraries. @@ -147,7 +147,6 @@ Patch7: glibc-fedora-nis-rh188246.patch Patch8: glibc-fedora-manual-dircategory.patch Patch9: glibc-rh827510.patch Patch10: glibc-fedora-locarchive.patch -Patch11: glibc-fedora-streams-rh436349.patch Patch12: glibc-rh819430.patch Patch13: glibc-fedora-localedata-rh61908.patch Patch14: glibc-fedora-__libc_multiple_libcs.patch @@ -1891,6 +1890,19 @@ fi %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %changelog +* Thu Mar 14 2019 Florian Weimer - 2.29.9000-6 +- Drop glibc-fedora-streams-rh436349.patch. STREAMS was removed upstream. +- Auto-sync with upstream branch master, + commit a0a0dc83173ce11ff45105fd32e5d14356cdfb9c: +- Remove obsolete, never-implemented XSI STREAMS declarations +- nss: Fix tst-nss-files-alias-truncated for default --as-needed linking +- scripts/check-obsolete-constructs.py: Process all headers as UTF-8. +- Use Linux 5.0 in build-many-glibcs.py. +- hurd: Add no-op version of __res_enable_icmp [BZ #24047] +- Move inttypes.h and stdint.h to stdlib. +- Use a proper C tokenizer to implement the obsolete typedefs test. +- Fix output of LD_SHOW_AUXV=1. + * Wed Mar 13 2019 Florian Weimer - 2.29.9000-5 - Drop glibc-rh1670028.patch, applied upstream - Auto-sync with upstream branch master, diff --git a/sources b/sources index 182cd2f..1b699a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glibc-2.29.9000-124-g38b52865d4.tar.xz) = 61e5bb8c34663fad540c6c106a45127bd88ec94c8d81d80e9532d913ec8e6ef69b98957d2f10fde6da41c52fd7c0bb0002ad64814027766e02f9bd881646c578 +SHA512 (glibc-2.29.9000-132-ga0a0dc8317.tar.xz) = de0cfa155b629d3452cbebd04d4f8c9cad49c323319a34a508f94cbe5054ec9e6c9268f8af1af4200e7b5009342e45bbb9e8b6b62db5d5c8f4e211677842af98