- Update to 3.10.0 (final) - LTS until Dec 2019
See https://cfengine.com/company/blog-detail/cfengine-3-10-lts-released/ and https://github.com/cfengine/core/blob/3.10.0/ChangeLog for full changelog. - rename 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch to 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch - drop cfengine-3.10.0b1.patch, upstream - Update to 3.10.0 (beta1) - LTS until Dec 2019 See https://github.com/cfengine/core/blob/3.10.0b1/ChangeLog for full ChangeLog OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=149
This commit is contained in:
Klaus Kämpf
Git OBS Bridge
parent
816994d818
commit
1dfa197238
@ -1,4 +1,4 @@
|
||||
From 900148bcea077497d062eccb7a8a5f1ea6f4f9e0 Mon Sep 17 00:00:00 2001
|
||||
From b81b3cde4794eb7a195e49f782fbfab930cd1a2c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@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
|
||||
@ -13,10 +13,10 @@ masterfiles/update/update_processes.cf:enable_cfengine_agents
|
||||
1 file changed, 3 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
|
||||
index a75c6aa1d8d6..1c1139aead94 100644
|
||||
index 06f2095270df..d615f5ed6e1d 100644
|
||||
--- a/libenv/sysinfo.c
|
||||
+++ b/libenv/sysinfo.c
|
||||
@@ -581,8 +581,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
||||
@@ -586,8 +586,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 @@ index a75c6aa1d8d6..1c1139aead94 100644
|
||||
|
||||
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");
|
||||
@@ -627,7 +626,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
||||
@@ -632,7 +631,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
||||
components[i]);
|
||||
}
|
||||
#else
|
||||
@ -35,7 +35,7 @@ index a75c6aa1d8d6..1c1139aead94 100644
|
||||
#endif
|
||||
|
||||
have_component[i] = false;
|
||||
@@ -650,7 +649,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
||||
@@ -655,7 +654,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 @@ index a75c6aa1d8d6..1c1139aead94 100644
|
||||
|
||||
if (stat(name, &sb) != -1)
|
||||
--
|
||||
2.1.4
|
||||
2.11.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 5954a3e3c1c8be821e32cfac3ec4161892025c95 Mon Sep 17 00:00:00 2001
|
||||
From d261fe140de0ab2a6f5ca553ab964e7a09e890b4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
||||
Date: Fri, 11 Apr 2014 09:25:05 +0200
|
||||
Subject: [PATCH 2/2] Simplify and fix parsing of /etc/SuSE-release (fixes
|
||||
@ -17,10 +17,10 @@ to achieve the following
|
||||
1 file changed, 60 insertions(+), 127 deletions(-)
|
||||
|
||||
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
|
||||
index 1c1139aead94..77667b611ad6 100644
|
||||
index d615f5ed6e1d..07a2e698a1cf 100644
|
||||
--- a/libenv/sysinfo.c
|
||||
+++ b/libenv/sysinfo.c
|
||||
@@ -1754,6 +1754,7 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
@@ -1753,6 +1753,7 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
#define SUSE_RELEASE_FLAG "linux "
|
||||
|
||||
char classbuf[CF_MAXVARSIZE];
|
||||
@ -28,7 +28,7 @@ index 1c1139aead94..77667b611ad6 100644
|
||||
|
||||
Log(LOG_LEVEL_VERBOSE, "This appears to be a SUSE system.");
|
||||
EvalContextClassPutHard(ctx, "SUSE", "inventory,attribute_name=none,source=agent");
|
||||
@@ -1773,23 +1774,26 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
@@ -1772,23 +1773,26 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -62,7 +62,7 @@ index 1c1139aead94..77667b611ad6 100644
|
||||
}
|
||||
}
|
||||
if (ferror(fp))
|
||||
@@ -1803,28 +1807,38 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
@@ -1802,28 +1806,38 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
|
||||
fclose(fp);
|
||||
|
||||
@ -117,7 +117,7 @@ index 1c1139aead94..77667b611ad6 100644
|
||||
{
|
||||
Item *list, *ip;
|
||||
|
||||
@@ -1842,120 +1856,39 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
@@ -1841,120 +1855,39 @@ static int Linux_Suse_Version(EvalContext *ctx)
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -262,5 +262,5 @@ index 1c1139aead94..77667b611ad6 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.1.4
|
||||
2.11.0
|
||||
|
||||
3
cfengine-3.10.0.tar.gz
Normal file
3
cfengine-3.10.0.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:8bf344eb6e9c06c0e12c1b23f5c793f43d43007826652e563cb9b2516742ecd5
|
||||
size 2352509
|
||||
@ -1,23 +0,0 @@
|
||||
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cfengine-3.10.0b1/configure.ac ./configure.ac
|
||||
--- ../orig-cfengine-3.10.0b1/configure.ac 2016-11-01 08:47:08.000000000 +0100
|
||||
+++ ./configure.ac 2016-11-15 15:33:45.058052537 +0100
|
||||
@@ -506,7 +506,7 @@
|
||||
AC_CHECK_LIB(acl, acl_init,
|
||||
[],
|
||||
[if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl library); fi])
|
||||
- AC_CHECK_HEADERS([acl.h sys/acl.h acl/libacl.h],
|
||||
+ AC_CHECK_HEADERS([sys/acl.h acl/libacl.h],
|
||||
[libacl_header_found=yes],
|
||||
[if test "x$with_libacl" != xcheck; then AC_MSG_ERROR(Cannot find libacl header files); fi])
|
||||
])
|
||||
diff -ruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cfengine-3.10.0b1/libutils/platform.h ./libutils/platform.h
|
||||
--- ../orig-cfengine-3.10.0b1/libutils/platform.h 2016-11-01 08:47:08.000000000 +0100
|
||||
+++ ./libutils/platform.h 2016-11-15 15:49:14.789010435 +0100
|
||||
@@ -75,6 +75,7 @@
|
||||
#include <ctype.h>
|
||||
#include <assert.h>
|
||||
#include <stddef.h> /* offsetof, size_t */
|
||||
+#include <time.h>
|
||||
|
||||
/* POSIX but available in all platforms. */
|
||||
#include <strings.h>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:56cae2bb3603ead86404611dde99ef2d6e251c576efd73ce85aae7da8df05d05
|
||||
size 2346176
|
||||
@ -1,9 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 16 09:11:34 UTC 2016 - kkaempf@suse.com
|
||||
Thu Dec 29 09:53:50 UTC 2016 - kkaempf@suse.com
|
||||
|
||||
- Update to 3.10.0 (beta1) - LTS until Dec 2019
|
||||
See https://github.com/cfengine/core/blob/3.10.0b1/ChangeLog
|
||||
for full ChangeLog
|
||||
- Update to 3.10.0 (final) - LTS until Dec 2019
|
||||
|
||||
See https://cfengine.com/company/blog-detail/cfengine-3-10-lts-released/
|
||||
and https://github.com/cfengine/core/blob/3.10.0/ChangeLog
|
||||
for full changelog.
|
||||
|
||||
New features/additions:
|
||||
- All new features/additions for 3.8 and 3.9 are also included in 3.10.
|
||||
@ -28,6 +30,18 @@ Wed Nov 16 09:11:34 UTC 2016 - kkaempf@suse.com
|
||||
- Add getuserinfo() function
|
||||
- Add body agent control select_end_match_eof option. (CFE-2390)
|
||||
|
||||
- rename 0001-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
|
||||
to 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
|
||||
|
||||
- drop cfengine-3.10.0b1.patch, upstream
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 16 09:11:34 UTC 2016 - kkaempf@suse.com
|
||||
|
||||
- Update to 3.10.0 (beta1) - LTS until Dec 2019
|
||||
See https://github.com/cfengine/core/blob/3.10.0b1/ChangeLog
|
||||
for full ChangeLog
|
||||
|
||||
- Add cfengine-3.10.0b1.patch to find libacl during build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#
|
||||
|
||||
|
||||
%define srcversion 3.10.0b1
|
||||
%define srcversion 3.10.0
|
||||
%define srcname %{name}-%{srcversion}
|
||||
%define libname libpromises
|
||||
%define libsoname %{libname}3
|
||||
@ -34,7 +34,7 @@
|
||||
%bcond_with postgresql
|
||||
%bcond_with libvirt
|
||||
Name: cfengine
|
||||
Version: 3.10.0~b1
|
||||
Version: 3.10.0
|
||||
Release: 0
|
||||
# This is the place where workdir should be
|
||||
#define basedir /var/lib/%{name}
|
||||
@ -55,17 +55,18 @@ Source104: http://www.cfengine.org/manuals/cf3-quickstart.pdf
|
||||
Source105: http://www.cfengine.org/manuals/cf3-solutions.pdf
|
||||
Source106: http://www.cfengine.org/manuals/cf3-tutorial.pdf
|
||||
Source107: http://www.verticalsysadmin.com/cfengine/primer.pdf
|
||||
Patch1: %{srcname}.patch
|
||||
# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
|
||||
Patch2: remove-am_subst_notmake.patch
|
||||
# PATCH-FIX-UPSTREAM add 'suse' class for consistency with other vendor classes
|
||||
# PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423
|
||||
# kkaempf@suse.de
|
||||
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
|
||||
# kkaempf@suse.de
|
||||
Patch6: 0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
|
||||
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
|
||||
# kkaempf@suse.de
|
||||
Patch2: 0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
|
||||
|
||||
# SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
|
||||
Patch99: remove-am_subst_notmake.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: db-devel
|
||||
@ -171,12 +172,12 @@ Lots of examples promises for CFEngine.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{srcname}
|
||||
#%patch1 -p1
|
||||
%patch1 -p1
|
||||
%if 0%{?suse_version} <= 1110
|
||||
%patch2 -p1
|
||||
%if 0%{?suse_version} <= 1110
|
||||
%patch99 -p1
|
||||
%endif
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
|
||||
##### rpmlint
|
||||
#### wrong-file-end-of-line-encoding
|
||||
|
||||
Loading…
Reference in New Issue
Block a user