Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2014-05-09 20:30:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfengine" Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2014-04-17 14:07:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2014-05-09 20:30:10.000000000 +0200 @@ -1,0 +2,6 @@ +Fri May 2 11:52:01 UTC 2014 - [email protected] + +- Set sys.bindir to /usr/sbin, expect cf-* components there + Add 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch + +------------------------------------------------------------------- New: ---- 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.NNUwqu/_old 2014-05-09 20:30:12.000000000 +0200 +++ /var/tmp/diff_new_pack.NNUwqu/_new 2014-05-09 20:30:12.000000000 +0200 @@ -72,8 +72,14 @@ # PATCH-FIX-UPSTREAM add 'suse' class for consistency with other vendor classes # PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423 +# [email protected] 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 +# [email protected] +Patch6: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: db-devel @@ -186,6 +192,7 @@ %endif %patch3 -p1 %patch5 -p1 +%patch6 -p1 ##### rpmlint #### wrong-file-end-of-line-encoding ++++++ 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch ++++++ >From 954d8ba95e49e499edc6a04889310897ac2ac970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <[email protected]> Date: Fri, 2 May 2014 12:47:37 +0200 Subject: [PATCH] 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. This path is used in 'processes' of 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 index 6f2a05fc4cdd..8e0df350d670 100644 --- a/libenv/sysinfo.c +++ b/libenv/sysinfo.c @@ -530,8 +530,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"); - snprintf(workbuf, CF_BUFSIZE, "%s%cbin", CFWORKDIR, 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"); 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) components[i]); } #else - snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR, components[i]); + snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[i]); #endif have_component[i] = false; @@ -598,7 +597,7 @@ static void GetNameInfo3(EvalContext *ctx) snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR, components[1]); #else - snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR, components[1]); + snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[1]); #endif if (stat(name, &sb) != -1) -- 1.8.4.5 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
