3 changed files with 16 additions and 98 deletions
--- a/.fuse-overlayfs.metadata
+++ b/.fuse-overlayfs.metadata
@ -1 +1 @@
-0b7b76ba745c497ac8132d168304abc88e7da975 SOURCES/v1.9.tar.gz
+9278edb01b216008080462f43b47efeba7706708 SOURCES/fuse-overlayfs-6d269aa.tar.gz
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/v1.9.tar.gz
+SOURCES/fuse-overlayfs-6d269aa.tar.gz
--- a/SPECS/fuse-overlayfs.spec
+++ b/SPECS/fuse-overlayfs.spec
@ -1,24 +1,24 @@
 %global git0 https://github.com/containers/%{name}
-
-%{!?_modulesloaddir:%global _modulesloaddir %{_usr}/lib/modules-load.d}
+%global commit0 6d269aa28e3fe78c117fecb5e2cb8e1e231fcb10
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})

 Name: fuse-overlayfs
-Version: 1.9
-Release: 1%{?dist}
+Version: 0.3
+Release: 5%{?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
+# no go-md2man in ix86
+ExcludeArch: %{ix86} ppc64
+Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: fuse3-devel
 BuildRequires: gcc
 BuildRequires: git
-BuildRequires: /usr/bin/go-md2man
+BuildRequires: go-md2man
 BuildRequires: make
-Requires: kmod
-Requires: fuse3
+Provides: bundled(gnulib) = cb634d40c7b9bbf33fa5198d2e27fdab4c0bf143

 %description
 %{summary}.
@ -35,22 +35,15 @@ building other packages which use import path with
 %{import_path} prefix.

 %prep
-%autosetup -Sgit
+%autosetup -Sgit -n %{name}-%{commit0}

 %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

@ -61,87 +54,12 @@ modprobe fuse > /dev/null 2>&1 || :
 %license COPYING
 %doc README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/*
-%{_modulesloaddir}/fuse-overlayfs.conf
+%{_mandir}/man1/%{name}.1.gz

 %changelog
-* Fri Jun 10 2022 Jindrich Novy <jnovy@redhat.com> - 1.9-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.9
- Related: #2061316
-
-* Wed May 11 2022 Jindrich Novy <jnovy@redhat.com> - 1.8.2-2
- BuildRequires: /usr/bin/go-md2man
- Related: #2061316
-
-* Wed Feb 02 2022 Jindrich Novy <jnovy@redhat.com> - 1.8.2-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.8.2
- Related: #2000051
-
-* Wed Jan 19 2022 Jindrich Novy <jnovy@redhat.com> - 1.8.1-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.8.1
- Related: #2000051
-
-* Wed Dec 22 2021 Jindrich Novy <jnovy@redhat.com> - 1.8-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.8
- Related: #2000051
-
-* Fri Oct 01 2021 Jindrich Novy <jnovy@redhat.com> - 1.7.1-3
- perform only sanity/installability tests for now
- Related: #2000051
-
-* Wed Sep 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.7.1-2
- add gating.yaml
- Related: #2000051
-
-* Fri Sep 03 2021 Jindrich Novy <jnovy@redhat.com> - 1.7.1-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.7.1
- Related: #2000051
-
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.7-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Jul 29 2021 Jindrich Novy <jnovy@redhat.com> - 1.7-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.7
- Related: #1970747
-
-* Wed Jun 23 2021 Jindrich Novy <jnovy@redhat.com> - 1.6-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.6
- Related: #1970747
-
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.0-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Thu Mar 25 2021 Jindrich Novy <jnovy@redhat.com> - 1.5.0-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.5.0
-
-* Tue Jan 26 2021 Jindrich Novy <jnovy@redhat.com> - 1.4.0-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.4.0
-
-* 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
-
-* Mon Nov 09 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-4
- be sure to harden the linked binary
-
-* Thu Oct 29 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-3
- ensure fuse module is loaded
-
-* Fri Oct 09 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-2
- use 1.2.0 tarball from the release, not tag
-
-* Fri Oct 09 2020 Jindrich Novy <jnovy@redhat.com> - 1.2.0-1
- update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.2.0
-
-* Thu Sep 17 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-2
- sync with rhel8-8.3.0
-
-* Thu Sep 17 2020 Jindrich Novy <jnovy@redhat.com> - 1.1.2-1
- use proper CFLAGS
- Related: #1821193
-
-* Sat Jun 15 2019 Lokesh Mandvekar <lsm5@redhat.com> - 0.4.1-1
- Resolves: #1720654 - rebase to v0.4.1
+* Mon Aug 19 2019 Jindrich Novy <jnovy@redhat.com> - 0.3-5
+- revert fuse-overlayfs to commit 6d269aa
+- Resolves: #1720707

 * Wed Feb 20 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.3-4.dev.gitd760789
 - rebase