- Update to 3.11.0

New Features: - allow function calls in promiser using universal "with" attribute. (CFE-1092) - add example of with attribute (CFE-1092) - Detect Amazon Linux and set "AmazonLinux" hard class and sys.flavour variable. - New sysctlvalue() and data_sysctlvalues() functions from /proc/sys (CFE-2513) - readdata() also auto-detects .yml files as YAML - Added support for ENV and CSV file parsing (CFE-1881) - Added vars and classes for CoreOS (ENT-3043) - cf-agent: implement --show-evaluated-vars and --show-evaluated-classes - Support for custom ports and host names as policy hub (CFE-953) - cf-promises: allows --show-vars and --show-classes to take an optional filter - Added a new tool: cf-net. cf-net is a CLI for the CFEngine network protocol, useful for debugging, testing etc. (CFE-2493) - New policy variable: sys.cf_net contains path to cf-net binary - Read /etc/os-release into sys.os_release (CFE-1881) - Full changelog at https://github.com/cfengine/core/blob/3.11.0/ChangeLog OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=164
2017-08-11 17:49:23 +00:00 · 2017-08-11 17:49:23 +00:00 · 2846850d63
commit 2846850d63
parent 04cfaf3c35
5 changed files with 52 additions and 23 deletions
--- a/0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
+++ b/0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
@ -22,7 +22,7 @@ index 06f2095270df..d615f5ed6e1d 100644
 
 -    snprintf(workbuf, CF_BUFSIZE, "%s%cbin", workdir, FILE_SEPARATOR);
 -    EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", workbuf, CF_DATA_TYPE_STRING, "source=agent");
-+    EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", "/usr/sbin", CF_DATA_TYPE_STRING, "source=agent");
+    EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", "/usr/bin", CF_DATA_TYPE_STRING, "source=agent");
 
     snprintf(workbuf, CF_BUFSIZE, "%s%cfailsafe.cf", GetInputDir(), FILE_SEPARATOR);
     EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "failsafe_policy_path", workbuf, CF_DATA_TYPE_STRING, "source=agent");
@ -31,7 +31,7 @@ index 06f2095270df..d615f5ed6e1d 100644
         }
 #else
 -        snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[i]);
-+        snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[i]);
+        snprintf(name, CF_MAXVARSIZE - 1, "/usr/bin/%s", components[i]);
 #endif
 
         have_component[i] = false;
@ -40,7 +40,7 @@ index 06f2095270df..d615f5ed6e1d 100644
                  components[1]);
 #else
 -        snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[1]);
-+        snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[1]);
+        snprintf(name, CF_MAXVARSIZE - 1, "/usr/bin/%s", components[1]);
 #endif
 
         if (stat(name, &sb) != -1)
--- a/cfengine-3.10.1.tar.gz
+++ b/cfengine-3.10.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0abb7e91d667a4f339b61e105dc66c583fa98e0217c6fc7fcf8a73300badca98
-size 2362381
--- a/cfengine.changes
+++ b/cfengine.changes
@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Fri Aug 11 17:01:35 UTC 2017 - kkaempf@suse.com
+
+- Update to 3.11.0
+  New Features:
+  - allow function calls in promiser using universal "with"
+    attribute. (CFE-1092)
+  - add example of with attribute (CFE-1092)
+  - Detect Amazon Linux and set "AmazonLinux" hard class and
+    sys.flavour variable.
+  - New sysctlvalue() and data_sysctlvalues() functions from /proc/sys
+    (CFE-2513)
+  - readdata() also auto-detects .yml files as YAML
+  - Added support for ENV and CSV file parsing (CFE-1881)
+  - Added vars and classes for CoreOS (ENT-3043)
+  - cf-agent: implement --show-evaluated-vars and
+    --show-evaluated-classes
+  - Support for custom ports and host names as policy hub (CFE-953)
+  - cf-promises: allows --show-vars and --show-classes to take an
+    optional filter
+  - Added a new tool: cf-net. cf-net is a CLI for the CFEngine
+    network protocol, useful for debugging, testing etc.
+    (CFE-2493)
+  - New policy variable: sys.cf_net contains path to cf-net binary
+  - Read /etc/os-release into sys.os_release (CFE-1881)
+
+- Full changelog at https://github.com/cfengine/core/blob/3.11.0/ChangeLog
+
 -------------------------------------------------------------------
 Sun Jul  2 20:41:57 UTC 2017 - bwiedemann@suse.com

--- a/cfengine.spec
+++ b/cfengine.spec
@ -16,8 +16,8 @@
 #


-%define srcversion 3.10.1
-%define srcname %{name}-%{srcversion}
+%define srcversion 3.11.0
+%define srcname core-%{srcversion}
 %define libname   libpromises
 %define libsoname %{libname}3
 # Yes, its not FHS conformant but in sync with cfengine documentation
@ -34,7 +34,7 @@
 %bcond_with postgresql
 %bcond_with libvirt
 Name:           cfengine
-Version:        3.10.0
+Version:        %{srcversion}
 Release:        0
 # This is the place where workdir should be
 #define         basedir   /var/lib/%{name}
@ -57,7 +57,7 @@ Source106:      http://www.cfengine.org/manuals/cf3-tutorial.pdf
 Source107:      http://www.verticalsysadmin.com/cfengine/primer.pdf

 # PATCH-FIX-SUSE
-# set cfengine's notion of bindir to /usr/sbin instead of /var/cfengine/bin
+# set cfengine's notion of bindir to /usr/bin instead of /var/cfengine/bin
 # kkaempf@suse.de
 Patch1:         0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
 # PATCH-FIX-UPSTREAM add 'suse' class for consistency with other vendor classes
@ -234,7 +234,7 @@ make "DESTDIR=%{buildroot}" install
 # will appear in cfengine-examples
 rm -rf %{buildroot}/%{_docdir}/%{name}/examples

-install -d %{buildroot}/{usr/sbin,%{workdir}/{bin,inputs,reports}}
+install -d %{buildroot}/{%{_bindir},%{_sbindir},%{workdir}/{bin,inputs,reports}}

 # create dirs needed for better organizing dirs and files
 install -d %{buildroot}/%{basedir}/{backup,failsafe,config,plugins}
@ -270,10 +270,10 @@ sed -i\
 %{buildroot}%{_initddir}/cf-* %{buildroot}%{_sysconfdir}/cron.d/%{name}
 %endif

-# create symlinks for sbin_PROGRAMS
+# create symlinks for bin_PROGRAMS
 # because: cf-promises needs to be installed in /var/cfengine/work/bin for pre-validation of full configuration
 for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd cf-upgrade; do
-  ln -s -f ../../..%{_sbindir}/${i} %{buildroot}%{workdir}/bin/${i}
+  ln -s -f ../../..%{_bindir}/${i} %{buildroot}%{workdir}/bin/${i}
 done

 rm -rf %{buildroot}/%{_libdir}/%{name}/libpromises.la
@ -286,7 +286,7 @@ rm -rf %{buildroot}/%{_datadir}/%{name}/README
 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
+  LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name} %{buildroot}%{_bindir}/$i -M > %{buildroot}%{_mandir}/man8/$i.8
  gzip -n9 %{buildroot}%{_mandir}/man8/$i.8
 done

@ -346,15 +346,16 @@ fi
 %files
 %defattr(-,root,root)
 %doc ChangeLog LICENSE README.md
-%{_sbindir}/cf-agent
-%{_sbindir}/cf-execd
-%{_sbindir}/cf-key
-%{_sbindir}/cf-monitord
-%{_sbindir}/cf-promises
-%{_sbindir}/cf-serverd
-%{_sbindir}/cf-upgrade
-%{_sbindir}/cf-runagent
-%{_sbindir}/rpmvercmp
+%{_bindir}/cf-agent
+%{_bindir}/cf-execd
+%{_bindir}/cf-key
+%{_bindir}/cf-net
+%{_bindir}/cf-monitord
+%{_bindir}/cf-promises
+%{_bindir}/cf-serverd
+%{_bindir}/cf-upgrade
+%{_bindir}/cf-runagent
+%{_bindir}/rpmvercmp
 %if %{have_systemd}
 %{_unitdir}/cf-execd.service
 %{_unitdir}/cf-monitord.service
--- a/core-3.11.0.tar.gz
+++ b/core-3.11.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a1403b19a362b8efd58cacc4c61e3da3e1dc438a8580072399bce7c6f317dfc
+size 2039330