From 28637353c02f929a0508d5dc0c3403714367de1d Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Mon, 16 Nov 2020 13:04:25 -0800
Subject: [PATCH] RHEL 9.0.0 Alpha bootstrap

The content of this branch was automatically imported from Fedora ELN
with the following as its source:
https://src.fedoraproject.org/rpms/glibc#c626367cc1dea35a90c9065c6af70e8967c23f26
---
 glibc-rhbz1869030-faccessat2-eperm.patch | 25 ------------------------
 glibc.spec                               |  6 ++++--
 2 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 glibc-rhbz1869030-faccessat2-eperm.patch

diff --git a/glibc-rhbz1869030-faccessat2-eperm.patch b/glibc-rhbz1869030-faccessat2-eperm.patch
deleted file mode 100644
index c389d12..0000000
--- a/glibc-rhbz1869030-faccessat2-eperm.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-With older systemd-nspawn the faccessat2 syscall was denied but
-instead of returning ENOSYS it returned EPERM. This has since
-been corrected in upstream systemd-nsapwn, but with older builders
-that may have older nspawn the Fedora Rawhide glibc should fall
-back to faccessat when it sees ENOSYS *or* EPERM. This is a
-Fedora Rawhide-only patch that should be removed before the next
-release.
-
-diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c
-index 56cb6dcc8b4d58d3..5de75032bbc93a2c 100644
---- a/sysdeps/unix/sysv/linux/faccessat.c
-+++ b/sysdeps/unix/sysv/linux/faccessat.c
-@@ -34,7 +34,11 @@ faccessat (int fd, const char *file, int mode, int flag)
- #if __ASSUME_FACCESSAT2
-   return ret;
- #else
--  if (ret == 0 || errno != ENOSYS)
-+  /* Fedora-specific workaround:
-+     As a workround for a broken systemd-nspawn that returns
-+     EPERM when a syscall is not allowed instead of ENOSYS
-+     we must check for EPERM here and fall back to faccessat.  */
-+  if (ret == 0 || !(errno == ENOSYS || errno == EPERM))
-     return ret;
- 
-   if (flag & ~(AT_SYMLINK_NOFOLLOW | AT_EACCESS))
diff --git a/glibc.spec b/glibc.spec
index 617f98f..3798a8d 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -100,7 +100,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 15%{?dist}
+Release: 16%{?dist}
 
 # In general, GPLv2+ is used by programs, LGPLv2+ is used for
 # libraries.
@@ -161,7 +161,6 @@ Patch23: glibc-python3.patch
 Patch29: glibc-fedora-nsswitch.patch
 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
 
@@ -2270,6 +2269,9 @@ fi
 %files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
 
 %changelog
+* Tue Nov 10 2020 Carlos O'Donell <carlos@redhat.com> - 2.32.9000-16
+- Remove the work around for systemd-nspawn (#1869030).
+
 * Mon Nov 09 2020 DJ Delorie <dj@redhat.com> - 2.32.9000-15
 - Auto-sync with upstream branch master,
   commit 75a193b7611bade31a150dfcc528b973e3d46231.