Accepting request 264240 from systemsmanagement

- Update to 3.6.3
  New features:
  - support for HP-UX 11.23 and later
  - experimental support for Red Hat Enterprise Linux 7
  Bug fixes:
  - fix getindices on multi-dimensional arrays (Redmine #6779)
  - fix mustache template method to run in dryrun mode (Redmine #6739)
  - set mailto and mailfrom settings for execd in def.cf (Redmine #6702)
  - fix conflation of multi-index entries in arrays (Redmine #6674)
  - fix promise locking when transfering using update.cf (Redmine #6623)
  - update JSON parser to return an error on truncation (Redmine #6608)
  - fix sys.hardware_addresses not expanded (Redmine #6603)
  - fix opening database txn /var/cfengine/cf_lastseen.lmdb:
    MDB_READERS_FULL when running cf-keys --show-hosts (Redmine #6602)
  - fix segfault (Null pointer dereference) when select_end in
    delete_lines never matches (Redmine #6589)
  - fix max_file_size => "0" not disabling or allowing any size
    (Redmine #6588)
  - fix ifvarclass, with iteration over list, failing when deleting
    files with time condition (Redmine #6577)
  - fix classes defined with "or" constraint are never set if any value
    doesn't evaluate to a scalar (Redmine #6569)
  - update "mailfrom" default in default policy (Redmine #6567)
  - fix logrotate ambiguity of filename (Redmine #6563)
  - fix parsing JSON files (Redmine #6549)
  - reduce write count activity to /var partition (Redmine #6523)
  - fix files delete attribute incorrectly triggering promise_kept
    (Redmine #6509)
  - update services bundle output related to chkconfig when run in
    inform mode. (Redmine #6492)

OBS-URL: https://build.opensuse.org/request/show/264240
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cfengine?expand=0&rev=49

0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch

@@ -12,11 +12,10 @@ masterfiles/update/update_processes.cf:enable_cfengine_agents
  libenv/sysinfo.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
 
-diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-core-3.6.3rc-build1/libenv/sysinfo.c ./libenv/sysinfo.c
-index f8ffd67b7a49..96d6c9336441 100644
+--- ../orig-core-3.6.3rc-build1/libenv/sysinfo.c	2014-11-27 20:17:34.000000000 +0100
---- a/libenv/sysinfo.c
++++ ./libenv/sysinfo.c	2014-11-28 10:18:49.023646654 +0100
-+++ b/libenv/sysinfo.c
+@@ -567,8 +567,7 @@
-@@ -566,8 +566,7 @@ static void GetNameInfo3(EvalContext *ctx)
      EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "masterdir", GetMasterDir(), CF_DATA_TYPE_STRING, "source=agent");
      EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "inputdir", GetInputDir(), CF_DATA_TYPE_STRING, "source=agent");
  
@@ -26,7 +25,7 @@ index f8ffd67b7a49..96d6c9336441 100644
  
      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");
-@@ -612,7 +611,7 @@ static void GetNameInfo3(EvalContext *ctx)
+@@ -613,7 +612,7 @@
                       components[i]);
          }
  #else
@@ -35,7 +34,7 @@ index f8ffd67b7a49..96d6c9336441 100644
  #endif
  
          have_component[i] = false;
-@@ -635,7 +634,7 @@ static void GetNameInfo3(EvalContext *ctx)
+@@ -636,7 +635,7 @@
          snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR,
                   components[1]);
  #else

cfengine.changes

@@ -1,3 +1,52 @@
+-------------------------------------------------------------------
+Sat Dec  6 12:28:41 UTC 2014 - kkaempf@suse.com
+
+- Update to 3.6.3
+  New features:
+  - support for HP-UX 11.23 and later
+  - experimental support for Red Hat Enterprise Linux 7
+
+  Bug fixes:
+  - fix getindices on multi-dimensional arrays (Redmine #6779)
+  - fix mustache template method to run in dryrun mode (Redmine #6739)
+  - set mailto and mailfrom settings for execd in def.cf (Redmine #6702)
+  - fix conflation of multi-index entries in arrays (Redmine #6674)
+  - fix promise locking when transfering using update.cf (Redmine #6623)
+  - update JSON parser to return an error on truncation (Redmine #6608)
+  - fix sys.hardware_addresses not expanded (Redmine #6603)
+  - fix opening database txn /var/cfengine/cf_lastseen.lmdb:
+    MDB_READERS_FULL when running cf-keys --show-hosts (Redmine #6602)
+  - fix segfault (Null pointer dereference) when select_end in
+    delete_lines never matches (Redmine #6589)
+  - fix max_file_size => "0" not disabling or allowing any size
+    (Redmine #6588)
+  - fix ifvarclass, with iteration over list, failing when deleting
+    files with time condition (Redmine #6577)
+  - fix classes defined with "or" constraint are never set if any value
+    doesn't evaluate to a scalar (Redmine #6569)
+  - update "mailfrom" default in default policy (Redmine #6567)
+  - fix logrotate ambiguity of filename (Redmine #6563)
+  - fix parsing JSON files (Redmine #6549)
+  - reduce write count activity to /var partition (Redmine #6523)
+  - fix files delete attribute incorrectly triggering promise_kept
+    (Redmine #6509)
+  - update services bundle output related to chkconfig when run in
+    inform mode. (Redmine #6492)
+  - fix Solaris serverd tests (Redmine #6406)
+  - fix broken bechaviour of merging arrays with readstringarray
+    (Redmine #6369)
+  - fix ifelapsed bug with bundle nesting (Redmine #6334)
+  - fix handling cf_null in bundlesequence (Redmine #6119)
+  - fix maparray reading whole input array when using subarray
+    (Redmine #6033)
+  - fix directories being randomly changed to files (Redmine #6027)
+  - update defaults promise type to work with classes (Redmine #5748)
+  - systemd integration in services promises (Redmine #5415)
+  - fix touch attribute ignoring action = warn_only (Redmine #3172)
+  - fix 4KB string limit in functions readfile, string_downcase,
+    string_head, string_reverse, string_length, string_tail,
+    string_upcase (Redmine #2912)
+
 -------------------------------------------------------------------
 Thu Oct  9 07:12:16 UTC 2014 - kkaempf@suse.com
 

cfengine.spec

@@ -28,9 +28,9 @@
 %define with_libvirt 0
 
 Name:           cfengine
-Version:        3.6.2
+Version:        3.6.3
 Release:        0
-%define         srcname core-3.6.2
+%define         srcname core-%{version}
 %define         libname   libpromises
 %define         libsoname %{libname}3
 

core-3.6.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1949ce9ad2320ecd27edb98225d11429f3afe1034e1c3b60750824646fc54036
-size 1481740

core-3.6.3.tar.gz

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

remove-am_subst_notmake.patch

@@ -1,7 +1,7 @@
-diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-core-3.6.1/configure.ac ./configure.ac
+diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-core-3.6.3rc-build1/configure.ac ./configure.ac
---- ../orig-core-3.6.1/configure.ac	2014-07-25 13:48:07.000000000 +0200
+--- ../orig-core-3.6.3rc-build1/configure.ac	2014-11-27 20:17:34.000000000 +0100
-+++ ./configure.ac	2014-07-28 18:10:27.718883722 +0200
++++ ./configure.ac	2014-11-28 10:21:03.077231135 +0100
-@@ -1299,7 +1299,6 @@
+@@ -1328,7 +1328,6 @@
  # Populate contents of config.post.h
  #
  AC_SUBST(post_macros)