From 04203f2cf0de089035db8e64155d553e9c055b02c06ff93b91376b57796f1f09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 3 Feb 2014 18:31:18 +0000 Subject: [PATCH] - Upgrade to 3.6.0b1 - New promise type "users" for managing local user accounts. - TLS authentication and fully encrypted network protocol - New attributes in 'bundle server access_rules' - New variable type 'data' for handling of structured data - Tagging of classes and variables with meta data - Many new built-in variables - Many new functions - Replace tokyocabinet with lmdb database OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=66 --- cfengine-3.5.3.tar.gz | 3 --- cfengine-3.6.0b1.tar.gz | 3 +++ cfengine.changes | 14 ++++++++++++++ cfengine.spec | 27 ++++++++++++++++++--------- masterfiles-3.6.0b1.tar.gz | 3 +++ 5 files changed, 38 insertions(+), 12 deletions(-) delete mode 100644 cfengine-3.5.3.tar.gz create mode 100644 cfengine-3.6.0b1.tar.gz create mode 100644 masterfiles-3.6.0b1.tar.gz diff --git a/cfengine-3.5.3.tar.gz b/cfengine-3.5.3.tar.gz deleted file mode 100644 index 71f14be..0000000 --- a/cfengine-3.5.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e2d13ba1d75f826bf15411912ce21075734796a35e8fb8ecf545d70d60f41e1 -size 1542468 diff --git a/cfengine-3.6.0b1.tar.gz b/cfengine-3.6.0b1.tar.gz new file mode 100644 index 0000000..e37098f --- /dev/null +++ b/cfengine-3.6.0b1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d4208a2459a17bd108a059c5fd3fb8dd3ce965ae764b81d8fd187193a1dae6a +size 1338409 diff --git a/cfengine.changes b/cfengine.changes index 25e4b03..484ff13 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Mon Feb 3 18:30:23 UTC 2014 - kkaempf@suse.com + +- Upgrade to 3.6.0b1 + - New promise type "users" for managing local user accounts. + - TLS authentication and fully encrypted network protocol + - New attributes in 'bundle server access_rules' + - New variable type 'data' for handling of structured data + - Tagging of classes and variables with meta data + - Many new built-in variables + - Many new functions + + - Replace tokyocabinet with lmdb database + ------------------------------------------------------------------- Wed Dec 11 07:25:59 UTC 2013 - kkaempf@suse.com diff --git a/cfengine.spec b/cfengine.spec index a4b9c71..9df45fc 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -1,7 +1,7 @@ # # spec file for package cfengine # -# 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 @@ -17,6 +17,7 @@ Name: cfengine +%define srcname core %define libname libpromises %define libsoname %{libname}3 @@ -28,10 +29,11 @@ Name: cfengine Summary: CFEngine automates large-scale IT computing infrastructure License: GPL-3.0 Group: Productivity/Networking/System -Version: 3.5.3 +Version: 3.6.0b1 Release: 0 Url: http://www.cfengine.org/ Source: %{name}-%{version}.tar.gz + # 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 @@ -58,13 +60,16 @@ Source9: cf-serverd %endif Source10: %{name}.cron Source11: %{name}-rpmlintrc +Source12: masterfiles-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel BuildRequires: flex -BuildRequires: libtokyocabinet-devel BuildRequires: libtool BuildRequires: libxml2-devel +BuildRequires: lmdb-devel +BuildRequires: pam-devel # # Disable mysql for SLE_11: # @@ -160,7 +165,7 @@ This package contains the files of the cfengine server. %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{srcname}-%{version} %if 0%{?suse_version} || 0%{?fedora_version} || 0%{?rhel_version} %patch1 -p1 %endif @@ -251,9 +256,12 @@ done # Install masterfiles (as %%config(noreplace) ) %{__install} -d %{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 +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 @@ -380,6 +388,7 @@ fi %{_sbindir}/cf-monitord %{_sbindir}/cf-promises %{_sbindir}/cf-runagent +%{_sbindir}/cf-upgrade %{_sbindir}/rpmvercmp %if 0%{?suse_version} >= 1210 %_unitdir/cf-execd.service @@ -398,8 +407,8 @@ fi %exclude %{basedir}/config #%%exclude %%{basedir}/failsafe -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +# %dir %{_datadir}/%{name} +# %{_datadir}/%{name}/* %dir %{workdir} %{workdir}/* diff --git a/masterfiles-3.6.0b1.tar.gz b/masterfiles-3.6.0b1.tar.gz new file mode 100644 index 0000000..ca0f81e --- /dev/null +++ b/masterfiles-3.6.0b1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:276b760241cd722801f79db163f2d4c7477a89af2338e03509c0005629c4f9d2 +size 167598