From 9c18f40324d0e624ec324988483db5e91761e5b9 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 09 2020 16:18:07 +0000
Subject: import fuse-overlayfs-1.2.0-2.module+el8.3.1+8686+2a59bca3


---

diff --git a/.fuse-overlayfs.metadata b/.fuse-overlayfs.metadata
index d1a33fa..0fd7ae1 100644
--- a/.fuse-overlayfs.metadata
+++ b/.fuse-overlayfs.metadata
@@ -1 +1 @@
-19d8cbb0252ccc8490ffc44df0d9b2593809189a SOURCES/v1.1.2.tar.gz
+ff9c1d10080ac5d21c2958b2b53a9575774101e6 SOURCES/v1.2.0.tar.gz
diff --git a/.gitignore b/.gitignore
index 1b4f9b9..67e59d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/v1.1.2.tar.gz
+SOURCES/v1.2.0.tar.gz
diff --git a/SOURCES/fuse-overlayfs-1867447.patch b/SOURCES/fuse-overlayfs-1867447.patch
deleted file mode 100644
index c90157c..0000000
--- a/SOURCES/fuse-overlayfs-1867447.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/utils.c b/utils.c
-index 749cfb0..bc0edb6 100644
---- a/utils.c
-+++ b/utils.c
-@@ -81,7 +81,7 @@ syscall_openat2 (int dirfd, const char *path, uint64_t flags, uint64_t mode, uin
- 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 0c15218..a2f7206 100644
--- a/SPECS/fuse-overlayfs.spec
+++ b/SPECS/fuse-overlayfs.spec
@@ -1,16 +1,15 @@
 %global git0 https://github.com/containers/%{name}
 
+%{!?_modulesloaddir:%global _modulesloaddir %{_usr}/lib/modules-load.d}
+
 Name: fuse-overlayfs
-Version: 1.1.2
-Release: 3%{?dist}
+Version: 1.2.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
-# related bug: https://bugzilla.redhat.com/show_bug.cgi?id=1867447
-# patch:       https://bugzilla.redhat.com/show_bug.cgi?id=1867447#c6
-Patch0: fuse-overlayfs-1867447.patch
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: fuse3-devel
@@ -18,6 +17,8 @@ BuildRequires: gcc
 BuildRequires: git
 BuildRequires: go-md2man
 BuildRequires: make
+Requires: kmod
+Requires: fuse3
 
 %description
 %{summary}.
@@ -44,6 +45,11 @@ export CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOUR
 
 %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
 
@@ -54,9 +60,18 @@ 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
+* Thu Oct 29 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
+- ensure fuse module is loaded
+- Related: #1888571
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
+- synchronize with stream-container-tools-rhel8-rhel-8.4.0
+- Related: #1888571
+
 * 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)