From 91ca7477215609029197d3fc672a2259f370d8ab Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 16 Feb 2021 02:40:54 -0500 Subject: [PATCH] import fuse-overlayfs-1.3.0-2.module+el8.3.1+9857+68fb1526 --- .fuse-overlayfs.metadata | 2 +- .gitignore | 2 +- SOURCES/fuse-overlayfs-1867447.patch | 14 ---------- SPECS/fuse-overlayfs.spec | 40 +++++++++++++++++++++++----- 4 files changed, 36 insertions(+), 22 deletions(-) delete mode 100644 SOURCES/fuse-overlayfs-1867447.patch diff --git a/.fuse-overlayfs.metadata b/.fuse-overlayfs.metadata index d1a33fa..92c7135 100644 --- a/.fuse-overlayfs.metadata +++ b/.fuse-overlayfs.metadata @@ -1 +1 @@ -19d8cbb0252ccc8490ffc44df0d9b2593809189a SOURCES/v1.1.2.tar.gz +079bcd26d90e20f33c974e29b727ff399d7a078f SOURCES/v1.3.0.tar.gz diff --git a/.gitignore b/.gitignore index 1b4f9b9..81ab3db 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.1.2.tar.gz +SOURCES/v1.3.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..d894c38 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.3.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}. @@ -38,12 +39,18 @@ building other packages which use import path with %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 @@ -54,9 +61,30 @@ 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 +* Mon Feb 01 2021 Jindrich Novy - 1.3.0-2 +- disable openat2 syscall again - still unsupported in current RHEL8 kernel +- Resolves: #1921863 + +* Thu Nov 26 2020 Jindrich Novy - 1.3.0-1 +- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.3.0 +- Related: #1888571 + +* Mon Nov 09 2020 Jindrich Novy - 1.2.0-3 +- be sure to harden the linked binary +- Related: #1888571 + +* Thu Oct 29 2020 Jindrich Novy - 1.2.0-2 +- ensure fuse module is loaded +- Related: #1888571 + +* Thu Oct 22 2020 Jindrich Novy - 1.2.0-1 +- synchronize with stream-container-tools-rhel8-rhel-8.4.0 +- Related: #1888571 + * Fri Sep 18 2020 Jindrich Novy - 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)