From 90ca20fd0234925743db5e1e231b73b4a38749a9 Mon Sep 17 00:00:00 2001
From: Siddhesh Poyarekar <siddhesh@redhat.com>
Date: Wed, 21 Oct 2020 14:54:20 +0530
Subject: [PATCH] Also revert xmknod and ftime removal

---
 glibc-revert-ftime-compat.patch | 232 ++++++++++++++++++++++++++
 glibc-revert-mknod-compat.patch | 278 ++++++++++++++++++++++++++++++++
 glibc.spec                      |   6 +-
 3 files changed, 515 insertions(+), 1 deletion(-)
 create mode 100644 glibc-revert-ftime-compat.patch
 create mode 100644 glibc-revert-mknod-compat.patch

diff --git a/glibc-revert-ftime-compat.patch b/glibc-revert-ftime-compat.patch
new file mode 100644
index 0000000..a096726
--- /dev/null
+++ b/glibc-revert-ftime-compat.patch
@@ -0,0 +1,232 @@
+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-revert-mknod-compat.patch b/glibc-revert-mknod-compat.patch
new file mode 100644
index 0000000..85b4913
--- /dev/null
+++ b/glibc-revert-mknod-compat.patch
@@ -0,0 +1,278 @@
+From 9036019b09f0e6fd9d66721f4d6bbc856bb27da2 Mon Sep 17 00:00:00 2001
+From: Siddhesh Poyarekar <siddhesh@sourceware.org>
+Date: Wed, 21 Oct 2020 14:51:39 +0530
+Subject: [PATCH] Revert "linux: Move xmknod{at} to compat symbols"
+
+This reverts commit 81b83ff61f95f30ad53d6075247af0ea61a0b16e.
+---
+ include/sys/stat.h                            |  4 +--
+ sysdeps/mach/hurd/xmknod.c                    | 17 +++------
+ sysdeps/mach/hurd/xmknodat.c                  | 12 +------
+ sysdeps/unix/sysv/linux/mknod.c               | 28 ---------------
+ sysdeps/unix/sysv/linux/mknodat.c             | 35 -------------------
+ .../unix/sysv/linux/riscv/rv32/libc.abilist   |  2 ++
+ sysdeps/unix/sysv/linux/xmknod.c              | 20 +++++++----
+ sysdeps/unix/sysv/linux/xmknodat.c            | 23 ++++++++----
+ 8 files changed, 40 insertions(+), 101 deletions(-)
+ delete mode 100644 sysdeps/unix/sysv/linux/mknod.c
+ delete mode 100644 sysdeps/unix/sysv/linux/mknodat.c
+
+diff --git a/include/sys/stat.h b/include/sys/stat.h
+index 108cb0c9bf..9a4a8f62cc 100644
+--- a/include/sys/stat.h
++++ b/include/sys/stat.h
+@@ -79,8 +79,10 @@ libc_hidden_proto (__mknod);
+ 
+ extern int __xmknod (int __ver, const char *__path, __mode_t __mode,
+ 		     __dev_t *__dev);
++libc_hidden_proto (__xmknod)
+ extern int __xmknodat (int __ver, int __fd, const char *__path,
+ 		       __mode_t __mode, __dev_t *__dev);
++libc_hidden_proto (__xmknodat)
+ 
+ int __fxstat (int __ver, int __fildes, struct stat *__stat_buf);
+ int __xstat (int __ver, const char *__filename,
+@@ -106,8 +108,6 @@ hidden_proto (__xstat64);
+ hidden_proto (__lxstat64);
+ hidden_proto (__fxstatat64);
+ #  endif
+-libc_hidden_proto (__xmknod)
+-libc_hidden_proto (__xmknodat)
+ #  define stat(fname, buf) __xstat (_STAT_VER, fname, buf)
+ #  define lstat(fname, buf)  __lxstat (_STAT_VER, fname, buf)
+ #  define __lstat(fname, buf)  __lxstat (_STAT_VER, fname, buf)
+diff --git a/sysdeps/mach/hurd/xmknod.c b/sysdeps/mach/hurd/xmknod.c
+index a1b5af086d..0ab4f1b719 100644
+--- a/sysdeps/mach/hurd/xmknod.c
++++ b/sysdeps/mach/hurd/xmknod.c
+@@ -15,9 +15,12 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
+-#include <sys/stat.h>
++#include <errno.h>
+ #include <fcntl.h>
+-#include <shlib-compat.h>
++#include <stddef.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++
+ 
+ /* Create a device file named FILE_NAME, with permission and special bits MODE
+    and device number DEV (which can be constructed from major and minor
+@@ -28,13 +31,3 @@ __xmknod (int vers, const char *file_name, mode_t mode, dev_t *dev)
+   return __xmknodat (vers, AT_FDCWD, file_name, mode, dev);
+ }
+ libc_hidden_def (__xmknod)
+-
+-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33)
+-int
+-__xmknod_compat (int vers, const char *file_name, mode_t mode, dev_t *dev)
+-{
+-  return __xmknod (vers, file_name, mode, dev);
+-}
+-
+-compat_symbol (libc, __xmknod_compat, __xmknod, GLIBC_2_0);
+-#endif
+diff --git a/sysdeps/mach/hurd/xmknodat.c b/sysdeps/mach/hurd/xmknodat.c
+index 90724694d5..4239d1ea91 100644
+--- a/sysdeps/mach/hurd/xmknodat.c
++++ b/sysdeps/mach/hurd/xmknodat.c
+@@ -26,7 +26,6 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/sysmacros.h>
+-#include <shlib-compat.h>
+ 
+ /* Create a device file named PATH relative to FD, with permission and
+    special bits MODE and device number DEV (which can be constructed
+@@ -117,14 +116,5 @@ __xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev)
+     return __hurd_fail (err);
+   return 0;
+ }
+-libc_hidden_def (__xmknodat)
+-
+-#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33)
+-int
+-__xmknodat_compat (int vers, int fd, const char *path, mode_t mode, dev_t *dev)
+-{
+-  return __xmknodat (vers, fd, path, mode, dev);
+-}
+ 
+-compat_symbol (libc, __xmknodat_compat, __xmknodat, GLIBC_2_4);
+-#endif
++libc_hidden_def (__xmknodat)
+diff --git a/sysdeps/unix/sysv/linux/mknod.c b/sysdeps/unix/sysv/linux/mknod.c
+deleted file mode 100644
+index 7e290ddc8b..0000000000
+--- a/sysdeps/unix/sysv/linux/mknod.c
++++ /dev/null
+@@ -1,28 +0,0 @@
+-/* Create a special or ordinary file.  Linux version.
+-   Copyright (C) 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/>.  */
+-
+-#include <sys/stat.h>
+-#include <fcntl.h>
+-
+-int
+-__mknod (const char *path, mode_t mode, dev_t dev)
+-{
+-  return __mknodat (AT_FDCWD, path, mode, dev);
+-}
+-libc_hidden_def (__mknod)
+-weak_alias (__mknod, mknod)
+diff --git a/sysdeps/unix/sysv/linux/mknodat.c b/sysdeps/unix/sysv/linux/mknodat.c
+deleted file mode 100644
+index fdb8f1951a..0000000000
+--- a/sysdeps/unix/sysv/linux/mknodat.c
++++ /dev/null
+@@ -1,35 +0,0 @@
+-/* Create a special or ordinary file.  Linux version.
+-   Copyright (C) 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/>.  */
+-
+-#include <sys/types.h>
+-#include <sys/stat.h>
+-#include <errno.h>
+-
+-int
+-__mknodat (int fd, const char *path, mode_t mode, dev_t dev)
+-{
+-  /* The user-exported dev_t is 64-bit while the kernel interface is
+-     32-bit.  */
+-  unsigned int k_dev = dev;
+-  if (k_dev != dev)
+-    return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
+-
+-  return INLINE_SYSCALL_CALL (mknodat, fd, path, mode, k_dev);
+-}
+-libc_hidden_def (__mknodat)
+-weak_alias (__mknodat, mknodat)
+diff --git a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+index 365a6b17cf..d984c02492 100644
+--- a/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
++++ b/sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist
+@@ -484,6 +484,8 @@ GLIBC_2.33 __wprintf_chk F
+ GLIBC_2.33 __write F
+ GLIBC_2.33 __wuflow F
+ GLIBC_2.33 __wunderflow F
++GLIBC_2.33 __xmknod F
++GLIBC_2.33 __xmknodat F
+ GLIBC_2.33 __xpg_basename F
+ GLIBC_2.33 __xpg_sigpause F
+ GLIBC_2.33 __xpg_strerror_r F
+diff --git a/sysdeps/unix/sysv/linux/xmknod.c b/sysdeps/unix/sysv/linux/xmknod.c
+index 82bb0bd953..42809d4c57 100644
+--- a/sysdeps/unix/sysv/linux/xmknod.c
++++ b/sysdeps/unix/sysv/linux/xmknod.c
+@@ -17,23 +17,29 @@
+    <https://www.gnu.org/licenses/>.  */
+ 
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <fcntl.h>
+-#include <errno.h>
+-#include <shlib-compat.h>
++#include <sysdep.h>
+ 
+-#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_33)
+ /* Create a device file named PATH, with permission and special bits MODE
+    and device number DEV (which can be constructed from major and minor
+    device numbers with the `makedev' macro above).  */
+ int
+-attribute_compat_text_section
+ __xmknod (int vers, const char *path, mode_t mode, dev_t *dev)
+ {
++  unsigned long long int k_dev;
++
+   if (vers != _MKNOD_VER)
+     return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
+ 
+-  return __mknodat (AT_FDCWD, path, mode, *dev);
++  /* We must convert the value to dev_t type used by the kernel.  */
++  k_dev =  (*dev) & ((1ULL << 32) - 1);
++  if (k_dev != *dev)
++    return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
++
++  return INLINE_SYSCALL_CALL (mknodat, AT_FDCWD, path, mode,
++			      (unsigned int) k_dev);
+ }
+ 
+-compat_symbol (libc, __xmknod, __xmknod, GLIBC_2_0);
+-#endif
++weak_alias (__xmknod, _xmknod)
++libc_hidden_def (__xmknod)
+diff --git a/sysdeps/unix/sysv/linux/xmknodat.c b/sysdeps/unix/sysv/linux/xmknodat.c
+index fae3fe54d1..5640a499aa 100644
+--- a/sysdeps/unix/sysv/linux/xmknodat.c
++++ b/sysdeps/unix/sysv/linux/xmknodat.c
+@@ -15,11 +15,18 @@
+    License along with the GNU C Library; if not, see
+    <https://www.gnu.org/licenses/>.  */
+ 
+-#include <sys/stat.h>
+ #include <errno.h>
+-#include <shlib-compat.h>
++#include <fcntl.h>
++#include <stdio.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++#include <sys/sysmacros.h>
++
++#include <sysdep.h>
++#include <sys/syscall.h>
++
+ 
+-#if SHLIB_COMPAT(libc, GLIBC_2_4, GLIBC_2_33)
+ /* Create a device file named PATH relative to FD, with permission and
+    special bits MODE and device number DEV (which can be constructed
+    from major and minor device numbers with the `makedev' macro above).  */
+@@ -29,8 +36,12 @@ __xmknodat (int vers, int fd, const char *file, mode_t mode, dev_t *dev)
+   if (vers != _MKNOD_VER)
+     return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
+ 
+-  return __mknodat (fd, file, mode, *dev);
++  /* We must convert the value to dev_t type used by the kernel.  */
++  unsigned long long int k_dev =  (*dev) & ((1ULL << 32) - 1);
++  if (k_dev != *dev)
++    return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
++
++  return INLINE_SYSCALL (mknodat, 4, fd, file, mode, (unsigned int) k_dev);
+ }
+ 
+-compat_symbol (libc, __xmknodat, __xmknodat, GLIBC_2_4);
+-#endif
++libc_hidden_def (__xmknodat)
+-- 
+2.26.2
+
diff --git a/glibc.spec b/glibc.spec
index 6c268b8..1b19473 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -163,6 +163,8 @@ Patch30: glibc-deprecated-selinux-makedb.patch
 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:
@@ -2261,7 +2263,9 @@ fi
 
 %changelog
 * Wed Oct 21 2020 Siddhesh Poyarekar <siddhesh@redhat.com> - 2.32.9000-12
-- Revert __fxstat64 symbol removal.
+- Revert __xstat64 symbol removal.
+- Revert xmknod* symbol removal.
+- Revert ftime symbol removal.
 
 * Sun Oct 18 2020 Patsy Griffin <patsy@redhat.com> - 2.32.9000-11
 - Auto-sync with upstream branch master,