Hello community, here is the log from the commit of package cfengine for openSUSE:Factory checked in at 2018-07-18 22:53:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfengine (Old) and /work/SRC/openSUSE:Factory/.cfengine.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cfengine" Wed Jul 18 22:53:15 2018 rev:72 rq:621849 version:3.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cfengine/cfengine.changes 2018-06-20 15:33:06.818251995 +0200 +++ /work/SRC/openSUSE:Factory/.cfengine.new/cfengine.changes 2018-07-18 22:53:18.207087539 +0200 @@ -1,0 +2,39 @@ +Tue Jul 3 07:30:21 UTC 2018 - kkae...@suse.com + +- Update to 3.12.0 (LTS) + New Features: + - Add a --key-type option to specify RSA key size to cf-key + - New hash_to_int policy function (CFE-2733) + - Issue a warning on ignored locking attributes (CFE-2748) + - Add IPv6 hard classes with the "ipv6_" prefix (CFE-2310) + - Introduce "missing_ok" attribute in body copy_from + This allows to ignore missing sources in file copy operations + (CFE-2365) + - Enable Xen hypervisor detection on all x86 platforms (CFE-2203) + - Add sys.policy_entry variables (CFE-2572) + - Added inline_mustache template method (CFE-1846) + - New component cf-net (cf-net is a CLI for the CFEngine network + protocol, useful for debugging, testing etc) and accompanying + policy variable sys.cf_net containing path to cf-net binary + - Added --log-level option to all components + This allows you to specify any log level (info, verbose, debug + etc.). + It is also less strict, allowing different spelling. As an example, + --log-level i, --log-level INFO, --log-level inform are all the same. + - Added special behavior for bundles named __main__ + If the bundle is defined in the entry policy it will be defined as + main. + If the bundle is defined elsewhere, it will be removed. + This makes it easy to make importable library policy which can also + be executed directly. + +- See https://github.com/cfengine/core/blob/3.12.x/ChangeLog for other + changes and bug fixes + +- drop 0003-CFE-2629-Openssl-1.1-compatibility.patch (upstream) + drop reproducible.patch (upstream) + add 0003-Reduce-string-truncation-warnings.patch + rename make_home_dir_for_tests.patch to + 0004-make-home-dir-for-tests.patch + +------------------------------------------------------------------- Old: ---- 0003-CFE-2629-Openssl-1.1-compatibility.patch core-3.11.0.tar.gz make_home_dir_for_tests.patch reproducible.patch New: ---- 0003-Reduce-string-truncation-warnings.patch 0004-make-home-dir-for-tests.patch core-3.12.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfengine.spec ++++++ --- /var/tmp/diff_new_pack.tYgbNt/_old 2018-07-18 22:53:22.151074461 +0200 +++ /var/tmp/diff_new_pack.tYgbNt/_new 2018-07-18 22:53:22.155074447 +0200 @@ -16,7 +16,7 @@ # -%define srcversion 3.11.0 +%define srcversion 3.12.0 %define srcname core-%{srcversion} %define libname libpromises %define libsoname %{libname}3 @@ -70,12 +70,11 @@ # 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 -Patch4: reproducible.patch +# PATCH-FIX-SUSE reduce "string truncated" (in strncpy) warnings +Patch3: 0003-Reduce-string-truncation-warnings.patch +# PATCH-FIX-SUSE BNC#1016848, adam.majer +Patch10: 0004-make-home-dir-for-tests.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 BuildRequires: bison @@ -89,8 +88,11 @@ BuildRequires: openssl-devel >= 1.0.2e BuildRequires: pam-devel BuildRequires: pcre-devel >= 8.38 +BuildRequires: python # for flock BuildRequires: util-linux +# for llzma +BuildRequires: xz-devel Requires: %{libsoname} = %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with mysql} @@ -170,11 +172,7 @@ %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 @@ -191,6 +189,7 @@ cp -a $RPM_SOURCE_DIR/*pdf docs/ %build +echo %{version} > CFVERSION EXPLICIT_VERSION=%{version} autoreconf -fvi -I m4 CC=cc CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure \ ++++++ 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch ++++++ --- /var/tmp/diff_new_pack.tYgbNt/_old 2018-07-18 22:53:22.183074354 +0200 +++ /var/tmp/diff_new_pack.tYgbNt/_new 2018-07-18 22:53:22.183074354 +0200 @@ -1,4 +1,4 @@ -From a3126babc502c7e79b866c3db04e92bd7cfa7bbb Mon Sep 17 00:00:00 2001 +From 7f0daf6cd3b6018c882c553ce0a3da51d47fec83 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/3] Set sys.bindir to /usr/sbin, expect cf-*components there @@ -13,7 +13,7 @@ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c -index 7c20d9263108..8bea42c7f7a7 100644 +index 5447659da5e1..5715d9acc7b7 100644 --- a/libenv/sysinfo.c +++ b/libenv/sysinfo.c @@ -589,8 +589,7 @@ static void GetNameInfo3(EvalContext *ctx) @@ -45,5 +45,5 @@ if (stat(name, &sb) != -1) -- -2.15.0 +2.17.1 ++++++ 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch ++++++ --- /var/tmp/diff_new_pack.tYgbNt/_old 2018-07-18 22:53:22.195074315 +0200 +++ /var/tmp/diff_new_pack.tYgbNt/_new 2018-07-18 22:53:22.195074315 +0200 @@ -1,4 +1,4 @@ -From 7b2bde90b9499920872723c733aea202f044d709 Mon Sep 17 00:00:00 2001 +From 35f37177192c77c66634346db354140b3c494dd0 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/3] Simplify and fix parsing of /etc/SuSE-release (fixes @@ -13,14 +13,14 @@ first line of /etc/SuSE-release - verified for sles version 9,10,11,12; sled versions 10,11,12, openSUSE 13.1 --- - libenv/sysinfo.c | 187 ++++++++++++++++++------------------------------------- + libenv/sysinfo.c | 187 +++++++++++++++-------------------------------- 1 file changed, 60 insertions(+), 127 deletions(-) diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c -index 8bea42c7f7a7..b8fc9c76cf65 100644 +index 5715d9acc7b7..29b82b36807b 100644 --- a/libenv/sysinfo.c +++ b/libenv/sysinfo.c -@@ -1822,6 +1822,7 @@ static int Linux_Suse_Version(EvalContext *ctx) +@@ -1954,6 +1954,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"); -@@ -1841,23 +1842,26 @@ static int Linux_Suse_Version(EvalContext *ctx) +@@ -1973,23 +1974,26 @@ static int Linux_Suse_Version(EvalContext *ctx) return 1; } @@ -62,7 +62,7 @@ } } if (ferror(fp)) -@@ -1871,28 +1875,38 @@ static int Linux_Suse_Version(EvalContext *ctx) +@@ -2003,28 +2007,38 @@ static int Linux_Suse_Version(EvalContext *ctx) fclose(fp); @@ -117,7 +117,7 @@ { Item *list, *ip; -@@ -1910,120 +1924,39 @@ static int Linux_Suse_Version(EvalContext *ctx) +@@ -2042,120 +2056,39 @@ static int Linux_Suse_Version(EvalContext *ctx) } else { @@ -203,7 +203,7 @@ - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - strcat(classbuf, "_"); - strcat(classbuf, strmajor); -- SetFlavour(ctx, classbuf); +- SetFlavor(ctx, classbuf); - strcat(classbuf, "_"); - strcat(classbuf, strminor); - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); @@ -241,7 +241,7 @@ - EvalContextClassPutHard(ctx, classbuf, "inventory,attribute_name=none,source=agent"); - - snprintf(classbuf, CF_MAXVARSIZE, "SUSE_%d", major); -- SetFlavour(ctx, classbuf); +- SetFlavor(ctx, classbuf); - - /* The correct spelling for SUSE is "SUSE" but CFEngine used to use "SuSE". - * Keep this for backwards compatibility until CFEngine 3.7 @@ -262,5 +262,5 @@ } -- -2.15.0 +2.17.1 ++++++ 0003-Reduce-string-truncation-warnings.patch ++++++ ++++ 662 lines (skipped) ++++++ 0004-make-home-dir-for-tests.patch ++++++ >From b5e4b0ca4384400cc8822ac06cdacbb97bc3c6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkae...@suse.de> Date: Tue, 3 Jul 2018 09:38:39 +0200 Subject: [PATCH 4/4] make home dir for tests Author: Adam Majer <adam.ma...@suse.de> Upstream: https://tracker.mender.io/browse/CFE-2549 BNC#1016848 Summary: this tests requires home directory, otherwise spams logfile --- tests/load/run_lastseen_threaded_load.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/load/run_lastseen_threaded_load.sh b/tests/load/run_lastseen_threaded_load.sh index 7dc5bcae7c25..60ea99af0c55 100755 --- a/tests/load/run_lastseen_threaded_load.sh +++ b/tests/load/run_lastseen_threaded_load.sh @@ -6,4 +6,6 @@ then exit 0; fi +text -x ~/.cfagent/state || mkdir -p ~/.cfagent/state + ./lastseen_threaded_load -c 1 4 1 1 -- 2.17.1 ++++++ core-3.11.0.tar.gz -> core-3.12.0.tar.gz ++++++ ++++ 34732 lines of diff (skipped)