Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2018-01-17 21:55:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfengine" Wed Jan 17 21:55:53 2018 rev:70 rq:558813 version:3.11.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2017-07-04 09:11:21.982407607 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2018-01-17 21:56:06.777391790 +0100 @@ -1,0 +2,34 @@ +Mon Dec 4 11:24:38 UTC 2017 - kkae...@suse.com + +- add 0003-CFE-2629-Openssl-1.1-compatibility.patch + for openssl-1.1.0 compatibility + +------------------------------------------------------------------- +Fri Aug 11 17:01:35 UTC 2017 - kkae...@suse.com + +- Update to 3.11.0 + New Features: + - allow function calls in promiser using universal "with" + attribute. (CFE-1092) + - add example of with attribute (CFE-1092) + - Detect Amazon Linux and set "AmazonLinux" hard class and + sys.flavour variable. + - New sysctlvalue() and data_sysctlvalues() functions from /proc/sys + (CFE-2513) + - readdata() also auto-detects .yml files as YAML + - Added support for ENV and CSV file parsing (CFE-1881) + - Added vars and classes for CoreOS (ENT-3043) + - cf-agent: implement --show-evaluated-vars and + --show-evaluated-classes + - Support for custom ports and host names as policy hub (CFE-953) + - cf-promises: allows --show-vars and --show-classes to take an + optional filter + - Added a new tool: cf-net. cf-net is a CLI for the CFEngine + network protocol, useful for debugging, testing etc. + (CFE-2493) + - New policy variable: sys.cf_net contains path to cf-net binary + - Read /etc/os-release into sys.os_release (CFE-1881) + +- Full changelog at https://github.com/cfengine/core/blob/3.11.0/ChangeLog + +------------------------------------------------------------------- Old: ---- cfengine-3.10.1.tar.gz New: ---- 0003-CFE-2629-Openssl-1.1-compatibility.patch core-3.11.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.cYUy8c/_old 2018-01-17 21:56:08.189325746 +0100 +++ /var/tmp/diff_new_pack.cYUy8c/_new 2018-01-17 21:56:08.193325559 +0100 @@ -16,8 +16,8 @@ # -%define srcversion 3.10.1 -%define srcname %{name}-%{srcversion} +%define srcversion 3.11.0 +%define srcname core-%{srcversion} %define libname libpromises %define libsoname %{libname}3 # Yes, its not FHS conformant but in sync with cfengine documentation @@ -34,7 +34,7 @@ %bcond_with postgresql %bcond_with libvirt Name: cfengine -Version: 3.10.0 +Version: %{srcversion} Release: 0 # This is the place where workdir should be #define basedir /var/lib/%{name} @@ -45,6 +45,12 @@ Url: http://www.cfengine.org/ Source: %{srcname}.tar.gz Source1: %{name}.SuSEfirewall2 +Source2: cf-execd.service +Source3: cf-monitord.service +Source4: cf-serverd.service +Source5: cf-monitord +Source6: cf-execd +Source7: cf-serverd Source10: %{name}.cron Source11: %{name}-rpmlintrc # docs @@ -57,16 +63,17 @@ Source107: http://www.verticalsysadmin.com/cfengine/primer.pdf # PATCH-FIX-SUSE -# set cfengine's notion of bindir to /usr/sbin instead of /var/cfengine/bin +# set cfengine's notion of bindir to /usr/bin instead of /var/cfengine/bin # kkae...@suse.de Patch1: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch # PATCH-FIX-UPSTREAM add 'suse' class for consistency with other vendor classes # PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423 # kkae...@suse.de Patch2: 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch +# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/commit/f4b9c855c0b035c0188fcdf79d2cbddab2f1bdcc +Patch3: 0003-CFE-2629-Openssl-1.1-compatibility.patch # PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881 -Patch3: reproducible.patch - +Patch4: reproducible.patch # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkae...@suse.de Patch10: make_home_dir_for_tests.patch Patch99: remove-am_subst_notmake.patch @@ -86,15 +93,6 @@ BuildRequires: util-linux Requires: %{libsoname} = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if %{have_systemd} -Source7: cf-execd.service -Source8: cf-monitord.service -Source9: cf-serverd.service -%else -Source7: cf-monitord -Source8: cf-execd -Source9: cf-serverd -%endif %if %{with mysql} BuildRequires: mysql-devel %endif @@ -172,7 +170,11 @@ %setup -q -n %{srcname} %patch1 -p1 %patch2 -p1 +%if 0%{?suse_version} >= 1500 +# openssl 1.1.0 %patch3 -p1 +%endif +%patch4 -p1 %if 0%{?suse_version} <= 1110 %patch99 -p1 %endif @@ -234,7 +236,7 @@ # will appear in cfengine-examples rm -rf %{buildroot}/%{_docdir}/%{name}/examples -install -d %{buildroot}/{usr/sbin,%{workdir}/{bin,inputs,reports}} +install -d %{buildroot}/{%{_bindir},%{_sbindir},%{workdir}/{bin,inputs,reports}} # create dirs needed for better organizing dirs and files install -d %{buildroot}/%{basedir}/{backup,failsafe,config,plugins} @@ -250,16 +252,15 @@ %if %{have_systemd} # install systemd scripts -install -D -m 0644 %{SOURCE7} %{buildroot}/%{_unitdir}/cf-execd.service -install -D -m 0644 %{SOURCE8} %{buildroot}/%{_unitdir}/cf-monitord.service -install -D -m 0644 %{SOURCE9} %{buildroot}/%{_unitdir}/cf-serverd.service +install -d %{buildroot}%{_unitdir} +install -m 0644 %{SOURCE2} %{SOURCE3} %{SOURCE4} %{buildroot}/%{_unitdir} ln -s -f service %{buildroot}/%{_sbindir}/rccf-monitord ln -s -f service %{buildroot}/%{_sbindir}/rccf-execd ln -s -f service %{buildroot}/%{_sbindir}/rccf-serverd %else # install init scripts install -d %{buildroot}%{_initddir} -install -m 0755 %{SOURCE7} %{SOURCE8} %{SOURCE9} %{buildroot}%{_initddir}/ +install -m 0755 %{SOURCE5} %{SOURCE6} %{SOURCE7} %{buildroot}%{_initddir}/ ln -s -f ../..%{_initddir}/cf-monitord %{buildroot}/%{_sbindir}/rccf-monitord ln -s -f ../..%{_initddir}/cf-execd %{buildroot}/%{_sbindir}/rccf-execd ln -s -f ../..%{_initddir}/cf-serverd %{buildroot}/%{_sbindir}/rccf-serverd @@ -270,10 +271,10 @@ %{buildroot}%{_initddir}/cf-* %{buildroot}%{_sysconfdir}/cron.d/%{name} %endif -# create symlinks for sbin_PROGRAMS +# create symlinks for bin_PROGRAMS # because: cf-promises needs to be installed in /var/cfengine/work/bin for pre-validation of full configuration for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd cf-upgrade; do - ln -s -f ../../..%{_sbindir}/${i} %{buildroot}%{workdir}/bin/${i} + ln -s -f ../../..%{_bindir}/${i} %{buildroot}%{workdir}/bin/${i} done rm -rf %{buildroot}/%{_libdir}/%{name}/libpromises.la @@ -286,7 +287,7 @@ install -d %{buildroot}/%{_mandir}/man8 for i in cf-agent cf-execd cf-key cf-monitord cf-promises cf-runagent cf-serverd do - LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name} %{buildroot}%{_sbindir}/$i -M > %{buildroot}%{_mandir}/man8/$i.8 + LD_LIBRARY_PATH=%{buildroot}%{_libdir}/%{name} %{buildroot}%{_bindir}/$i -M > %{buildroot}%{_mandir}/man8/$i.8 gzip -n9 %{buildroot}%{_mandir}/man8/$i.8 done @@ -346,15 +347,16 @@ %files %defattr(-,root,root) %doc ChangeLog LICENSE README.md -%{_sbindir}/cf-agent -%{_sbindir}/cf-execd -%{_sbindir}/cf-key -%{_sbindir}/cf-monitord -%{_sbindir}/cf-promises -%{_sbindir}/cf-serverd -%{_sbindir}/cf-upgrade -%{_sbindir}/cf-runagent -%{_sbindir}/rpmvercmp +%{_bindir}/cf-agent +%{_bindir}/cf-execd +%{_bindir}/cf-key +%{_bindir}/cf-net +%{_bindir}/cf-monitord +%{_bindir}/cf-promises +%{_bindir}/cf-serverd +%{_bindir}/cf-upgrade +%{_bindir}/cf-runagent +%{_bindir}/rpmvercmp %if %{have_systemd} %{_unitdir}/cf-execd.service %{_unitdir}/cf-monitord.service ++++++ 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch ++++++ --- /var/tmp/diff_new_pack.cYUy8c/_old 2018-01-17 21:56:08.213324624 +0100 +++ /var/tmp/diff_new_pack.cYUy8c/_new 2018-01-17 21:56:08.213324624 +0100 @@ -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?= <kkae...@suse.de> 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 the systemd .service files expect the daemons. @@ -13,10 +13,10 @@ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c -index 06f2095270df..d615f5ed6e1d 100644 +index 7c20d9263108..8bea42c7f7a7 100644 --- a/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, "inputdir", GetInputDir(), CF_DATA_TYPE_STRING, "source=agent"); @@ -26,7 +26,7 @@ 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"); -@@ -632,7 +631,7 @@ static void GetNameInfo3(EvalContext *ctx) +@@ -635,7 +634,7 @@ static void GetNameInfo3(EvalContext *ctx) components[i]); } #else @@ -35,7 +35,7 @@ #endif 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, components[1]); #else @@ -45,5 +45,5 @@ if (stat(name, &sb) != -1) -- -2.11.0 +2.15.0 ++++++ 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch ++++++ --- /var/tmp/diff_new_pack.cYUy8c/_old 2018-01-17 21:56:08.221324249 +0100 +++ /var/tmp/diff_new_pack.cYUy8c/_new 2018-01-17 21:56:08.221324249 +0100 @@ -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?= <kkae...@suse.de> 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) This patch is a simplification of sysinfo.c:Linux_Suse_Version() @@ -17,10 +17,10 @@ 1 file changed, 60 insertions(+), 127 deletions(-) diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c -index d615f5ed6e1d..07a2e698a1cf 100644 +index 8bea42c7f7a7..b8fc9c76cf65 100644 --- a/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 " char classbuf[CF_MAXVARSIZE]; @@ -28,7 +28,7 @@ Log(LOG_LEVEL_VERBOSE, "This appears to be a SUSE system."); 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; } @@ -62,7 +62,7 @@ } } 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); @@ -117,7 +117,7 @@ { 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 { @@ -262,5 +262,5 @@ } -- -2.11.0 +2.15.0 ++++++ 0003-CFE-2629-Openssl-1.1-compatibility.patch ++++++ ++++ 1902 lines (skipped)
