pool/cfengine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Update to 3.6.0b2

Browse Source 
- performance has been significantly improved, with a 10-20% speed
    increase over 3.5 when using the default masterfiles
  - agents support the legacy protocol without TLS envelope
    This allows upgrading of an agent before the policy server.
  - several general improvements and bug fixes too numerous to list
    here.
- remove cfengine-bootstrap.patch, included upstream
- split masterfiles off as cfengine-masterfiles package

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=76
This commit is contained in:
Klaus Kämpf 2014-03-19 18:23:19 +00:00 committed by Git OBS Bridge
parent 5bb1965c97
commit ead513fd57
5 changed files with 56 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cfengine-3.6.0b1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:597c47bfebf7b6b25e65a790ab2782efc624fc7aa727066ffa7f68e37bd11bdd
size 1787137

15
cfengine.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Tue Mar 18 11:30:23 UTC 2014 - kkaempf@suse.com
- Update to 3.6.0b2
- performance has been significantly improved, with a 10-20% speed
increase over 3.5 when using the default masterfiles
- agents support the legacy protocol without TLS envelope
This allows upgrading of an agent before the policy server.
- several general improvements and bug fixes too numerous to list
here.
- remove cfengine-bootstrap.patch, included upstream
- split masterfiles off as cfengine-masterfiles package
-------------------------------------------------------------------
Tue Mar 18 10:20:55 UTC 2014 - aeszter@gwdg.de

71
cfengine.spec
View File

@ -17,9 +17,10 @@
Name: cfengine
%define srcname %{name}
%define srcname core
%define libname libpromises
%define libsoname %{libname}3
%define masterdirname masterfiles-%{version}
# Yes, its not FHS conformant but in sync with cfengine documentation
# reported upstream as https://cfengine.com/dev/issues/1896
@ -32,10 +33,13 @@ Name: cfengine
Summary: CFEngine automates large-scale IT computing infrastructure
License: GPL-3.0
Group: Productivity/Networking/System
Version: 3.6.0b1
Version: 3.6.0b2
Release: 0
Url: http://www.cfengine.org/
Source: %{name}-%{version}.tar.gz
Source: %{srcname}-%{version}.tar.gz
BuildRequires: %{name}-masterfiles = %{version}
Requires: %{name}-masterfiles = %{version}
# wtf? SLE_11 does not honor rpmlintrc
%if 0%{?suse_version} <= 1130
@ -52,7 +56,7 @@ Source9: cf-serverd
%endif
Source10: %{name}.cron
Source11: %{name}-rpmlintrc
Source12: masterfiles-%{version}.tar.gz
# docs
Source101: http://www.cfengine.org/manuals/cf3-Reference.pdf
Source102: http://www.cfengine.org/manuals/cf3-conceptguide.pdf
@ -62,8 +66,6 @@ Source105: http://www.cfengine.org/manuals/cf3-solutions.pdf
Source106: http://www.cfengine.org/manuals/cf3-tutorial.pdf
Source107: http://www.verticalsysadmin.com/cfengine/primer.pdf
# FIX-4-UPSTREAM: fix workdir while bootstrapping
Patch0: %{name}-bootstrap.patch
# there's no /usr/include/acl.h in SUSE or Fedora, kkaempf@suse.de
Patch1: libacl-headers.patch
# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
@ -128,8 +130,8 @@ impact on system resources or performance.
%package -n %{libsoname}
Summary: Shared library of cfengine
Group: System/Libraries
Provides: %{libname}1
Obsoletes: %{libname}1
Provides: %{libname}1 = %{version}
Obsoletes: %{libname}1 < %{version}
%if 0%{?suse_version} == 1010
Requires: glibc
%endif
@ -140,7 +142,7 @@ This package contains the shared libpromises (cfengine) library.
%package -n %{libname}-devel
Summary: Development package for libpromises
Group: Development/Libraries/C and C++
Provides: %{name}-devel < %{version}
Provides: %{name}-devel = %{version}
Obsoletes: %{name}-devel < %{version}
Requires: %{libsoname} = %{version}
Requires: glibc-devel
@ -182,7 +184,6 @@ This package contains the files of the cfengine server.
%prep
%setup -q -n %{srcname}-%{version}
%patch0
%if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel_version}
%patch1
%endif
@ -204,7 +205,7 @@ find ./examples -type f -name "*.cf" -exec perl -p -i -e 's|\r\n|\n|,s|^# Founda
cp -a $RPM_SOURCE_DIR/*pdf docs/
%build
autoreconf -fi
autoreconf -fi -I m4
# /usr/include/sys for acl.h
CC=gcc CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
%configure \
@ -244,6 +245,12 @@ chmod -x ChangeLog
[ -d %{buildroot} ] && [ "%{buildroot}" != "/" ] && %{__rm} -rf %{buildroot}
%endif
%{__make} "DESTDIR=%{buildroot}" install
%if 0%{?suse_version} >= 1110 || 0%{?rhel_version} >= 600
# will appear in cfengine-examples
rm -rf %{buildroot}/%{_docdir}/%{name}/examples
%endif
%{__install} -d %{buildroot}/{usr/sbin,%{workdir}/{bin,inputs,reports}}
# create dirs needed for better organizing dirs and files
@ -278,21 +285,22 @@ for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd
%{__ln_s} -f ../../..%{_sbindir}/${i} %{buildroot}%{workdir}/bin/${i}
done
# Install masterfiles (as %%config(noreplace) )
%{__install} -d %{buildroot}/%{basedir}/masterfiles
tar xf %{S:12}
cd masterfiles-%{version}
make install DESTDIR=%{buildroot}/%{basedir}/masterfiles
# %{__install} -m 0644 masterfiles/def.cf %{buildroot}/%{basedir}/masterfiles
# %{__install} -m 0644 masterfiles/promises.cf %{buildroot}/%{basedir}/masterfiles
# %{__install} -m 0644 masterfiles/libraries/cfengine_stdlib.cf %{buildroot}/%{basedir}/masterfiles
rm -rf %{buildroot}/%{_libdir}/%{name}/libpromises.la
# will appear in %%docdir
rm -rf %{buildroot}/%{_datadir}/%{name}/ChangeLog
rm -rf %{buildroot}/%{_datadir}/%{name}/README
# create man pages, see https://cfengine.com/dev/issues/2989
%{__install} -d %{buildroot}/%{_mandir}/man8
for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd
do
LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name} %{buildroot}%{_sbindir}/$i -M > %{buildroot}%{_mandir}/man8/$i.8
gzip %{buildroot}%{_mandir}/man8/$i.8
done
# populate inputs for %ghost
cp -a %{basedir}/masterfiles/* %{buildroot}%{basedir}/inputs
%if 0%{?suse_version} > 01020
%fdupes %{buildroot}/usr/share/cfengine
%endif
@ -312,6 +320,10 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/README
if [ $1 -lt 2 ]; then
cf-key
fi
# only populate /var/cfengine/inputs on install, not on upgrade
if [ ${1:-0} -ne 1 ]; then
cp -a %{basedir}/masterfiles/* %{basedir}/inputs
fi
%preun
%service_del_preun cf-execd.service cf-monitord.service
@ -327,11 +339,6 @@ fi
%service_add_pre cf-serverd.service
%post server
#if [ ${1:-0} -ne 1 ]; then
# cp -a /usr/share/cfengine/CoreBase/controls /var/cfengine/inputs
# cp -a /usr/share/cfengine/CoreBase/libraries /var/cfengine/inputs
# cp -a /usr/share/cfengine/CoreBase/services /var/cfengine/inputs
#fi
%service_add_post cf-serverd.service
%preun server
@ -422,25 +429,22 @@ fi
%{_sbindir}/rccf-monitord
%endif
# %{_mandir}/man?/*
%{_mandir}/man8/*
%exclude %{_mandir}/man8/cf-serverd.8.*
%dir %{basedir}
/var/%{name}
%config %ghost %{basedir}/inputs/*.cf
%config %ghost %{basedir}/inputs/*/*.cf
%config %ghost %{basedir}/inputs/*/*/*.cf
%exclude %{basedir}/backup
%exclude %{basedir}/config
#%%exclude %%{basedir}/failsafe
# %dir %{_datadir}/%{name}
# %{_datadir}/%{name}/*
%dir %{workdir}
%{workdir}/*
%exclude %{workdir}/bin/cf-serverd
%config(noreplace) /etc/cron.d/%{name}
%dir %{basedir}/masterfiles
%config(noreplace) %{basedir}/masterfiles/*.cf
%files -n %{libsoname}
%defattr(-,root,root)
%dir %{_libdir}/%{name}
@ -470,5 +474,6 @@ fi
/etc/init.d/cf-serverd
%{_sbindir}/rccf-serverd
%endif
%{_mandir}/man8/cf-serverd.8.*
%changelog

3
core-3.6.0b2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:79915acb1e43a24fe8bb5bbe98b875f3dc71dc0fbae88c47818ddec1c3bc99ec
size 1376269

3
masterfiles-3.6.0b1.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:276b760241cd722801f79db163f2d4c7477a89af2338e03509c0005629c4f9d2
size 167598