From c91df93eefe33d8f1a9d28a02f312cb5fb0d603e Mon Sep 17 00:00:00 2001 From: David Howells Date: Thu, 4 Feb 2016 11:28:29 +0000 Subject: [PATCH] Move to version 0.10.7 - Note the correct licence. - Handle malformed kernel status correctly. - Permit culling to be disabled on the command line with the -N flag. - Suspend culling when cache space is short and cache objects are pinned. - Call setgroups() before calling setuid() (caught by rpmlint). --- .gitignore | 14 +-------- cachefilesd.spec | 74 ++++++++++++++++++------------------------------ sources | 2 +- 3 files changed, 29 insertions(+), 61 deletions(-) diff --git a/.gitignore b/.gitignore index 058430e..628d71c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1 @@ -cachefilesd-0.1.tar.bz2 -cachefilesd-0.2.tar.bz2 -cachefilesd-0.3.tar.bz2 -cachefilesd-0.4.tar.bz2 -cachefilesd-0.5.tar.bz2 -cachefilesd-0.6.tar.bz2 -cachefilesd-0.7.tar.bz2 -cachefilesd-0.9.tar.bz2 -cachefilesd-0.10.tar.bz2 -cachefilesd-0.10.1.tar.bz2 -/cachefilesd-0.10.3.tar.bz2 -/cachefilesd-0.10.4.tar.bz2 -/cachefilesd-0.10.5.tar.bz2 +/cachefilesd-*.tar.bz2 diff --git a/cachefilesd.spec b/cachefilesd.spec index 3298aaf..a8d5500 100644 --- a/cachefilesd.spec +++ b/cachefilesd.spec @@ -1,14 +1,12 @@ # % define buildid .local Name: cachefilesd -Version: 0.10.5 -Release: 10%{?dist}%{?buildid} +Version: 0.10.7 +Release: 1%{?dist}%{?buildid} Summary: CacheFiles user-space management daemon Group: System Environment/Daemons -# TODO: source code and config file claim "GPLv2+" -License: GPLv2 +License: GPLv2+ URL: http://people.redhat.com/~dhowells/fscache/ -# TODO: it's not a bzip2 file! Source0: http://people.redhat.com/dhowells/fscache/cachefilesd-%{version}.tar.bz2 BuildRequires: systemd-units @@ -22,16 +20,11 @@ The cachefilesd daemon manages the caching files and directory that are that are used by network file systems such a AFS and NFS to do persistent caching to the local disk. +%global docdir %{_docdir}/cachefilesd + %prep %setup -q -# these should be fixed upstream -%if 0%{?fedora} && 0%{?fedora} >= 20 -sed -i 's!\(/usr/share/doc/cachefilesd\)-[0-9\.\*]*/!\1/!g' cachefilesd.8 cachefilesd.conf.5 howto.txt README selinux/move-cache.txt -%endif -# that package doesn't exist anymore -sed -i 's!cachefilesd-selinux!cachefilesd!g' selinux/move-cache.txt - %build %ifarch s390 s390x PIE="-fPIE" @@ -41,14 +34,22 @@ PIE="-fpie" export PIE CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`" -make all CFLAGS="$CFLAGS" +make all \ + ETCDIR=%{_sysconfdir} \ + SBINDIR=%{_sbindir} \ + MANDIR=%{_mandir} \ + CFLAGS="-Wall $RPM_OPT_FLAGS -Werror" %install -mkdir -p %{buildroot}/sbin +mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}%{_mandir}/{man5,man8} mkdir -p %{buildroot}%{_localstatedir}/cache/fscache -make DESTDIR=%{buildroot} install +make DESTDIR=%{buildroot} install \ + ETCDIR=%{_sysconfdir} \ + SBINDIR=%{_sbindir} \ + MANDIR=%{_mandir} \ + CFLAGS="-Wall $RPM_OPT_FLAGS -Werror" install -m 644 cachefilesd.conf %{buildroot}%{_sysconfdir} install -m 644 cachefilesd.service %{buildroot}%{_unitdir}/cachefilesd.service @@ -81,41 +82,20 @@ fi %doc selinux/*.if %doc selinux/*.te %config(noreplace) %{_sysconfdir}/cachefilesd.conf -/sbin/* +%{_sbindir}/* %{_unitdir}/* %{_mandir}/*/* %{_localstatedir}/cache/fscache %changelog -* Wed Feb 03 2016 Fedora Release Engineering - 0.10.5-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild +* Wed Feb 3 2016 David Howells 0.10.7-1 +- Call setgroups() before calling setuid() (caught by rpmlint). -* Wed Jun 17 2015 Fedora Release Engineering - 0.10.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 0.10.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 0.10.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Dec 22 2013 Michael Schwendt - 0.10.5-6 -- Fix package for FTBFS and F20 UnversionedDocDirs (#992036) -- Use sed in %%prep to substitute doc path references and to remove - the references to the old cachefilesd-selinux package -- Remove obsolete spec items (buildroot definition, cleaning, %%defattr) - -* Sat Aug 03 2013 Fedora Release Engineering - 0.10.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.10.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 0.10.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 0.10.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Wed Feb 3 2016 David Howells 0.10.6-1 +- Note the correct licence. +- Handle malformed kernel status correctly. +- Permit culling to be disabled on the command line with the -N flag. +- Suspend culling when cache space is short and cache objects are pinned. * Tue Dec 6 2011 David Howells 0.10.5-1 - Fix systemd service data according to review comments [RH BZ 754811]. @@ -162,13 +142,13 @@ fi * Mon Jul 2 2007 David Howells 0.8-16 - Use stat64/fstatat64 to avoid EOVERFLOW errors from the kernel on large files. -* Wed Nov 15 2006 David Howells 0.8-15 +* Tue Nov 14 2006 David Howells 0.8-15 - Made cachefilesd ask the kernel whether cullable objects are in use and omit them from the cull table if they are. - Made the size of cachefilesd's culling tables configurable. - Updated the manual pages. -* Tue Nov 14 2006 David Howells 0.8-14 +* Mon Nov 13 2006 David Howells 0.8-14 - Documented SELinux interaction. * Fri Nov 10 2006 David Howells 0.8-11 @@ -200,7 +180,7 @@ fi - Added postun and preun rules so cachefilesd is stopped and started when the rpm is updated or removed. -* Mon Aug 7 2006 Jesse Keating 0.4-2 +* Tue Aug 8 2006 Jesse Keating 0.4-2 - require /sbin/chkconfig not /usr/bin/chkconfig * Tue Aug 1 2006 David Howells 0.4-1 diff --git a/sources b/sources index d86b53c..5cf5771 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9e85dd0ace346ff47e188ded8c05ab3b cachefilesd-0.10.5.tar.bz2 +ea607d63a2f58cec7ef705bcefc717f4 cachefilesd-0.10.7.tar.bz2