diff --git a/cfengine-3.10.0b1.patch b/cfengine-3.10.0b1.patch new file mode 100644 index 0000000..aa6bfe4 --- /dev/null +++ b/cfengine-3.10.0b1.patch @@ -0,0 +1,23 @@ +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 + #include + #include /* offsetof, size_t */ ++#include + + /* POSIX but available in all platforms. */ + #include diff --git a/cfengine-3.10.0b1.tar.gz b/cfengine-3.10.0b1.tar.gz new file mode 100644 index 0000000..485f36e --- /dev/null +++ b/cfengine-3.10.0b1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56cae2bb3603ead86404611dde99ef2d6e251c576efd73ce85aae7da8df05d05 +size 2346176 diff --git a/cfengine-3.9.1.tar.gz b/cfengine-3.9.1.tar.gz deleted file mode 100644 index 094ac0a..0000000 --- a/cfengine-3.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19bf900741efe3da4266591985dc1103243cb751888047694fce6f407ef2d225 -size 2278474 diff --git a/cfengine.changes b/cfengine.changes index 773062e..a0f6c2b 100644 --- a/cfengine.changes +++ b/cfengine.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +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 + + New features/additions: + - All new features/additions for 3.8 and 3.9 are also included in 3.10. + - Add: Classes body tailored for use with diff + - New feature: Classes promise: allow classes without an expression to + default to defined. + - Support for custom ports and host names as policy hub (CFE-953) + - Add: Definition of from_cfexecd for cf-execd initiated runs + (CFE-2386) + - Add < <= > >= operators to eval(). + - Add testing jUnit and TAP bundles and include them in stdlib.cf + - New function isipinsubnet() (ENT-7949) + - LogDebug(): implement module-based debug logging. + Now most DEBUG messages are *not* printed even when "-d" is in + use, but the specific debug module has to be enabled on the + command line. For example to enable all log modules, run: + cf-agent -d --log-modules=all + - Add: edit_line contains_literal_string to stdlib + - add variablesmatching_as_data() function paralleling variablesmatching() + (Redmine #7885) + - Allow specifying agent maxconnections via def.json (CFE-2461) + - Add getuserinfo() function + - Add body agent control select_end_match_eof option. (CFE-2390) + +- Add cfengine-3.10.0b1.patch to find libacl during build + ------------------------------------------------------------------- Fri Aug 5 10:30:01 UTC 2016 - kkaempf@suse.com diff --git a/cfengine.spec b/cfengine.spec index dd4874d..3a25008 100644 --- a/cfengine.spec +++ b/cfengine.spec @@ -16,7 +16,7 @@ # -%define srcversion 3.9.1 +%define srcversion 3.10.0b1 %define srcname %{name}-%{srcversion} %define libname libpromises %define libsoname %{libname}3 @@ -34,7 +34,7 @@ %bcond_with postgresql %bcond_with libvirt Name: cfengine -Version: %{srcversion} +Version: 3.10.0~b1 Release: 0 # This is the place where workdir should be #define basedir /var/lib/%{name} @@ -55,6 +55,7 @@ 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 @@ -170,6 +171,7 @@ Lots of examples promises for CFEngine. %prep %setup -q -n %{srcname} +%patch1 -p1 %if 0%{?suse_version} <= 1110 %patch2 -p1 %endif @@ -188,7 +190,6 @@ cp -a $RPM_SOURCE_DIR/*pdf docs/ %build EXPLICIT_VERSION=%{version} autoreconf -fvi -I m4 -# /usr/include/sys for acl.h CC=cc CFLAGS="%{optflags} -fno-strict-aliasing" \ %configure \ --disable-static \ @@ -211,7 +212,7 @@ CC=cc CFLAGS="%{optflags} -fno-strict-aliasing" \ %if %{with libvirt} --with-libvirt \ %endif - --with-libacl \ + --without-libacl \ --with-libxml2 \ %if 0%{?rhel_version} > 0 && 0%{?rhel_version} < 700 --docdir=%{_docdir}/%{name}-%{version} \