From 3efb6ef47904d24191f11856492c8d3ce79c3fc3 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Thu, 5 Mar 2020 13:09:13 +0100
Subject: [PATCH] Emergency patch for broken utimes/utime functions

---
 glibc-utimes.patch | 28 ++++++++++++++++++++++++++++
 glibc.spec         |  6 +++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 glibc-utimes.patch

diff --git a/glibc-utimes.patch b/glibc-utimes.patch
new file mode 100644
index 0000000..21b325a
--- /dev/null
+++ b/glibc-utimes.patch
@@ -0,0 +1,28 @@
+Emergency patch for broken utimes/utime functions.
+
+diff --git a/sysdeps/unix/sysv/linux/utime.c b/sysdeps/unix/sysv/linux/utime.c
+index 2cd9334a6f1efc36..6516344adcc16389 100644
+--- a/sysdeps/unix/sysv/linux/utime.c
++++ b/sysdeps/unix/sysv/linux/utime.c
+@@ -32,7 +32,7 @@ __utime64 (const char *file, const struct __utimbuf64 *times)
+       ts64[1].tv_nsec = 0LL;
+     }
+ 
+-  return __utimensat64_helper (0, file, times ? ts64 : NULL, 0);
++  return __utimensat64_helper (AT_FDCWD, file, times ? ts64 : NULL, 0);
+ }
+ 
+ #if __TIMESIZE != 64
+diff --git a/sysdeps/unix/sysv/linux/utimes.c b/sysdeps/unix/sysv/linux/utimes.c
+index 75927b6ec6695c96..02a5e91415f52f2e 100644
+--- a/sysdeps/unix/sysv/linux/utimes.c
++++ b/sysdeps/unix/sysv/linux/utimes.c
+@@ -29,7 +29,7 @@ __utimes64 (const char *file, const struct __timeval64 tvp[2])
+       ts64[1] = timeval64_to_timespec64 (tvp[1]);
+     }
+ 
+-  return __utimensat64_helper (0, file, tvp ? ts64 : NULL, 0);
++  return __utimensat64_helper (AT_FDCWD, file, tvp ? ts64 : NULL, 0);
+ }
+ 
+ #if __TIMESIZE != 64
diff --git a/glibc.spec b/glibc.spec
index 9c3e06e..26e2789 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -87,7 +87,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -158,6 +158,7 @@ Patch17: glibc-cs-path.patch
 Patch18: glibc-c-utf8-locale.patch
 Patch23: glibc-python3.patch
 Patch29: glibc-fedora-nsswitch.patch
+Patch30: glibc-utimes.patch
 
 ##############################################################################
 # Continued list of core "glibc" package information:
@@ -2041,6 +2042,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Thu Mar  5 2020 Florian Weimer <fweimer@redhat.com> - 2.31.9000-3
+- Emergency patch for broken utimes/utime functions
+
 * Tue Mar 03 2020 Patsy Franklin <patsy@redhat.com> - 2.31.9000-2
 - Auto-sync with upstream branch master,
   commit 78c9d0c6efabe2067ef7f93cd36325f54c60adc2.