From 84eeda0540efa870c17622e144f4713db79de120 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 30 Mar 2021 10:00:33 -0400
Subject: [PATCH] import fuse-overlayfs-1.4.0-2.module+el8.4.0+10198+36d1d0e3

---
 .fuse-overlayfs.metadata                      |  2 +-
 .gitignore                                    |  2 +-
 .../fuse-overlayfs-openat2-unsupported.patch  | 12 ++++
 SPECS/fuse-overlayfs.spec                     | 56 ++++++++++++++++++-
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 SOURCES/fuse-overlayfs-openat2-unsupported.patch

diff --git a/.fuse-overlayfs.metadata b/.fuse-overlayfs.metadata
index 89d776e..25fec6a 100644
--- a/.fuse-overlayfs.metadata
+++ b/.fuse-overlayfs.metadata
@@ -1 +1 @@
-6567c682d7ecae76a03c027b16a39ec77462323c SOURCES/v1.1.1.tar.gz
+6dc0615e247552e24619dcbef0828fe3a46e4272 SOURCES/v1.4.0.tar.gz
diff --git a/.gitignore b/.gitignore
index f779712..eb84e4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.1.1.tar.gz
+SOURCES/v1.4.0.tar.gz
diff --git a/SOURCES/fuse-overlayfs-openat2-unsupported.patch b/SOURCES/fuse-overlayfs-openat2-unsupported.patch
new file mode 100644
index 0000000..32f357c
--- /dev/null
+++ b/SOURCES/fuse-overlayfs-openat2-unsupported.patch
@@ -0,0 +1,12 @@
+diff -up fuse-overlayfs-1.4.0/utils.c.openat2 fuse-overlayfs-1.4.0/utils.c
+--- fuse-overlayfs-1.4.0/utils.c.openat2	2021-01-29 11:59:00.678257784 +0100
++++ fuse-overlayfs-1.4.0/utils.c	2021-01-29 11:59:06.801365184 +0100
+@@ -81,7 +81,7 @@ syscall_openat2 (int dirfd, const char *
+ int
+ safe_openat (int dirfd, const char *pathname, int flags, mode_t mode)
+ {
+-  static bool openat2_supported = true;
++  static bool openat2_supported = false;
+ 
+   if (openat2_supported)
+     {
diff --git a/SPECS/fuse-overlayfs.spec b/SPECS/fuse-overlayfs.spec
index d72a69c..79c7df6 100644
--- a/SPECS/fuse-overlayfs.spec
+++ b/SPECS/fuse-overlayfs.spec
@@ -1,13 +1,16 @@
 %global git0 https://github.com/containers/%{name}
 
+%{!?_modulesloaddir:%global _modulesloaddir %{_usr}/lib/modules-load.d}
+
 Name: fuse-overlayfs
-Version: 1.1.1
-Release: 1%{?dist}
+Version: 1.4.0
+Release: 2%{?dist}
 Summary: FUSE overlay+shiftfs implementation for rootless containers
 License: GPLv3+
 URL: %{git0}
 ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
 Source0: %{git0}/archive/v%{version}.tar.gz
+Patch0: fuse-overlayfs-openat2-unsupported.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: fuse3-devel
@@ -15,6 +18,8 @@ BuildRequires: gcc
 BuildRequires: git
 BuildRequires: go-md2man
 BuildRequires: make
+Requires: kmod
+Requires: fuse3
 
 %description
 %{summary}.
@@ -34,12 +39,19 @@ building other packages which use import path with
 %autosetup -Sgit
 
 %build
+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+export LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now"
 ./autogen.sh
 ./configure --prefix=%{_usr} --libdir=%{_libdir}
 %{__make} generate-man
 
 %install
 make DESTDIR=%{buildroot} install install-man
+install -d %{buildroot}%{_modulesloaddir}
+echo fuse > %{buildroot}%{_modulesloaddir}/fuse-overlayfs.conf
+
+%post
+modprobe fuse > /dev/null 2>&1 || :
 
 %check
 
@@ -50,9 +62,47 @@ make DESTDIR=%{buildroot} install install-man
 %license COPYING
 %doc README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}.1.gz
+%{_mandir}/man1/*
+%{_modulesloaddir}/fuse-overlayfs.conf
 
 %changelog
+* Fri Jan 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.4.0-2
+- disable openat2 syscall again - still unsupported in current RHEL8 kernel
+- Related: #1883490
+
+* Sat Jan 23 2021 Jindrich Novy <jnovy@redhat.com> - 1.4.0-1
+- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.4.0
+- Related: #1883490
+
+* Thu Nov 26 2020 Jindrich Novy <jnovy@redhat.com> - 1.3.0-1
+- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.3.0
+- Related: #1883490
+
+* Mon Nov 09 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-3
+- be sure to harden the linked binary
+- Related: #1883490
+
+* Thu Oct 29 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
+- ensure fuse module is loaded
+- Related: #1883490
+
+* Wed Oct 21 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
+- synchronize with stream-container-tools-rhel8
+- Related: #1883490
+
+* Fri Sep 18 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-3
+- fix "error bind mounting /dev from host into mount namespace"
+  (the openat2 syscall is not yet supported by the RHEL8 kernel)
+- Resolves: #1867447
+
+* Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-2
+- use proper CFLAGS
+- Related: #1821193
+
+* Mon Jun 29 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-1
+- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.1.2
+- Related: #1821193
+
 * Mon Jun 22 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.1-1
 - update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.1.1
 - Related: #1821193