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.
This commit is contained in:
Florian Weimer 2019-03-14 16:18:47 +01:00
parent 4d79a1a6dd
commit fdf2115d36
3 changed files with 16 additions and 42 deletions

View File

@ -1,38 +0,0 @@
Short description: Do not define _XOPEN_STREAMS.
Author(s): Fedora glibc team <glibc@lists.fedoraproject.org>
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 <jakub@redhat.com> 2.7.90-11
- remove <stropts.h>, 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

View File

@ -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 %define glibcversion 2.29.9000
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
@ -87,7 +87,7 @@
Summary: The GNU libc libraries Summary: The GNU libc libraries
Name: glibc Name: glibc
Version: %{glibcversion} Version: %{glibcversion}
Release: 5%{?dist} Release: 6%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for # In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries. # libraries.
@ -147,7 +147,6 @@ Patch7: glibc-fedora-nis-rh188246.patch
Patch8: glibc-fedora-manual-dircategory.patch Patch8: glibc-fedora-manual-dircategory.patch
Patch9: glibc-rh827510.patch Patch9: glibc-rh827510.patch
Patch10: glibc-fedora-locarchive.patch Patch10: glibc-fedora-locarchive.patch
Patch11: glibc-fedora-streams-rh436349.patch
Patch12: glibc-rh819430.patch Patch12: glibc-rh819430.patch
Patch13: glibc-fedora-localedata-rh61908.patch Patch13: glibc-fedora-localedata-rh61908.patch
Patch14: glibc-fedora-__libc_multiple_libcs.patch Patch14: glibc-fedora-__libc_multiple_libcs.patch
@ -1891,6 +1890,19 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog %changelog
* Thu Mar 14 2019 Florian Weimer <fweimer@redhat.com> - 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 <fweimer@redhat.com> - 2.29.9000-5 * Wed Mar 13 2019 Florian Weimer <fweimer@redhat.com> - 2.29.9000-5
- Drop glibc-rh1670028.patch, applied upstream - Drop glibc-rh1670028.patch, applied upstream
- Auto-sync with upstream branch master, - Auto-sync with upstream branch master,

View File

@ -1 +1 @@
SHA512 (glibc-2.29.9000-124-g38b52865d4.tar.xz) = 61e5bb8c34663fad540c6c106a45127bd88ec94c8d81d80e9532d913ec8e6ef69b98957d2f10fde6da41c52fd7c0bb0002ad64814027766e02f9bd881646c578 SHA512 (glibc-2.29.9000-132-ga0a0dc8317.tar.xz) = de0cfa155b629d3452cbebd04d4f8c9cad49c323319a34a508f94cbe5054ec9e6c9268f8af1af4200e7b5009342e45bbb9e8b6b62db5d5c8f4e211677842af98