Compare commits

...

No commits in common. "c8-stream-1.0" and "c9-beta-stream-latest" have entirely different histories.

3 changed files with 62 additions and 15 deletions

View File

@ -1 +1 @@
9278edb01b216008080462f43b47efeba7706708 SOURCES/fuse-overlayfs-6d269aa.tar.gz ec05e54e0a1a2d9c66fd2ac8fc17018973222f2e SOURCES/v1.7.1.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/fuse-overlayfs-6d269aa.tar.gz SOURCES/v1.7.1.tar.gz

View File

@ -1,16 +1,15 @@
%global git0 https://github.com/containers/%{name} %global git0 https://github.com/containers/%{name}
%global commit0 6d269aa28e3fe78c117fecb5e2cb8e1e231fcb10
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %{!?_modulesloaddir:%global _modulesloaddir %{_usr}/lib/modules-load.d}
Name: fuse-overlayfs Name: fuse-overlayfs
Version: 0.3 Version: 1.7.1
Release: 5%{?dist} Release: 1%{?dist}
Summary: FUSE overlay+shiftfs implementation for rootless containers Summary: FUSE overlay+shiftfs implementation for rootless containers
License: GPLv3+ License: GPLv3+
URL: %{git0} URL: %{git0}
# no go-md2man in ix86 ExclusiveArch: aarch64 %{arm} ppc64le s390x x86_64
ExcludeArch: %{ix86} ppc64 Source0: %{git0}/archive/v%{version}.tar.gz
Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: fuse3-devel BuildRequires: fuse3-devel
@ -18,7 +17,8 @@ BuildRequires: gcc
BuildRequires: git BuildRequires: git
BuildRequires: go-md2man BuildRequires: go-md2man
BuildRequires: make BuildRequires: make
Provides: bundled(gnulib) = cb634d40c7b9bbf33fa5198d2e27fdab4c0bf143 Requires: kmod
Requires: fuse3
%description %description
%{summary}. %{summary}.
@ -35,15 +35,22 @@ building other packages which use import path with
%{import_path} prefix. %{import_path} prefix.
%prep %prep
%autosetup -Sgit -n %{name}-%{commit0} %autosetup -Sgit
%build %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 ./autogen.sh
./configure --prefix=%{_usr} --libdir=%{_libdir} ./configure --prefix=%{_usr} --libdir=%{_libdir}
%{__make} generate-man %{__make} generate-man
%install %install
make DESTDIR=%{buildroot} install install-man 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 %check
@ -54,12 +61,52 @@ make DESTDIR=%{buildroot} install install-man
%license COPYING %license COPYING
%doc README.md %doc README.md
%{_bindir}/%{name} %{_bindir}/%{name}
%{_mandir}/man1/%{name}.1.gz %{_mandir}/man1/*
%{_modulesloaddir}/fuse-overlayfs.conf
%changelog %changelog
* Mon Aug 19 2019 Jindrich Novy <jnovy@redhat.com> - 0.3-5 * Wed Aug 11 2021 Jindrich Novy <jnovy@redhat.com> - 1.7.1-1
- revert fuse-overlayfs to commit 6d269aa - update to https://github.com/containers/fuse-overlayfs/releases/tag/v1.7.1
- Resolves: #1720707 - Related: #1970747
* Fri Jul 30 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 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
* Wed Feb 20 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.3-4.dev.gitd760789 * Wed Feb 20 2019 Frantisek Kluknavsky <fkluknav@redhat.com> - 0.3-4.dev.gitd760789
- rebase - rebase