cfengine: upgrade 3.21.0 -> 3.26.0

Changelog: https://github.com/cfengine/core/blob/3.26.0/ChangeLog

License-Update: The project switched from pcre to pcre2. This small
change is incorporated in the license, where the dependencies are listed.

libpcre2 and OpenSSL is now a mandatory dependencies, the corresponding
PACKAGECONFIGs are dropped.

Patch that was incorporated in this release is also dropped.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 10 insertions, 101 deletions

diff --git a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch b/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch
deleted file mode 100644
index 78f36bde45..0000000000
--- a/meta-oe/recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From a08acdfadb5eba2a3201209c6da3ad6f2ca4ae79 Mon Sep 17 00:00:00 2001
-From: Craig Comstock <craig.comstock@northern.tech>
-Date: Fri, 27 Jan 2023 15:19:48 -0600
-Subject: [PATCH] Fixed --with-libxml2=no case in configure.ac
-
-The CF3_WITH_LIBRARY and AC_CHECK_HEADERS were moved to outside of the check for with-libxml2=no
-
-Ticket: CFE-4023
-Changelog: title
----
-Upstream-Status: Pending
-
- configure.ac          | 21 +++++++++++----------
- libntech/configure.ac | 21 +++++++++++----------
- 2 files changed, 22 insertions(+), 20 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e189b10..f6b8226 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -659,19 +659,20 @@ if test "x$with_libxml2" != "xno"; then
-             LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2
-         fi
-     fi
--fi
- 
--CF3_WITH_LIBRARY(libxml2,
--    [AC_CHECK_LIB(xml2, xmlFirstElementChild,
--    [],
--    [if test "x$with_libxml2" != xcheck; then
--        AC_MSG_ERROR(Cannot find libxml2); fi]
--    )
--    AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+    CF3_WITH_LIBRARY(libxml2,
-+        [AC_CHECK_LIB(xml2, xmlFirstElementChild,
-+        [],
-         [if test "x$with_libxml2" != xcheck; then
-             AC_MSG_ERROR(Cannot find libxml2); fi]
--    )]
--)
-+        )
-+        AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+            [if test "x$with_libxml2" != xcheck; then
-+                AC_MSG_ERROR(Cannot find libxml2); fi]
-+        )]
-+    )
-+    
-+fi
- 
- AM_CONDITIONAL([HAVE_LIBXML2],
-     [test "x$with_libxml2" != xno &&
-diff --git a/libntech/configure.ac b/libntech/configure.ac
-index 7bb8787..28b3683 100644
---- a/libntech/configure.ac
-+++ b/libntech/configure.ac
-@@ -571,19 +571,20 @@ if test "x$with_libxml2" != "xno"; then
-             LIBXML2_CPPFLAGS=-I$with_libxml2/include/libxml2
-         fi
-     fi
--fi
- 
--CF3_WITH_LIBRARY(libxml2,
--    [AC_CHECK_LIB(xml2, xmlFirstElementChild,
--    [],
--    [if test "x$with_libxml2" != xcheck; then
--        AC_MSG_ERROR(Cannot find libxml2); fi]
--    )
--    AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+    CF3_WITH_LIBRARY(libxml2,
-+        [AC_CHECK_LIB(xml2, xmlFirstElementChild,
-+        [],
-         [if test "x$with_libxml2" != xcheck; then
-             AC_MSG_ERROR(Cannot find libxml2); fi]
--    )]
--)
-+        )
-+        AC_CHECK_HEADERS([libxml/xmlwriter.h], [break],
-+            [if test "x$with_libxml2" != xcheck; then
-+                AC_MSG_ERROR(Cannot find libxml2); fi]
-+        )]
-+    )
-+
-+fi
- 
- AM_CONDITIONAL([HAVE_LIBXML2],
-     [test "x$with_libxml2" != xno &&
--- 
-2.39.1
-
diff --git a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb b/meta-oe/recipes-extended/cfengine/cfengine_3.26.0.bb
index 5fd5279d7d..28ea16ea6f 100644
--- a/meta-oe/recipes-extended/cfengine/cfengine_3.21.0.bb
+++ b/meta-oe/recipes-extended/cfengine/cfengine_3.26.0.bb
@@ -11,37 +11,33 @@ its lifecycle. CFEngine takes systems from Build to Deploy, Manage and Audit."
 HOMEPAGE = "http://cfengine.com"
 
 LICENSE = "GPL-3.0-only"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=eef43e6a0b5a8f46ef7f11e1e4b32a6c"
 
-DEPENDS += "attr tokyocabinet bison-native libxml2"
+DEPENDS += "attr tokyocabinet bison-native openssl libpcre2 librsync"
 
 SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BPN}-community-${PV}.tar.gz \
-           file://0001-Fixed-with-libxml2-no-case-in-configure.ac.patch \
            file://set-path-of-default-config-file.patch \
            "
-SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126"
+SRC_URI[sha256sum] = "d3c3884b314dae48a6884e919d0a12acac5aea95d970544e4632a1773857d19b"
 
 inherit autotools-brokensep systemd
 
 export EXPLICIT_VERSION = "${PV}"
 
 SYSTEMD_SERVICE:${PN} = "cfengine3.service cf-apache.service cf-hub.service cf-postgres.service \
-                         cf-runalerts.service cf-execd.service \
+                         cf-execd.service cf-php-fpm.service \
                          cf-monitord.service  cf-serverd.service \
                          cf-reactor.service \
 "
 SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
-PACKAGECONFIG ??= "libpcre openssl \
-                   ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \
-"
+PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)}"
+
 PACKAGECONFIG[libxml2] = "--with-libxml2=yes,--with-libxml2=no,libxml2,"
 PACKAGECONFIG[mysql] = "--with-mysql=yes,--with-mysql=no,mariadb,"
 PACKAGECONFIG[postgresql] = "--with-postgresql=yes,--with-postgresql=no,postgresql,"
 PACKAGECONFIG[acl] = "--with-libacl=yes,--with-libacl=no,acl,"
 PACKAGECONFIG[libvirt] = "--with-libvirt=yes,--with-libvirt=no,libvirt,"
-PACKAGECONFIG[libpcre] = "--with-pcre=yes,--with-pcre=no,libpcre,"
-PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl,"
 PACKAGECONFIG[pam] = "--with-pam=yes,--with-pam=no,libpam,"
 PACKAGECONFIG[libyaml] = "--with-libyaml,--without-libyaml,libyaml,"
 PACKAGECONFIG[systemd] = "--with-systemd-service=${systemd_system_unitdir},--without-systemd-service"
@@ -53,8 +49,8 @@ CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'libxml2', '-I${STAGING_INCDIR}
 
 do_install:append() {
     install -d ${D}${localstatedir}/${BPN}/bin
-    for f in `ls ${D}${bindir}`; do
-        ln -s ${bindir}/`basename $f` ${D}${localstatedir}/${BPN}/bin/
+    for f in $(find ${D}${bindir} -type f); do
+         ln -sr $f ${D}${localstatedir}/${BPN}/bin/
     done
 
     install -d ${D}${sysconfdir}/default
@@ -73,3 +69,5 @@ EOF
 }
 
 RDEPENDS:${PN} += "${BPN}-masterfiles"
+
+FILES:${PN} += "${libdir}/python"