From 9e11e0f379295d30ea03374739b50cb647749e9e Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 5 Nov 2020 01:18:48 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/glibc.git#2e63496ba68bfc87245c0a475e62fad6e234def6
---
 glibc-revert-ftime-compat.patch | 232 --------------------------------
 glibc.spec                      |  61 ++++++++-
 sources                         |   2 +-
 3 files changed, 58 insertions(+), 237 deletions(-)
 delete mode 100644 glibc-revert-ftime-compat.patch

diff --git a/glibc-revert-ftime-compat.patch b/glibc-revert-ftime-compat.patch
deleted file mode 100644
index a096726..0000000
--- a/glibc-revert-ftime-compat.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-From a4ef8877d0f9739378655e683cc013a29c4ab82b Mon Sep 17 00:00:00 2001
-From: Siddhesh Poyarekar <siddhesh@sourceware.org>
-Date: Wed, 21 Oct 2020 14:55:29 +0530
-Subject: [PATCH] Revert "Move ftime to a compatibility symbol"
-
-This reverts commit 14633d3e568eb9770a7e5046eff257113e0453fb.
----
- include/sys/timeb.h                           |  1 +
- .../unix/sysv/linux/riscv/rv32/libc.abilist   |  1 +
- time/Makefile                                 |  5 +-
- time/ftime.c                                  | 19 +-----
- time/sys/timeb.h                              | 44 ++++++++++++++
- time/tst-ftime.c                              | 59 +++++++++----------
- 6 files changed, 79 insertions(+), 50 deletions(-)
- create mode 100644 include/sys/timeb.h
- create mode 100644 time/sys/timeb.h
-
-diff --git a/include/sys/timeb.h b/include/sys/timeb.h
-new file mode 100644
-index 0000000000..9f4509c35e
---- /dev/null
-+++ b/include/sys/timeb.h
-@@ -0,0 +1 @@
-+#include <time/sys/timeb.h>
-diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
-index d984c02492..60a74a5ac3 100644
---- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
-+++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
-@@ -805,6 +805,7 @@ GLIBC_2.33 fsync F
- GLIBC_2.33 ftell F
- GLIBC_2.33 ftello F
- GLIBC_2.33 ftello64 F
-+GLIBC_2.33 ftime F
- GLIBC_2.33 ftok F
- GLIBC_2.33 ftruncate F
- GLIBC_2.33 ftruncate64 F
-diff --git a/time/Makefile b/time/Makefile
-index ab8fb3303b..a4fb13d6a3 100644
---- a/time/Makefile
-+++ b/time/Makefile
-@@ -22,7 +22,7 @@ subdir	:= time
- 
- include ../Makeconfig
- 
--headers := time.h sys/time.h bits/time.h				\
-+headers := time.h sys/time.h sys/timeb.h bits/time.h			\
- 	   bits/types/clockid_t.h bits/types/clock_t.h			\
- 	   bits/types/struct_itimerspec.h				\
- 	   bits/types/struct_timespec.h bits/types/struct_timeval.h	\
-@@ -45,10 +45,9 @@ aux :=	    era alt_digit lc-time-cleanup
- tests	:= test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
- 	   tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
- 	   tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
--	   tst-strptime3 bug-getdate1 tst-strptime-whitespace \
-+	   tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime \
- 	   tst-tzname tst-y2039 bug-mktime4 tst-strftime2 tst-strftime3 \
- 	   tst-clock tst-clock2 tst-clock_nanosleep tst-cpuclock1
--tests-internal := tst-ftime
- 
- include ../Rules
- 
-diff --git a/time/ftime.c b/time/ftime.c
-index be3295ef76..93f485bbf7 100644
---- a/time/ftime.c
-+++ b/time/ftime.c
-@@ -16,23 +16,11 @@
-    License along with the GNU C Library; if not, see
-    <https://www.gnu.org/licenses/>.  */
- 
--#include <shlib-compat.h>
--
--#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_33)
--
-+#include <sys/timeb.h>
- #include <time.h>
- 
--struct timeb
--  {
--    time_t time;		/* Seconds since epoch, as from `time'.  */
--    unsigned short int millitm;	/* Additional milliseconds.  */
--    short int timezone;		/* Minutes west of GMT.  */
--    short int dstflag;		/* Nonzero if Daylight Savings Time used.  */
--  };
--
- int
--attribute_compat_text_section
--__ftime (struct timeb *timebuf)
-+ftime (struct timeb *timebuf)
- {
-   struct timespec ts;
-   __clock_gettime (CLOCK_REALTIME, &ts);
-@@ -43,6 +31,3 @@ __ftime (struct timeb *timebuf)
-   timebuf->dstflag = 0;
-   return 0;
- }
--
--compat_symbol (libc, __ftime, ftime, GLIBC_2_0);
--#endif
-diff --git a/time/sys/timeb.h b/time/sys/timeb.h
-new file mode 100644
-index 0000000000..641c333450
---- /dev/null
-+++ b/time/sys/timeb.h
-@@ -0,0 +1,44 @@
-+/* Copyright (C) 1994-2020 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <https://www.gnu.org/licenses/>.  */
-+
-+#ifndef _SYS_TIMEB_H
-+#define _SYS_TIMEB_H	1
-+
-+#include <features.h>
-+
-+#include <bits/types/time_t.h>
-+
-+__BEGIN_DECLS
-+
-+/* Structure returned by the `ftime' function.  */
-+
-+struct timeb
-+  {
-+    time_t time;		/* Seconds since epoch, as from `time'.  */
-+    unsigned short int millitm;	/* Additional milliseconds.  */
-+    short int timezone;		/* Minutes west of GMT.  */
-+    short int dstflag;		/* Nonzero if Daylight Savings Time used.  */
-+  };
-+
-+/* Fill in TIMEBUF with information about the current time.  */
-+
-+extern int ftime (struct timeb *__timebuf)
-+  __nonnull ((1)) __attribute_deprecated__;
-+
-+__END_DECLS
-+
-+#endif	/* sys/timeb.h */
-diff --git a/time/tst-ftime.c b/time/tst-ftime.c
-index 6978feb0f1..08916c0c65 100644
---- a/time/tst-ftime.c
-+++ b/time/tst-ftime.c
-@@ -16,23 +16,9 @@
-    License along with the GNU C Library; if not, see
-    <https://www.gnu.org/licenses/>.  */
- 
--
--#include <shlib-compat.h>
--#if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_33)
--#include <time.h>
--#include <support/check.h>
--
--compat_symbol_reference (libc, ftime, ftime, GLIBC_2_0);
--
--struct timeb
--  {
--    time_t time;
--    unsigned short int millitm;
--    short int timezone;
--    short int dstflag;
--  };
--
--extern int ftime (struct timeb *__timebuf);
-+#include <sys/timeb.h>
-+#include <stdio.h>
-+#include <libc-diag.h>
- 
- static int
- do_test (void)
-@@ -44,23 +30,36 @@ do_test (void)
-     {
-       prev = curr;
- 
--      /* ftime was deprecated on 2.31 and removed on 2.33.  */
--      TEST_COMPARE (ftime (&curr), 0);
--      TEST_VERIFY_EXIT (curr.time >= prev.time);
--      if (curr.time == prev.time)
--	TEST_VERIFY_EXIT (curr.millitm >= prev.millitm);
-+      /* ftime was deprecated on 2.31.  */
-+      DIAG_PUSH_NEEDS_COMMENT;
-+      DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wdeprecated-declarations");
-+
-+      if (ftime (&curr))
-+        {
-+          printf ("ftime returned an error\n");
-+          return 1;
-+        }
-+
-+      DIAG_POP_NEEDS_COMMENT;
-+
-+      if (curr.time < prev.time)
-+        {
-+          printf ("ftime's time flowed backwards\n");
-+          return 1;
-+        }
-+
-+      if (curr.time == prev.time
-+          && curr.millitm < prev.millitm)
-+        {
-+          printf ("ftime's millitm flowed backwards\n");
-+          return 1;
-+        }
- 
-       if (curr.time > prev.time)
-         sec ++;
-     }
-   return 0;
- }
--#else
--static int
--do_test (void)
--{
--  return EXIT_UNSUPPORTED;
--}
--#endif
- 
--#include <support/test-driver.c>
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
--- 
-2.26.2
-
diff --git a/glibc.spec b/glibc.spec
index 1b19473..33ffcb0 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,4 +1,4 @@
-%define glibcsrcdir glibc-2.32.9000-224-g0f09154c64
+%define glibcsrcdir glibc-2.32.9000-261-ge156dabc76
 %define glibcversion 2.32.9000
 # Pre-release tarballs are pulled in from git using a command that is
 # effectively:
@@ -100,7 +100,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 12%{?dist}
+Release: 14%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -164,7 +164,6 @@ Patch31: glibc-deprecated-selinux-nscd.patch
 Patch32: glibc-rhbz1869030-faccessat2-eperm.patch
 Patch33: glibc-revert-fxstat-compat.patch
 Patch34: glibc-revert-mknod-compat.patch
-Patch35: glibc-revert-ftime-compat.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -278,6 +277,9 @@ BuildRequires: glibc-static
 
 # libidn2 (but not libidn2-devel) is needed for testing AI_IDN/NI_IDN.
 BuildRequires: libidn2
+
+# The testsuite runs mtrace, which is a perl script
+BuildRequires: perl-interpreter
 %endif
 %endif
 
@@ -1999,7 +2001,13 @@ end
 
 %post -p <lua>
 -- We use lua's posix.exec because there may be no shell that we can
--- run during glibc upgrade.
+-- run during glibc upgrade.  We used to implement much of %%post as a
+-- C program, but from an overall maintenance perspective the lua in
+-- the spec file was simpler and safer given the operations required.
+-- All lua code will be ignored by rpm-ostree; see:
+-- https://github.com/projectatomic/rpm-ostree/pull/1869
+-- If we add new lua actions to the %%post code we should coordinate
+-- with rpm-ostree and ensure that their glibc install is functional.
 function post_exec (program, ...)
   local pid = posix.fork ()
   if pid == 0 then
@@ -2262,6 +2270,51 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Tue Nov 03 2020 Patsy Griffin <patsy@redhat.com> - 2.32.9000-14
+- Auto-sync with upstream branch master,
+  commit e156dabc766d6f6f99ce9402999eae380a3ec1f2.
+- aarch64: Add variant PCS lazy binding test [BZ #26798]
+- aarch64: Fix DT_AARCH64_VARIANT_PCS handling [BZ #26798]
+- hurd: Correct 'ethenet' spelling
+- Avoid -Wstringop-overflow warning in pthread_cleanup_push macros
+- Disable spurious -Warray-bounds for ypclnt.c (bug 26687)
+- Do not use array parameter to new_composite_name (bug 26726)
+- Disable spurious -Wstringop-overflow for setjmp/longjmp (bug 26647)
+- malloc debug: fix compile error when enable macro MALLOC_DEBUG > 1
+- tst-tcfree2: adjust coding style.
+- elf: In ldconfig, extract the new_sub_entry function from search_dir
+- Use MPC 1.2.1 in build-many-glibcs.py.
+- Argument Syntax: Use "option", @option, and @command.
+- elf: Unify old and new format cache handling code in ld.so
+- x86: Restore processing of cache size tunables in init_cacheinfo
+- Make elf.h header self contained.
+- x86: Optimizing memcpy for AMD Zen architecture.
+- Hurd: Fix ftime build
+- Add IP_RECVERR_RFC4884 and IPV6_RECVERR_RFC4884 from Linux 5.9.
+- misc: Add internal __getauxval2 function
+- Remove NEWS entry about ftime removal
+- time: Add 64-bit time_t support for ftime
+- Reinstate ftime and add deprecate message on ftime usage
+- Update kernel version to 5.9 in tst-mman-consts.py.
+- Amend grammar and add a description
+- Fix typo in NEWS file
+- Remove timing related checks of time/tst-cpuclock1
+- Update syscall lists for Linux 5.9.
+- Use Linux 5.9 in build-many-glibcs.py.
+- Reword description of SXID_* tunable properties
+- New benchtest: pthread locks
+- y2038: nptl: Provide __futex_clock_wait_bitset64 to support 64 bit bitset
+- C-SKY: Make dynamic linker's name compitable with the older gcc.
+- Revert "C-SKY:Fix dynamic linker's name when mfloat-abi=softfp."
+- Move vtimes to a compatibility symbol
+- y2038: linux: Provide __time64 implementation
+- rt: Fix typos in comments in <aio.h>
+- C-SKY:Fix dynamic linker's name when mfloat-abi=softfp.
+- Drop the glibc-revert-ftime-compat.patch.
+
+* Thu Oct 29 2020 DJ Delorie <dj@redhat.com> - 2.32.9000-13
+- Add BuildRequires for perl (malloc/mtrace) if running the testsuite.
+
 * Wed Oct 21 2020 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.32.9000-12
 - Revert __xstat64 symbol removal.
 - Revert xmknod* symbol removal.
diff --git a/sources b/sources
index 3d80d91..d50f2b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (glibc-2.32.9000-224-g0f09154c64.tar.xz) = 954c676048319ea30a316ac35c6ecd97f20b09572ab5eb50d21ffc5f7ff22c7ba8ce5b9a9edd40eff56742d8e99cd0444d44e7b0dc5b0bc97555c1fe5cb1f309
+SHA512 (glibc-2.32.9000-261-ge156dabc76.tar.xz) = 694630b04cff27c42ac1861dbfbd15699f6466d18d1530836ff7053bdb6ba7404872db8f3d65a96dd888cbe645fd980c59824f232ec1f99ac50a3db4fbe685b5