commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2020-08-18 15:10:41
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new.3399 (New)
Package is "cachefilesd"
Tue Aug 18 15:10:41 2020 rev:23 rq:827024 version:0.10.10
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2015-10-08
08:24:47.0 +0200
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new.3399/cachefilesd.changes
2020-08-18 15:10:43.200032444 +0200
@@ -1,0 +2,7 @@
+Sun Aug 16 12:45:03 UTC 2020 - Dirk Mueller
+
+- update to 0.10.10:
+ * no changelog available
+ - remove fix-cpu-spin.patch (solved differently upstream)
+
+---
Old:
cachefilesd-0.10.5.tar.bz2
fix-cpu-spin.patch
New:
cachefilesd-0.10.10.tar.bz2
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.oq2f1i/_old 2020-08-18 15:10:45.160033256 +0200
+++ /var/tmp/diff_new_pack.oq2f1i/_new 2020-08-18 15:10:45.164033257 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cachefilesd
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,29 +12,27 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
Name: cachefilesd
-Version:0.10.5
+Version:0.10.10
Release:0
Summary:CacheFiles userspace management daemon
-License:GPL-2.0+
+License:GPL-2.0-or-later
Group: System/Daemons
-Url:http://people.redhat.com/~dhowells/fscache/
+URL:https://people.redhat.com/~dhowells/fscache/
Source:
http://people.redhat.com/~dhowells/fscache/%{name}-%{version}.tar.bz2
Patch0: cachefilesd-autotools.patch
Patch1: cachefilesd-config.patch
Patch2: cachefilesd-loadmod.patch
Patch3: cachefilesd-monitoring-howto-update.patch
-Patch4: fix-cpu-spin.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libkmod-devel
-BuildRequires: pkg-config
+BuildRequires: pkgconfig
BuildRequires: systemd-rpm-macros
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%description
@@ -47,16 +45,15 @@
%patch1
%patch2
%patch3 -p1
-%patch4 -p1
-autoreconf -fiv
%build
+autoreconf -fiv
%configure \
--with-systemdsystemunitdir=%{_unitdir}
-make %{?_smp_mflags} %{?smp_mflags}
+%make_build %{?smp_mflags}
%install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+%make_install
mkdir -p %{buildroot}%{_localstatedir}/cache/fscache
install -m 644 cachefilesd.service %{buildroot}%{_unitdir}/cachefilesd.service
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
@@ -74,7 +71,6 @@
%service_del_postun %{name}.service
%files
-%defattr(-, root, root)
%doc README *.txt
%{_mandir}/man?/*
%{_sbindir}/cachefilesd
++ cachefilesd-0.10.5.tar.bz2 -> cachefilesd-0.10.10.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cachefilesd-0.10.5/.gitignore
new/cachefilesd-0.10.10/.gitignore
--- old/cachefilesd-0.10.5/.gitignore 2011-12-06 14:38:00.0 +0100
+++ new/cachefilesd-0.10.10/.gitignore 2017-03-08 17:38:13.0 +0100
@@ -1 +1,4 @@
cachefilesd
+*.o
+*~
+\#*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/cachefilesd-0.10.5/Makefile
new/cachefilesd-0.10.10/Makefile
--- old/cachefilesd-0.10.5/Makefile 2011-12-06 14:38:00.0 +0100
+++ new/cachefilesd-0.10.10/Makefile2017-03-08 17:38:13.0 +0100
@@ -1,9 +1,10 @@
-CFLAGS := -g -O2 -Wall
+CFLAGS := -g -O2 -Wall -Wsign-compare
INSTALL:= install
DESTDIR:=
ETCDIR := /etc
BINDIR := /bin
SBINDIR:= /sbin
+MANDIR := /usr/share/man
SPECFILE := redhat/cachefilesd.spec
LNS:= ln -sf
@@ -14,7 +15,8 @@
#
###
VERSION:= $(word 2,$(shell grep "^Version:" $(SPECFILE)))
-TARBALL:= cachefilesd-$(VERSION).tar.bz2
+TARBALL:= cachefilesd-$(VERSION).tar
+ZTARBALL := $(TARBALL).bz2
###
commit cachefilesd for openSUSE:Factory
Hello community, here is the log from the commit of package cachefilesd for openSUSE:Factory checked in at 2015-10-08 08:24:43 Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old) and /work/SRC/openSUSE:Factory/.cachefilesd.new (New) Package is "cachefilesd" Changes: --- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2015-06-03 08:35:34.0 +0200 +++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes 2015-10-08 08:24:47.0 +0200 @@ -1,0 +2,5 @@ +Mon Oct 5 00:00:00 CEST 2015 - bmwiedem...@suse.de + +- replace sources with compressed tarball + +--- Other differences: -- ++ cachefilesd-0.10.5.tar.bz2 ++ 3237 lines of diff (skipped)
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2015-06-03 08:35:33
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new (New)
Package is "cachefilesd"
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2014-03-18
13:41:15.0 +0100
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes
2015-06-03 08:35:34.0 +0200
@@ -1,0 +2,9 @@
+Fri May 29 17:47:17 UTC 2015 - mplus...@suse.com
+
+- Use url for source
+- Update dependencies
+ * don't depend on whole systemd
+- Move autoreconf to %prepare section
+- Add rcservice symlink
+
+---
Old:
cachefilesd-0.10.5.tar.xz
New:
cachefilesd-0.10.5.tar.bz2
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.qd0UCB/_old 2015-06-03 08:35:35.0 +0200
+++ /var/tmp/diff_new_pack.qd0UCB/_new 2015-06-03 08:35:35.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cachefilesd
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,23 +17,24 @@
Name: cachefilesd
+Version:0.10.5
+Release:0
Summary:CacheFiles userspace management daemon
License:GPL-2.0+
Group: System/Daemons
-Version:0.10.5
-Release:0
-Source: %{name}-%{version}.tar.xz
+Url:http://people.redhat.com/~dhowells/fscache/
+Source:
http://people.redhat.com/~dhowells/fscache/%{name}-%{version}.tar.bz2
Patch0: cachefilesd-autotools.patch
Patch1: cachefilesd-config.patch
Patch2: cachefilesd-loadmod.patch
Patch3: cachefilesd-monitoring-howto-update.patch
Patch4: fix-cpu-spin.patch
-Url:http://people.redhat.com/~dhowells/fscache/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libkmod-devel
-BuildRequires: pkgconfig
-BuildRequires: systemd
+BuildRequires: pkg-config
+BuildRequires: systemd-rpm-macros
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
%description
@@ -47,15 +48,18 @@
%patch2
%patch3 -p1
%patch4 -p1
-%build
autoreconf -fiv
-%configure --with-systemdsystemunitdir=%{_unitdir}
-make %{?smp_mflags}
+
+%build
+%configure \
+--with-systemdsystemunitdir=%{_unitdir}
+make %{?_smp_mflags} %{?smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-mkdir -p $RPM_BUILD_ROOT/var/cache/fscache
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+mkdir -p %{buildroot}%{_localstatedir}/cache/fscache
install -m 644 cachefilesd.service %{buildroot}%{_unitdir}/cachefilesd.service
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%pre
%service_add_pre %{name}.service
@@ -74,8 +78,9 @@
%doc README *.txt
%{_mandir}/man?/*
%{_sbindir}/cachefilesd
-%config(noreplace) /etc/cachefilesd.conf
-%dir /var/cache/fscache
+%{_sbindir}/rc%{name}
+%config(noreplace) %{_sysconfdir}/cachefilesd.conf
+%dir %{_localstatedir}/cache/fscache
%{_unitdir}/%{name}.service
%changelog
++ cachefilesd-0.10.5.tar.xz -> cachefilesd-0.10.5.tar.bz2 ++
3237 lines of diff (skipped)
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2014-03-18 13:41:14
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new (New)
Package is "cachefilesd"
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2013-03-21
22:02:03.0 +0100
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes
2014-03-18 13:41:15.0 +0100
@@ -1,0 +2,7 @@
+Tue Mar 11 02:38:09 UTC 2014 - nfbr...@suse.com
+
+- fix-cpu-spin.patch - Fix problem were cachefilesd
+ would sometimes enter a tight loop wasting CPU time.
+ bnc#843575
+
+---
New:
fix-cpu-spin.patch
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.p5Jq10/_old 2014-03-18 13:41:16.0 +0100
+++ /var/tmp/diff_new_pack.p5Jq10/_new 2014-03-18 13:41:16.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cachefilesd
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: cachefilesd
Summary:CacheFiles userspace management daemon
License:GPL-2.0+
@@ -26,6 +27,7 @@
Patch1: cachefilesd-config.patch
Patch2: cachefilesd-loadmod.patch
Patch3: cachefilesd-monitoring-howto-update.patch
+Patch4: fix-cpu-spin.patch
Url:http://people.redhat.com/~dhowells/fscache/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
@@ -44,6 +46,7 @@
%patch1
%patch2
%patch3 -p1
+%patch4 -p1
%build
autoreconf -fiv
%configure --with-systemdsystemunitdir=%{_unitdir}
++ fix-cpu-spin.patch ++
Git-commit: 9a4160bcfc4b859b848fabed112ee9382be3cc27
From: NeilBrown
Date: Tue, 4 Feb 2014 15:47:00 +1100
Subject: [PATCH] cachefilesd can spin when disk space is short.
References: bnc#843575
When cachefilesd finds that it needs to cull, but that culling doesn't
achieve anything, it sets an alarm to wake it in 30 seconds to try again.
But as read_cache_state() will detect that culling is still needed, it will
immediately try again anyway.
This results in 100% cpu usage of no value.
This patch causes culling to be blocked until the 30 second alarm goes off.
It also changes the test to decide whether to enter poll() after blocking
signals to test exactly those values that might be changed by a signal.
Testing these is important, testing anything else is pointless.
Signed-off-by: NeilBrown
---
cachefilesd.c |9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--- cachefilesd-0.10.5.orig/cachefilesd.c
+++ cachefilesd-0.10.5/cachefilesd.c
@@ -98,6 +98,7 @@ static struct object **cullready;
static int oldest_build = -1;
static int oldest_ready = -1;
static int ncullable = 0;
+static int cull_delayed = 0;
static const char *configfile = "/etc/cachefilesd.conf";
@@ -244,6 +245,7 @@ static void sigio(int sig)
static void sigalrm(int sig)
{
jumpstart_scan = 1;
+ cull_delayed = 0;
}
/*/
@@ -605,11 +607,11 @@ static void cachefilesd(void)
/* sleep without racing on reap and cull with the signal
* handlers */
- if (!scan && !reap && !cull) {
+ if (!scan && !reap && !(cull && !cull_delayed)) {
if (sigprocmask(SIG_BLOCK, &sigs, &osigs) < 0)
oserror("Unable to block signals");
- if (!reap && !cull) {
+ if (!reap && !stop && !jumpstart_scan) {
if (ppoll(pollfds, 1, NULL, &osigs) < 0 &&
errno != EINTR)
oserror("Unable to suspend process");
@@ -636,7 +638,7 @@ static void cachefilesd(void)
if (cull) {
if (oldest_ready >= 0)
cull_objects();
- else if (oldest_build < 0)
+ else if (oldest_build < 0 && !cull_delayed)
jumpstart_scan = 1;
}
@@ -1351,6 +1353,7 @@ static void decant_cull_table(void)
/* if nothing there, scan again in a short while */
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2013-03-21 22:02:02
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new (New)
Package is "cachefilesd", Maintainer is "sjayara...@novell.com"
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2013-03-05
10:03:17.0 +0100
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes
2013-03-21 22:02:03.0 +0100
@@ -1,0 +2,5 @@
+Thu Mar 14 21:45:22 UTC 2013 - p.drou...@gmail.com
+
+- Use real systemd service file instead of sysvinit converted file
+
+---
Old:
cachefilesd.init
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.G899Te/_old 2013-03-21 22:02:04.0 +0100
+++ /var/tmp/diff_new_pack.G899Te/_new 2013-03-21 22:02:04.0 +0100
@@ -15,16 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-
Name: cachefilesd
-PreReq: %insserv_prereq
Summary:CacheFiles userspace management daemon
License:GPL-2.0+
Group: System/Daemons
Version:0.10.5
Release:0
Source: %{name}-%{version}.tar.xz
-Source1:cachefilesd.init
Patch0: cachefilesd-autotools.patch
Patch1: cachefilesd-config.patch
Patch2: cachefilesd-loadmod.patch
@@ -55,23 +52,18 @@
%install
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/var/cache/fscache
-install -D -c -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/cachefilesd
-ln -s ../../etc/init.d/cachefilesd $RPM_BUILD_ROOT/usr/sbin/rccachefilesd
+install -m 644 cachefilesd.service %{buildroot}%{_unitdir}/cachefilesd.service
%pre
%service_add_pre %{name}.service
%preun
-%stop_on_removal cachefilesd
%service_del_preun %{name}.service
%post
-%fillup_and_insserv cachefilesd
%service_add_post %{name}.service
%postun
-%restart_on_update cachefilesd
-%insserv_cleanup
%service_del_postun %{name}.service
%files
@@ -79,8 +71,6 @@
%doc README *.txt
%{_mandir}/man?/*
%{_sbindir}/cachefilesd
-%config /etc/init.d/cachefilesd
-/usr/sbin/rccachefilesd
%config(noreplace) /etc/cachefilesd.conf
%dir /var/cache/fscache
%{_unitdir}/%{name}.service
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2013-03-05 10:03:15
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new (New)
Package is "cachefilesd", Maintainer is "sjayara...@novell.com"
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2012-11-11
08:14:33.0 +0100
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes
2013-03-05 10:03:17.0 +0100
@@ -1,0 +2,7 @@
+Mon Mar 4 22:57:37 UTC 2013 - dm...@suse.com
+
+- Added a modification to the howto that reflects the current
+ location and material in the cachefilesd monitoring facility.
+ From text by bk...@suse.com (bnc#804834)
+
+---
New:
cachefilesd-monitoring-howto-update.patch
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.m4OwH4/_old 2013-03-05 10:03:19.0 +0100
+++ /var/tmp/diff_new_pack.m4OwH4/_new 2013-03-05 10:03:19.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package cachefilesd
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -28,6 +28,7 @@
Patch0: cachefilesd-autotools.patch
Patch1: cachefilesd-config.patch
Patch2: cachefilesd-loadmod.patch
+Patch3: cachefilesd-monitoring-howto-update.patch
Url:http://people.redhat.com/~dhowells/fscache/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
@@ -45,6 +46,7 @@
%patch0
%patch1
%patch2
+%patch3 -p1
%build
autoreconf -fiv
%configure --with-systemdsystemunitdir=%{_unitdir}
++ cachefilesd-monitoring-howto-update.patch ++
---
howto.txt | 23 ++-
1 file changed, 22 insertions(+), 1 deletion(-)
--- a/howto.txt
+++ b/howto.txt
@@ -236,7 +236,28 @@ data exposed through files in /proc/sys/
The last error incurred when writing a page to the cache.
Note that these sysctl parameters are only temporary and will be integrated in
-to the NFS per-mount statistics sometime in the future.
+to the NFS per-mount statistics (proc/self/mountstats) sometime in the future.
+
+
+NFS per mount statistics will be displayed on a line beginning with fsc: and
+followed by 5 columns of numbers. The columns correspond to:
+
+ (*) NFSIOS_FSCACHE_PAGES_READ_OK
+
+ The number of pages read from the cache.
+
+ (*) NFSIOS_FSCACHE_PAGES_READ_FAIL
+
+ The number of pages read but not from cache.
+
+ (*) NFSIOS_FSCACHE_PAGES_WRITTEN_OK
+ (*) NFSIOS_FSCACHE_PAGES_WRITTEN_FAIL
+
+ These two columns are currently not used.
+
+ (*) NCSIOS_FSCACHE_PAGES_UNCACHED
+
+ The number of pages removed from cache.
Futhermore, the caching state of individual mountpoints can be examined through
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2012-11-11 08:14:31
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new (New)
Package is "cachefilesd", Maintainer is "sjayara...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2012-10-23
19:35:37.0 +0200
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes
2012-11-11 08:14:33.0 +0100
@@ -1,0 +2,7 @@
+Thu Nov 1 16:42:48 UTC 2012 - crrodrig...@opensuse.org
+
+- IF the user starts the daemon he/she expects it to work
+ with no fiddling, load the cachefiles kernel module
+ directly from the daemon using libkmod so it just works.
+
+---
New:
cachefilesd-loadmod.patch
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.f1PBbO/_old 2012-11-11 08:14:34.0 +0100
+++ /var/tmp/diff_new_pack.f1PBbO/_new 2012-11-11 08:14:34.0 +0100
@@ -27,9 +27,11 @@
Source1:cachefilesd.init
Patch0: cachefilesd-autotools.patch
Patch1: cachefilesd-config.patch
+Patch2: cachefilesd-loadmod.patch
Url:http://people.redhat.com/~dhowells/fscache/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: automake
+BuildRequires: libkmod-devel
BuildRequires: pkgconfig
BuildRequires: systemd
%{?systemd_requires}
@@ -42,7 +44,7 @@
%setup -q
%patch0
%patch1
-
+%patch2
%build
autoreconf -fiv
%configure --with-systemdsystemunitdir=%{_unitdir}
@@ -53,8 +55,6 @@
mkdir -p $RPM_BUILD_ROOT/var/cache/fscache
install -D -c -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/cachefilesd
ln -s ../../etc/init.d/cachefilesd $RPM_BUILD_ROOT/usr/sbin/rccachefilesd
-mkdir -p %{buildroot}/usr/lib/modules-load.d
-echo "cachefiles" > %{buildroot}/usr/lib/modules-load.d/cachefiles.conf
%pre
%service_add_pre %{name}.service
@@ -82,6 +82,5 @@
%config(noreplace) /etc/cachefilesd.conf
%dir /var/cache/fscache
%{_unitdir}/%{name}.service
-/usr/lib/modules-load.d/cachefiles.conf
%changelog
++ cachefilesd-autotools.patch ++
--- /var/tmp/diff_new_pack.f1PBbO/_old 2012-11-11 08:14:34.0 +0100
+++ /var/tmp/diff_new_pack.f1PBbO/_new 2012-11-11 08:14:34.0 +0100
@@ -84,7 +84,7 @@
-Type=simple
-ExecStartPre=-/sbin/modprobe -qab cachefiles
-ExecStart=/sbin/cachefilesd -n -f /etc/cachefilesd.conf
-+ExecStart=/usr/sbin/cachefilesd -n -f /etc/cachefilesd.conf
++ExecStart=/usr/sbin/cachefilesd -s -n
[Install]
WantedBy=multi-user.target
++ cachefilesd-loadmod.patch ++
--- cachefilesd.c.orig
+++ cachefilesd.c
@@ -50,6 +50,7 @@
#include
#include
#include
+#include
typedef enum objtype {
OBJTYPE_INDEX,
@@ -278,6 +279,9 @@ int main(int argc, char *argv[])
char *line, *cp;
long page_size;
int _cachefd, nullfd, opt, loop, open_max, nodaemon = 0;
+ struct kmod_ctx *ctx;
+ struct kmod_module *mod;
+ int kmod_status;
/* handle help request */
if (argc == 2 && strcmp(argv[1], "--help") == 0)
@@ -344,6 +348,29 @@ int main(int argc, char *argv[])
/* just in case... */
sync();
+ if (!(ctx = kmod_new(NULL, NULL))) {
+ oserror("Failed to allocate memory for kmod.");
+}
+
+ kmod_load_resources(ctx);
+
+ kmod_status = kmod_module_new_from_name(ctx, "cachefiles", &mod);
+
+ if(kmod_status < 0) oserror("Cannot load cachefiles module");
+
+ kmod_status = kmod_module_probe_insert_module(mod,
KMOD_PROBE_APPLY_BLACKLIST,NULL, NULL, NULL, NULL);
+
+ if (kmod_status == 0)
+ info("Inserted module '%s'", kmod_module_get_name(mod));
+ else if (kmod_status == KMOD_PROBE_APPLY_BLACKLIST)
+ oserror("Module '%s' is blacklisted",
kmod_module_get_name(mod));
+ else {
+ oserror("Failed to insert '%s'", kmod_module_get_name(mod));
+ }
+
+ kmod_module_unref(mod);
+ kmod_unref(ctx);
+
/* open the devfile or the procfile on fd 3 */
_cachefd = open(devfile, O_RDWR);
if (_cachefd < 0) {
--- configure.ac.orig
+++ configure.ac
@@ -29,6 +29,8 @@ AC_SUBST([systemdsystemunitdir], [$with_
fi
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a
"x$with_systemdsystemunitdir" != xno ])
+PKG_CHECK_MODULES([KMOD], [libkmod])
+
# Checks for typedefs, structures, and compiler characteristics.
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
--- Makefile.am.orig
+++ Makefile.am
@@ -8,7 +8,8 @@ endif
sysconf_DATA = cachefilesd.conf
-cachefilesd_CFLAGS =
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at 2012-10-23 19:35:35
Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old)
and /work/SRC/openSUSE:Factory/.cachefilesd.new (New)
Package is "cachefilesd", Maintainer is "sjayara...@suse.com"
Changes:
--- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2011-09-23
01:53:04.0 +0200
+++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes
2012-10-23 19:35:37.0 +0200
@@ -1,0 +2,12 @@
+Tue Jul 10 21:23:14 UTC 2012 - crrodrig...@opensuse.org
+
+- Use autotools to build the package.
+- Fix the configuration files not to enforce a selinux policy.
+
+---
+Tue Jul 10 20:08:25 UTC 2012 - crrodrig...@opensuse.org
+
+- Update to version 0.10.5, no changelog found.
+- Add systemd units.
+
+---
Old:
cachefilesd-0.9.tar.bz2
cachefilesd-dir-fix.diff
cachefilesd-header.patch
New:
cachefilesd-0.10.5.tar.xz
cachefilesd-autotools.patch
cachefilesd-config.patch
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.vfmni2/_old 2012-10-23 19:35:46.0 +0200
+++ /var/tmp/diff_new_pack.vfmni2/_new 2012-10-23 19:35:46.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package cachefilesd
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,20 +16,23 @@
#
-
Name: cachefilesd
-License:GPL-2.0+
-Group: System/Daemons
PreReq: %insserv_prereq
Summary:CacheFiles userspace management daemon
-Version:0.9
-Release:13
-Source: %{name}-%{version}.tar.bz2
+License:GPL-2.0+
+Group: System/Daemons
+Version:0.10.5
+Release:0
+Source: %{name}-%{version}.tar.xz
Source1:cachefilesd.init
-Patch1: cachefilesd-dir-fix.diff
-Patch2: cachefilesd-header.patch
+Patch0: cachefilesd-autotools.patch
+Patch1: cachefilesd-config.patch
Url:http://people.redhat.com/~dhowells/fscache/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: automake
+BuildRequires: pkgconfig
+BuildRequires: systemd
+%{?systemd_requires}
%description
cachefilesd is a user-space management daemon for CacheFiles, a generic
@@ -37,37 +40,48 @@
%prep
%setup -q
-%patch1 -p1
-%patch2 -p1
+%patch0
+%patch1
%build
-make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+autoreconf -fiv
+%configure --with-systemdsystemunitdir=%{_unitdir}
+make %{?smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
mkdir -p $RPM_BUILD_ROOT/var/cache/fscache
install -D -c -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/cachefilesd
-mkdir $RPM_BUILD_ROOT/usr/sbin
ln -s ../../etc/init.d/cachefilesd $RPM_BUILD_ROOT/usr/sbin/rccachefilesd
+mkdir -p %{buildroot}/usr/lib/modules-load.d
+echo "cachefiles" > %{buildroot}/usr/lib/modules-load.d/cachefiles.conf
+
+%pre
+%service_add_pre %{name}.service
%preun
%stop_on_removal cachefilesd
+%service_del_preun %{name}.service
%post
%fillup_and_insserv cachefilesd
+%service_add_post %{name}.service
%postun
%restart_on_update cachefilesd
%insserv_cleanup
+%service_del_postun %{name}.service
%files
%defattr(-, root, root)
%doc README *.txt
-%doc %{_mandir}/man?/*
-/sbin/cachefilesd
-/etc/init.d/cachefilesd
+%{_mandir}/man?/*
+%{_sbindir}/cachefilesd
+%config /etc/init.d/cachefilesd
/usr/sbin/rccachefilesd
%config(noreplace) /etc/cachefilesd.conf
%dir /var/cache/fscache
+%{_unitdir}/%{name}.service
+/usr/lib/modules-load.d/cachefiles.conf
%changelog
++ cachefilesd-autotools.patch ++
--- /dev/null
+++ configure.ac
@@ -0,0 +1,42 @@
+# -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ([2.60])
+AC_INIT([cachefilesd], [0.10.5], [http://people.redhat.com/~dhowells/fscache/])
+AC_CONFIG_SRCDIR([cachefilesd.c])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE([foreign -Wall -Wno-portability tar-pax no-dist-gzip dist-xz
subdir-objects])
+# Checks for programs.
+AC_PROG_CC_STDC
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
+# Checks for libraries.
+
+# Checks for header files.
+AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h sys/vfs.h syslog.h
unistd.h])
+
+# systemd check
+P
commit cachefilesd for openSUSE:Factory
Hello community, here is the log from the commit of package cachefilesd for openSUSE:Factory checked in at 2011-12-06 18:02:21 Comparing /work/SRC/openSUSE:Factory/cachefilesd (Old) and /work/SRC/openSUSE:Factory/.cachefilesd.new (New) Package is "cachefilesd", Maintainer is "ti...@suse.com" Changes: Other differences: -- ++ cachefilesd.spec ++ --- /var/tmp/diff_new_pack.JQbA5u/_old 2011-12-06 18:04:17.0 +0100 +++ /var/tmp/diff_new_pack.JQbA5u/_new 2011-12-06 18:04:17.0 +0100 @@ -18,7 +18,7 @@ Name: cachefilesd -License:GPL v2 or later +License:GPL-2.0+ Group: System/Daemons PreReq: %insserv_prereq Summary:CacheFiles userspace management daemon -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at Wed Sep 21 16:56:48 CEST 2011.
--- cachefilesd/cachefilesd.changes 2011-06-06 10:33:44.0 +0200
+++ /mounts/work_src_done/STABLE/cachefilesd/cachefilesd.changes
2011-09-17 23:59:43.0 +0200
@@ -1,0 +2,6 @@
+Sat Sep 17 21:59:39 UTC 2011 - jeng...@medozas.de
+
+- Remove redundant tags/sections from specfile
+- Use %_smp_mflags for parallel build
+
+---
calling whatdependson for head-i586
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.EoiX6n/_old 2011-09-21 16:56:43.0 +0200
+++ /var/tmp/diff_new_pack.EoiX6n/_new 2011-09-21 16:56:43.0 +0200
@@ -15,14 +15,12 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Name: cachefilesd
License:GPL v2 or later
Group: System/Daemons
PreReq: %insserv_prereq
-AutoReqProv:on
Summary:CacheFiles userspace management daemon
Version:0.9
Release:13
@@ -37,19 +35,13 @@
cachefilesd is a user-space management daemon for CacheFiles, a generic
caching framework for mounted filesystems.
-
-
-Authors:
-
-David Howells
-
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%build
-make CFLAGS="$RPM_OPT_FLAGS"
+make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
%install
make DESTDIR=$RPM_BUILD_ROOT install
@@ -68,9 +60,6 @@
%restart_on_update cachefilesd
%insserv_cleanup
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
%files
%defattr(-, root, root)
%doc README *.txt
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit cachefilesd for openSUSE:Factory
Hello community,
here is the log from the commit of package cachefilesd for openSUSE:Factory
checked in at Tue Jun 7 10:57:01 CEST 2011.
--- cachefilesd/cachefilesd.changes 2009-04-20 15:51:56.0 +0200
+++ /mounts/work_src_done/STABLE/cachefilesd/cachefilesd.changes
2011-06-06 10:33:44.0 +0200
@@ -1,0 +2,7 @@
+Mon Jun 6 08:28:27 UTC 2011 - a...@suse.de
+
+- Fix build with newer glibc due to missing includes.
+- Use RPM_OPT_FLAGS.
+- Add short description to init file.
+
+---
calling whatdependson for head-i586
New:
cachefilesd-header.patch
Other differences:
--
++ cachefilesd.spec ++
--- /var/tmp/diff_new_pack.N8shRt/_old 2011-06-07 10:53:20.0 +0200
+++ /var/tmp/diff_new_pack.N8shRt/_new 2011-06-07 10:53:20.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package cachefilesd (Version 0.9)
+# spec file for package cachefilesd
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,10 +25,11 @@
AutoReqProv:on
Summary:CacheFiles userspace management daemon
Version:0.9
-Release:3
+Release:13
Source: %{name}-%{version}.tar.bz2
Source1:cachefilesd.init
-Patch: cachefilesd-dir-fix.diff
+Patch1: cachefilesd-dir-fix.diff
+Patch2: cachefilesd-header.patch
Url:http://people.redhat.com/~dhowells/fscache/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -44,10 +45,11 @@
%prep
%setup -q
-%patch -p1
+%patch1 -p1
+%patch2 -p1
%build
-make
+make CFLAGS="$RPM_OPT_FLAGS"
%install
make DESTDIR=$RPM_BUILD_ROOT install
++ cachefilesd-header.patch ++
Index: cachefilesd-0.9/cachefilesd.c
===
--- cachefilesd-0.9.orig/cachefilesd.c
+++ cachefilesd-0.9/cachefilesd.c
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
typedef enum objtype {
OBJTYPE_INDEX,
++ cachefilesd.init ++
--- /var/tmp/diff_new_pack.N8shRt/_old 2011-06-07 10:53:21.0 +0200
+++ /var/tmp/diff_new_pack.N8shRt/_new 2011-06-07 10:53:21.0 +0200
@@ -6,6 +6,7 @@
# Required-Stop: $remote_fs $syslog
# Default-Start: 3 5
# Default-Stop:
+# Short-Description: cache files daemon used by remote fs like NFS
# Description:cache files daemon used by remote fs like NFS
### END INIT INFO
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
