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

- Update to 3.6.1

Browse Source 
New features:
  - Introduced Solaris and AIX support into the 3.6 series, with
    many associated build and bug fixes.
  Changes:
  - Short-circuit evaluation of classes promises if class is already
    set (Redmine #5241)
  - fix to assume all non-specified return codes are failed in
    commands promises (Redmine #5986)
  - cf-serverd logs reconfiguration message to NOTICE (was INFO)
    so that it's always logged in syslog
  Bug fixes:
  - File monitoring has been completely rewritten (changes attribute
    in files promise), which eliminates many bugs, particularly
    regarding files that are deleted. Upgrading will keep all
    monitoring data, but downgrading again will reinitialize the DB,
    so all files will be reported as if they were new. (Redmine #2917)
  - $(this.promiser) expands in files promises for 'transformer',
    'edit_template', 'copy_from.source', 'file_select.exec_program',
    'classes' and 'action' bodies (Redmine #1554, #1496, #3530, #1563)
  - 'body changes' notifies about disappeared files in file monitoring
     (Redmine #2917)
  - Set not-kept classes when files or commands promise should be
    repaired, but is warn-only (Redmine #2359)
  - Fixed CFEngine template producing a zero-sized file (Redmine #6088)
  - Add 0-9 A-Z _ to allowed context of module protocol (Redmine #6063)
  - Extend ps command column width on Solaris and filter on zone
    rather than adding it to the ps output.
  - Fixed strftime() function on Solaris when called with certain
    specifiers.

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=101
This commit is contained in:
Klaus Kämpf 2014-07-29 09:09:25 +00:00 committed by Git OBS Bridge
parent 1c7503e64b
commit f5ad403587
7 changed files with 77 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
View File

@ -1,8 +1,8 @@
From 2790065efcf484d5b51e2f5ab410983d9f37c74c Mon Sep 17 00:00:00 2001
From 68e63ae137d4f829c569ca0af4fcb86c6d4f688f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 11 Apr 2014 09:25:05 +0200
Subject: [PATCH] Simplify and fix parsing of /etc/SuSE-release (fixes issue
#5423)
Subject: [PATCH 1/2] Simplify and fix parsing of /etc/SuSE-release (fixes
issue #5423)
This patch is a simplification of sysinfo.c:Linux_Suse_Version()
to achieve the following
@ -17,10 +17,10 @@ to achieve the following
1 file changed, 60 insertions(+), 127 deletions(-)
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
index 72eb71f75d8d..6f2a05fc4cdd 100644
index 2bdfb8fbd2fa..f8ffd67b7a49 100644
--- a/libenv/sysinfo.c
+++ b/libenv/sysinfo.c
@@ -1629,6 +1629,7 @@ static int Linux_Suse_Version(EvalContext *ctx)
@@ -1666,6 +1666,7 @@ static int Linux_Suse_Version(EvalContext *ctx)
#define SUSE_RELEASE_FLAG "linux "
char classbuf[CF_MAXVARSIZE];
@ -28,7 +28,7 @@ index 72eb71f75d8d..6f2a05fc4cdd 100644
Log(LOG_LEVEL_VERBOSE, "This appears to be a SUSE system.");
EvalContextClassPutHard(ctx, "SUSE", "inventory,attribute_name=none,source=agent");
@@ -1648,23 +1649,26 @@ static int Linux_Suse_Version(EvalContext *ctx)
@@ -1685,23 +1686,26 @@ static int Linux_Suse_Version(EvalContext *ctx)
return 1;
}
@ -62,7 +62,7 @@ index 72eb71f75d8d..6f2a05fc4cdd 100644
}
}
if (ferror(fp))
@@ -1678,28 +1682,38 @@ static int Linux_Suse_Version(EvalContext *ctx)
@@ -1715,28 +1719,38 @@ static int Linux_Suse_Version(EvalContext *ctx)
fclose(fp);
@ -117,7 +117,7 @@ index 72eb71f75d8d..6f2a05fc4cdd 100644
{
Item *list, *ip;
@@ -1717,120 +1731,39 @@ static int Linux_Suse_Version(EvalContext *ctx)
@@ -1754,120 +1768,39 @@ static int Linux_Suse_Version(EvalContext *ctx)
}
else
{
@ -194,8 +194,8 @@ index 72eb71f75d8d..6f2a05fc4cdd 100644
- if (strchr(release, '.'))
- {
- sscanf(release, "%*s %d.%d", &major, &minor);
- sprintf(strmajor, "%d", major);
- sprintf(strminor, "%d", minor);
- xsnprintf(strmajor, sizeof(strmajor), "%d", major);
- xsnprintf(strminor, sizeof(strminor), "%d", minor);
-
- if (major != -1 && minor != -1)
- {

12
0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch → 0002-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
View File

@ -1,7 +1,7 @@
From 954d8ba95e49e499edc6a04889310897ac2ac970 Mon Sep 17 00:00:00 2001
From 7b0a005250c0398b86ea5adf93c16b5c8735a343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 2 May 2014 12:47:37 +0200
Subject: [PATCH] Set sys.bindir to /usr/sbin, expect cf-* components there
Subject: [PATCH 2/2] Set sys.bindir to /usr/sbin, expect cf-* components there
That's where the /var/cfengine/bin/* symlinks point to and where
the systemd .service files expect the daemons.
@ -13,10 +13,10 @@ masterfiles/update/update_processes.cf:enable_cfengine_agents
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
index 6f2a05fc4cdd..8e0df350d670 100644
index f8ffd67b7a49..96d6c9336441 100644
--- a/libenv/sysinfo.c
+++ b/libenv/sysinfo.c
@@ -530,8 +530,7 @@ static void GetNameInfo3(EvalContext *ctx)
@@ -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 +26,7 @@ index 6f2a05fc4cdd..8e0df350d670 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");
@@ -575,7 +574,7 @@ static void GetNameInfo3(EvalContext *ctx)
@@ -612,7 +611,7 @@ static void GetNameInfo3(EvalContext *ctx)
components[i]);
}
#else
@ -35,7 +35,7 @@ index 6f2a05fc4cdd..8e0df350d670 100644
#endif
have_component[i] = false;
@@ -598,7 +597,7 @@ static void GetNameInfo3(EvalContext *ctx)
@@ -635,7 +634,7 @@ static void GetNameInfo3(EvalContext *ctx)
snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR,
components[1]);
#else

50
cfengine.changes
View File

@ -1,3 +1,53 @@
-------------------------------------------------------------------
Mon Jul 28 15:12:10 UTC 2014 - kkaempf@suse.com
- Update to 3.6.1
New features:
- Introduced Solaris and AIX support into the 3.6 series, with
many associated build and bug fixes.
Changes:
- Short-circuit evaluation of classes promises if class is already
set (Redmine #5241)
- fix to assume all non-specified return codes are failed in
commands promises (Redmine #5986)
- cf-serverd logs reconfiguration message to NOTICE (was INFO)
so that it's always logged in syslog
Bug fixes:
- File monitoring has been completely rewritten (changes attribute
in files promise), which eliminates many bugs, particularly
regarding files that are deleted. Upgrading will keep all
monitoring data, but downgrading again will reinitialize the DB,
so all files will be reported as if they were new. (Redmine #2917)
- $(this.promiser) expands in files promises for 'transformer',
'edit_template', 'copy_from.source', 'file_select.exec_program',
'classes' and 'action' bodies (Redmine #1554, #1496, #3530, #1563)
- 'body changes' notifies about disappeared files in file monitoring
(Redmine #2917)
- Set not-kept classes when files or commands promise should be
repaired, but is warn-only (Redmine #2359)
- Fixed CFEngine template producing a zero-sized file (Redmine #6088)
- Add 0-9 A-Z _ to allowed context of module protocol (Redmine #6063)
- Extend ps command column width on Solaris and filter on zone
rather than adding it to the ps output.
- Fixed strftime() function on Solaris when called with certain
specifiers.
- Fixed users promise bug regarding password hashes in a NIS/NSS setup.
- Fixed $(sys.uptime), $(sys.systime) and $(sys.sysday) in AIX.
(Redmine #5148, #5206)
- Fixed processes_select complaining about "Unacceptable model
uncertainty examining processes" (Redmine #6337)
- ps command for linux has been changed to cope with big rss values
(Redmine #6337)
- Address ps -axo shift on FreeBSD 10 and later (Redmine #5667)
- methods and services promises respect action_policy => "warn"
(Redmine #5924)
- LMDB should no longer deadlock if an agent is killed on the hub
while holding the DB lock. Note that the change only affects
binary packages shipped by CFEngine, since the upstream LMDB
project has not yet integrated the change. (Redmine #6013)
-------------------------------------------------------------------
Thu Jul 3 13:40:52 UTC 2014 - kkaempf@suse.com

8
cfengine.spec
View File

@ -28,7 +28,9 @@
%define with_libvirt 0
Name: cfengine
%define srcname core-3.6.0
Version: 3.6.1
Release: 0
%define srcname core-%{version}
%define libname libpromises
%define libsoname %{libname}3
@ -43,8 +45,6 @@ Name: cfengine
Summary: CFEngine automates large-scale IT computing infrastructure
License: GPL-3.0
Group: Productivity/Networking/System
Version: 3.6.0
Release: 0
Url: http://www.cfengine.org/
Source: %{srcname}.tar.gz
Source1: %{name}.SuSEfirewall2
@ -85,7 +85,7 @@ Patch5: 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
# PATCH-FIX-SUSE
# set cfengine's notion of bindir to /usr/sbin instead of /var/cfengine/bin
# kkaempf@suse.de
Patch6: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
Patch6: 0002-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison

3
core-3.6.0.tar.gz
View File

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

3
core-3.6.1.tar.gz Normal file
View File

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

8
remove-am_subst_notmake.patch
View File

@ -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-cfengine-3.5.1/configure.ac ./configure.ac
--- ../orig-cfengine-3.5.1/configure.ac 2013-07-11 10:26:03.000000000 +0200
+++ ./configure.ac 2013-08-02 09:10:37.318396099 +0200
@@ -1024,7 +1024,6 @@
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
--- ../orig-core-3.6.1/configure.ac 2014-07-25 13:48:07.000000000 +0200
+++ ./configure.ac 2014-07-28 18:10:27.718883722 +0200
@@ -1299,7 +1299,6 @@
# Populate contents of config.post.h
#
AC_SUBST(post_macros)