Skip to content

cfengine: upgrade to 3.21.0 #655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
craigcomstock wants to merge 2 commits into from
Closed

cfengine: upgrade to 3.21.0 #655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb2211d
Upgrade cfengine recipe to 3.21.0
craigcomstock Aug 25, 2021
77cd357
Fixed --with-libxml2=no case in configure.ac
craigcomstock Jan 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions meta-oe/recipes-extended/cfengine/cfengine-masterfiles/python3.patch
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions ...d/cfengine/cfengine-masterfiles_3.15.0.bb → ...d/cfengine/cfengine-masterfiles_3.21.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ or wherever `$(sys.masterdir)` points. \
HOMEPAGE = "http://cfengine.com"

LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=9f76426f9ef8c6f6739fadd21d817a4f"
LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e"

SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
file://python3.patch \
"
SRC_URI[md5sum] = "6d456fdd9bd24ff6617eeaa05efae602"
SRC_URI[sha256sum] = "4a071c0c4ba7df9bad93144cff5fbc0566e5172afd66201072e3193b76c55a38"
#SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98"
SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16"

inherit autotools

Expand Down
87 changes: 87 additions & 0 deletions .../recipes-extended/cfengine/cfengine/0001-Fixed-with-libxml2-no-case-in-configure.ac.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
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
---
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

10 changes: 6 additions & 4 deletions ...ipes-extended/cfengine/cfengine_3.15.0.bb → ...ipes-extended/cfengine/cfengine_3.21.0.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ HOMEPAGE = "http://cfengine.com"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://LICENSE;md5=233aa25e53983237cf0bd4c238af255f"

DEPENDS = "attr tokyocabinet bison-native"
DEPENDS += "attr tokyocabinet bison-native libxml2"
#RDEPENDS:cfengine += "attr tokyocabinet bison-native libxml2"

SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \
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[md5sum] = "d4dabfa46d8afa151be5610f184354e7"
SRC_URI[sha256sum] = "fa53e137f850eb268a8e7ae4578b5db5dc383656341f5053dc1a353ed0288265"
#SRC_URI[md5sum] = "5318e40702bc66a3ece44ec4ad77712b"
SRC_URI[sha256sum] = "911778ddb0a4e03a3ddfc8fc0f033136e1551849ea2dcbdb3f0f14359dfe3126"

inherit autotools-brokensep systemd

Expand Down