From 46d83dfdfea4e29ede6ab03a031473ecada626387ec9afcf356c4b153bd98089 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Thu, 26 Jul 2018 15:24:04 +0000 Subject: [PATCH] Accepting request 625201 from home:aeszter:branches:systemsmanagement - Fix path to executables for sys variables (BOO #1099946) OBS-URL: https://build.opensuse.org/request/show/625201 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=176 --- ...t-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch | 6 +++--- cfengine.changes | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git 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 index 43a1d0a..8d34558 100644 --- 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 5447659da5e1..5715d9acc7b7 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 5447659da5e1..5715d9acc7b7 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 5447659da5e1..5715d9acc7b7 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) diff --git a/cfengine.changes b/cfengine.changes index 4793df0..4ef8319 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 25 07:29:51 UTC 2018 - aeszter@gwdg.de + +- Fix path to executables for sys variables (BOO #1099946) + ------------------------------------------------------------------- Tue Jul 3 07:30:21 UTC 2018 - kkaempf@suse.com