From ed3ed65b5592d965d3c2e6454a6014329ca16ac6 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 5 May 2026 11:40:50 -0500 Subject: [PATCH 1/3] Added cfengine-nova-hub package requires for openssl command that is needed during install Ticket: ENT-14049 Changelog: title (cherry picked from commit a40031926e8ad3d77925c671acc8f79e35b11f9b) --- packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in index 0a95de657..32beee5ab 100644 --- a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in +++ b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in @@ -35,6 +35,7 @@ Requires: selinux-policy >= @@SELINUX_POLICY_VERSION@@ %if %{?rhel}%{!?rhel:0} == 8 Requires: libssl.so.1.1()(64bit) libssl.so.1.1(OPENSSL_1_1_0)(64bit) libssl.so.1.1(OPENSSL_1_1_1)(64bit) Requires: libcrypto.so.1.1()(64bit) libcrypto.so.1.1(OPENSSL_1_1_0)(64bit) +Requires: openssl %endif # We build against systems with the latest available dependencies such as OpenSSL. @@ -44,6 +45,7 @@ Requires: libcrypto.so.1.1()(64bit) libcrypto.so.1.1(OPENSSL_1_1_0)(64bit) %if %{?rhel}%{!?rhel:0} > 8 Requires: libcrypto.so.3()(64bit) libcrypto.so.3(OPENSSL_@@OPENSSL_VERSION@@)(64bit) Requires: libssl.so.3()(64bit) libssl.so.3(OPENSSL_@@OPENSSL_VERSION@@)(64bit) +Requires: openssl %endif # cfbs/Build requires Python 3.5+ (not available on RHEL 6) From eab071951c71ffce034d88d439cbaf717cafc426 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 5 May 2026 11:45:44 -0500 Subject: [PATCH 2/3] Added /usr/bin/hostname to Requires for redhat packages This fixes install in minimal containers Ticket: ENT-12962 Changelog: title (cherry picked from commit 75bc72eb95e691323ff879c0863f0f445110541e) --- packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in index 32beee5ab..26d966570 100644 --- a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in +++ b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in @@ -22,7 +22,7 @@ Requires: hostname %if %{?rhel}%{!?rhel:0} >= 8 Recommends: gzip %endif -Requires(pre): /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent +Requires(pre): /usr/sbin/useradd, /usr/sbin/userdel, /usr/bin/getent, /usr/bin/hostname Requires(post): /usr/sbin/usermod, /bin/sed # we require selinux-policy package version that matches or exceeds our build system version From dc1321e141d0f4b8193a14b162ffeb8d9a8c7fd2 Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Tue, 5 May 2026 15:44:56 -0500 Subject: [PATCH 3/3] Added check for existence of chkconfig command before using it to add cfengine3 service e.g. in a minimal container this will be missing and starting cfengine3 will likely be handled in a Dockerfile or other means. Ticket: ENT-14049 Changelog: title (cherry picked from commit 7fccb220ed075553620a3a8b04304261534acfb1) --- packaging/common/cfengine-hub/postinstall.sh | 2 +- packaging/common/cfengine-non-hub/postinstall.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/common/cfengine-hub/postinstall.sh b/packaging/common/cfengine-hub/postinstall.sh index a15bedcb6..537acc0be 100644 --- a/packaging/common/cfengine-hub/postinstall.sh +++ b/packaging/common/cfengine-hub/postinstall.sh @@ -1082,7 +1082,7 @@ if ! is_upgrade; then else case "`os_type`" in redhat) - chkconfig --add cfengine3 + test -x /sbin/chkconfig && test -f /etc/init.d/cfengine3 && chkconfig --add cfengine3 ;; debian) update-rc.d cfengine3 defaults diff --git a/packaging/common/cfengine-non-hub/postinstall.sh b/packaging/common/cfengine-non-hub/postinstall.sh index 6280ab553..c7d36cb6a 100644 --- a/packaging/common/cfengine-non-hub/postinstall.sh +++ b/packaging/common/cfengine-non-hub/postinstall.sh @@ -79,7 +79,7 @@ case `os_type` in case `os_type` in redhat) if ! is_upgrade; then - chkconfig --add cfengine3 + test -x /sbin/chkconfig && test -f /etc/init.d/cfengine3 && chkconfig --add cfengine3 fi ;; debian)