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 "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/cachefilesd/cachefilesd.changes 2011-09-23 01:53:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cachefilesd.new/cachefilesd.changes 2012-10-23 19:35:37.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Jul 10 21:23:14 UTC 2012 - [email protected] + +- Use autotools to build the package. +- Fix the configuration files not to enforce a selinux policy. + +------------------------------------------------------------------- +Tue Jul 10 20:08:25 UTC 2012 - [email protected] + +- 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.000000000 +0200 +++ /var/tmp/diff_new_pack.vfmni2/_new 2012-10-23 19:35:46.000000000 +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 +PKG_PROG_PKG_CONFIG +AC_ARG_WITH([systemdsystemunitdir], +AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), +[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)]) +if test "x$with_systemdsystemunitdir" != xno; then +AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) +fi +AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T + +# Checks for library functions. +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_CHECK_FUNCS([alarm dup2 fchdir gettimeofday memchr memmove memset rmdir strchr strdup strpbrk strtoul strtoull]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT --- /dev/null +++ Makefile.am @@ -0,0 +1,14 @@ +DISTCHECK_CONFIGURE_FLAGS = --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) + +sbin_PROGRAMS = cachefilesd + +if HAVE_SYSTEMD +systemdsystemunit_DATA = cachefilesd.service +endif + +sysconf_DATA = cachefilesd.conf + +cachefilesd_CFLAGS = -fwhole-program +cachefilesd_SOURCES = cachefilesd.c +dist_man8_MANS = cachefilesd.8 +dist_man5_MANS = cachefilesd.conf.5 \ No newline at end of file --- cachefilesd.c.orig +++ cachefilesd.c @@ -27,9 +27,10 @@ * NUL characters are cause for error */ +#include "config.h" + #define CACHEFILESD_VERSION "0.10.2" -#define _GNU_SOURCE #include <stdarg.h> #include <stdio.h> #include <stdlib.h> --- cachefilesd.service.orig +++ cachefilesd.service @@ -2,9 +2,7 @@ Description=Local network file caching management daemon [Service] -Type=simple -ExecStartPre=-/sbin/modprobe -qab cachefiles -ExecStart=/sbin/cachefilesd -n -f /etc/cachefilesd.conf +ExecStart=/usr/sbin/cachefilesd -n -f /etc/cachefilesd.conf [Install] WantedBy=multi-user.target ++++++ cachefilesd-config.patch ++++++ --- cachefilesd.conf.orig +++ cachefilesd.conf @@ -21,4 +21,4 @@ fstop 3% # Assuming you're using SELinux with the default security policy included in # this package -secctx system_u:system_r:cachefiles_kernel_t:s0 +#secctx system_u:system_r:cachefiles_kernel_t:s0 ++++++ cachefilesd.init ++++++ --- /var/tmp/diff_new_pack.vfmni2/_old 2012-10-23 19:35:46.000000000 +0200 +++ /var/tmp/diff_new_pack.vfmni2/_new 2012-10-23 19:35:46.000000000 +0200 @@ -18,7 +18,7 @@ MODPROBE=/sbin/modprobe MODPROBE_ARGS="" PROG="cachefilesd" -PROG_BIN=/sbin/$PROG +PROG_BIN=/usr/sbin/$PROG [ ! -x $PROG_BIN ] && exit 0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
