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

- add 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch

Browse Source 
for openssl-1.1.0 compatibility

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=165
This commit is contained in:
Klaus Kämpf 2017-12-04 11:37:10 +00:00 committed by Git OBS Bridge
parent 2846850d63
commit 82dbad89f6
5 changed files with 1941 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
From b81b3cde4794eb7a195e49f782fbfab930cd1a2c Mon Sep 17 00:00:00 2001 From a3126babc502c7e79b866c3db04e92bd7cfa7bbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de> From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Thu, 30 Jul 2015 10:48:47 +0200 Date: Thu, 30 Jul 2015 10:48:47 +0200
Subject: [PATCH 1/2] Set sys.bindir to /usr/sbin, expect cf-*components there Subject: [PATCH 1/3] Set sys.bindir to /usr/sbin, expect cf-*components there
That's where the /var/cfengine/bin/* symlinks point to and where That's where the /var/cfengine/bin/* symlinks point to and where
the systemd .service files expect the daemons. the systemd .service files expect the daemons.
@ -13,37 +13,37 @@ masterfiles/update/update_processes.cf:enable_cfengine_agents
1 file changed, 3 insertions(+), 4 deletions(-) 1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
index 06f2095270df..d615f5ed6e1d 100644 index 7c20d9263108..8bea42c7f7a7 100644
--- a/libenv/sysinfo.c --- a/libenv/sysinfo.c
+++ b/libenv/sysinfo.c +++ b/libenv/sysinfo.c
@@ -586,8 +586,7 @@ static void GetNameInfo3(EvalContext *ctx) @@ -589,8 +589,7 @@ static void GetNameInfo3(EvalContext *ctx)
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "masterdir", GetMasterDir(), CF_DATA_TYPE_STRING, "source=agent"); 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"); EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "inputdir", GetInputDir(), CF_DATA_TYPE_STRING, "source=agent");
- snprintf(workbuf, CF_BUFSIZE, "%s%cbin", workdir, FILE_SEPARATOR); - 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", workbuf, CF_DATA_TYPE_STRING, "source=agent");
+ EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", "/usr/bin", 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); 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"); EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "failsafe_policy_path", workbuf, CF_DATA_TYPE_STRING, "source=agent");
@@ -632,7 +631,7 @@ static void GetNameInfo3(EvalContext *ctx) @@ -635,7 +634,7 @@ static void GetNameInfo3(EvalContext *ctx)
components[i]); components[i]);
} }
#else #else
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[i]); - snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[i]);
+ snprintf(name, CF_MAXVARSIZE - 1, "/usr/bin/%s", components[i]); + snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[i]);
#endif #endif
have_component[i] = false; have_component[i] = false;
@@ -655,7 +654,7 @@ static void GetNameInfo3(EvalContext *ctx) @@ -660,7 +659,7 @@ static void GetNameInfo3(EvalContext *ctx)
snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", workdir, FILE_SEPARATOR, FILE_SEPARATOR, snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", workdir, FILE_SEPARATOR, FILE_SEPARATOR,
components[1]); components[1]);
#else #else
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[1]); - snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[1]);
+ snprintf(name, CF_MAXVARSIZE - 1, "/usr/bin/%s", components[1]); + snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[1]);
#endif #endif
if (stat(name, &sb) != -1) if (stat(name, &sb) != -1)
-- --
2.11.0 2.15.0

16
0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
View File

@ -1,7 +1,7 @@
From d261fe140de0ab2a6f5ca553ab964e7a09e890b4 Mon Sep 17 00:00:00 2001 From 7b2bde90b9499920872723c733aea202f044d709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de> From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
Date: Fri, 11 Apr 2014 09:25:05 +0200 Date: Fri, 11 Apr 2014 09:25:05 +0200
Subject: [PATCH 2/2] Simplify and fix parsing of /etc/SuSE-release (fixes Subject: [PATCH 2/3] Simplify and fix parsing of /etc/SuSE-release (fixes
issue #5423) issue #5423)
This patch is a simplification of sysinfo.c:Linux_Suse_Version() This patch is a simplification of sysinfo.c:Linux_Suse_Version()
@ -17,10 +17,10 @@ to achieve the following
1 file changed, 60 insertions(+), 127 deletions(-) 1 file changed, 60 insertions(+), 127 deletions(-)
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
index d615f5ed6e1d..07a2e698a1cf 100644 index 8bea42c7f7a7..b8fc9c76cf65 100644
--- a/libenv/sysinfo.c --- a/libenv/sysinfo.c
+++ b/libenv/sysinfo.c +++ b/libenv/sysinfo.c
@@ -1753,6 +1753,7 @@ static int Linux_Suse_Version(EvalContext *ctx) @@ -1822,6 +1822,7 @@ static int Linux_Suse_Version(EvalContext *ctx)
#define SUSE_RELEASE_FLAG "linux " #define SUSE_RELEASE_FLAG "linux "
char classbuf[CF_MAXVARSIZE]; char classbuf[CF_MAXVARSIZE];
@ -28,7 +28,7 @@ index d615f5ed6e1d..07a2e698a1cf 100644
Log(LOG_LEVEL_VERBOSE, "This appears to be a SUSE system."); Log(LOG_LEVEL_VERBOSE, "This appears to be a SUSE system.");
EvalContextClassPutHard(ctx, "SUSE", "inventory,attribute_name=none,source=agent"); EvalContextClassPutHard(ctx, "SUSE", "inventory,attribute_name=none,source=agent");
@@ -1772,23 +1773,26 @@ static int Linux_Suse_Version(EvalContext *ctx) @@ -1841,23 +1842,26 @@ static int Linux_Suse_Version(EvalContext *ctx)
return 1; return 1;
} }
@ -62,7 +62,7 @@ index d615f5ed6e1d..07a2e698a1cf 100644
} }
} }
if (ferror(fp)) if (ferror(fp))
@@ -1802,28 +1806,38 @@ static int Linux_Suse_Version(EvalContext *ctx) @@ -1871,28 +1875,38 @@ static int Linux_Suse_Version(EvalContext *ctx)
fclose(fp); fclose(fp);
@ -117,7 +117,7 @@ index d615f5ed6e1d..07a2e698a1cf 100644
{ {
Item *list, *ip; Item *list, *ip;
@@ -1841,120 +1855,39 @@ static int Linux_Suse_Version(EvalContext *ctx) @@ -1910,120 +1924,39 @@ static int Linux_Suse_Version(EvalContext *ctx)
} }
else else
{ {
@ -262,5 +262,5 @@ index d615f5ed6e1d..07a2e698a1cf 100644
} }
-- --
2.11.0 2.15.0

1902
0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch Normal file
View File

File diff suppressed because it is too large Load Diff

6
cfengine.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Dec 4 11:24:38 UTC 2017 - kkaempf@suse.com
- add 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch
for openssl-1.1.0 compatibility
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 11 17:01:35 UTC 2017 - kkaempf@suse.com Fri Aug 11 17:01:35 UTC 2017 - kkaempf@suse.com

22
cfengine.spec
View File

@ -66,7 +66,8 @@ Patch1: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
Patch2: 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch Patch2: 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881 # PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881
Patch3: reproducible.patch Patch3: reproducible.patch
# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/commit/f4b9c855c0b035c0188fcdf79d2cbddab2f1bdcc
Patch4: 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch
# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
Patch10: make_home_dir_for_tests.patch Patch10: make_home_dir_for_tests.patch
Patch99: remove-am_subst_notmake.patch Patch99: remove-am_subst_notmake.patch
@ -87,14 +88,18 @@ BuildRequires: util-linux
Requires: %{libsoname} = %{version} Requires: %{libsoname} = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if %{have_systemd} %if %{have_systemd}
Source7: cf-execd.service # go home, source_validator, you're drunk
Source8: cf-monitord.service %define s7 cf-execd.service
Source9: cf-serverd.service %define s8 cf-monitord.service
%define s9 cf-serverd.service
%else %else
Source7: cf-monitord %define s7 cf-monitord
Source8: cf-execd %define s8 cf-execd
Source9: cf-serverd %define s9 cf-serverd
%endif %endif
Source7: %{s7}
Source8: %{s8}
Source9: %{s9}
%if %{with mysql} %if %{with mysql}
BuildRequires: mysql-devel BuildRequires: mysql-devel
%endif %endif
@ -173,6 +178,9 @@ Lots of example promises for CFEngine.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%if 0%{?suse_version} == 1550
%patch4 -p1
%endif
%if 0%{?suse_version} <= 1110 %if 0%{?suse_version} <= 1110
%patch99 -p1 %patch99 -p1
%endif %endif