From 797dfd93cf47f52493d465ae81e29092c5158653 Mon Sep 17 00:00:00 2001 From: Victor Moene Date: Fri, 7 Aug 2026 11:49:07 +0200 Subject: [PATCH] Added cf-reactor binary Signed-off-by: Victor Moene Ticket: ENT-14275 --- packaging/cfengine-community/cfengine-community.spec.in | 6 ++++-- .../cfengine-community/debian/cfengine-community.install | 1 + packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in | 2 +- packaging/cfengine-nova/cfengine-nova.spec.aix.in | 1 + packaging/cfengine-nova/cfengine-nova.spec.in | 6 ++++-- packaging/cfengine-nova/cfengine-nova.wxs | 3 +++ packaging/cfengine-nova/debian/cfengine-nova.install | 1 + packaging/common/cfengine-hub/postremove.sh | 2 +- packaging/common/cfengine-non-hub/postinstall.sh | 2 +- packaging/common/cfengine-non-hub/postremove.sh | 2 +- 10 files changed, 18 insertions(+), 8 deletions(-) diff --git a/packaging/cfengine-community/cfengine-community.spec.in b/packaging/cfengine-community/cfengine-community.spec.in index 737d133c0..daa22e5a6 100644 --- a/packaging/cfengine-community/cfengine-community.spec.in +++ b/packaging/cfengine-community/cfengine-community.spec.in @@ -75,13 +75,12 @@ rm -f $RPM_BUILD_ROOT/etc/profile.d/cfengine3.sh rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-apache.service rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-php-fpm.service rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-hub.service -rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-reactor.service rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service # Create symlinks to /usr/local/sbin and /usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/local/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin -for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd; do +for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd cf-reactor; do ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary done @@ -116,6 +115,7 @@ done %prefix/bin/cf-support %prefix/bin/cf-upgrade %prefix/bin/cf-watchd +%prefix/bin/cf-reactor # Libraries %dir %prefix/lib %prefix/lib/lib*.so* @@ -181,6 +181,7 @@ done /usr/local/sbin/cf-serverd /usr/local/sbin/cf-support /usr/local/sbin/cf-watchd +/usr/local/sbin/cf-reactor # Symlinks to /usr/sbin (included in secure_path) /usr/sbin/cf-agent @@ -195,6 +196,7 @@ done /usr/sbin/cf-serverd /usr/sbin/cf-support /usr/sbin/cf-watchd +/usr/sbin/cf-reactor # Documentation %defattr(644,root,root,755) diff --git a/packaging/cfengine-community/debian/cfengine-community.install b/packaging/cfengine-community/debian/cfengine-community.install index 62f01e8cf..44f734f08 100644 --- a/packaging/cfengine-community/debian/cfengine-community.install +++ b/packaging/cfengine-community/debian/cfengine-community.install @@ -18,6 +18,7 @@ /var/cfengine/bin/cf-support /var/cfengine/bin/cf-upgrade /var/cfengine/bin/cf-watchd +/var/cfengine/bin/cf-reactor /var/cfengine/bin/getfacl /var/cfengine/lib/lib*.so.* /var/cfengine/lib/liblmdb.so diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in index 464d00f92..8481d03e6 100644 --- a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in +++ b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in @@ -222,9 +222,9 @@ exit 0 %prefix/bin/cf-serverd %prefix/bin/cf-support %prefix/bin/cf-watchd +%prefix/bin/cf-reactor # Nova-only binaries %prefix/bin/cf-hub -%prefix/bin/cf-reactor # Only verify owner group mode maj min symlink # Don't verify md5, size, mtime diff --git a/packaging/cfengine-nova/cfengine-nova.spec.aix.in b/packaging/cfengine-nova/cfengine-nova.spec.aix.in index 5f14a0fec..c3d190424 100644 --- a/packaging/cfengine-nova/cfengine-nova.spec.aix.in +++ b/packaging/cfengine-nova/cfengine-nova.spec.aix.in @@ -74,6 +74,7 @@ rm -rf $RPM_BUILD_ROOT %prefix/bin/cf-support %prefix/bin/cf-upgrade %prefix/bin/cf-watchd +%prefix/bin/cf-reactor # Libraries %dir %prefix/lib %prefix/lib/lib*.so* diff --git a/packaging/cfengine-nova/cfengine-nova.spec.in b/packaging/cfengine-nova/cfengine-nova.spec.in index 27b2184c4..bc8b9b013 100644 --- a/packaging/cfengine-nova/cfengine-nova.spec.in +++ b/packaging/cfengine-nova/cfengine-nova.spec.in @@ -70,13 +70,12 @@ rm -rf $RPM_BUILD_ROOT%{prefix}/ssl rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-apache.service rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-php-fpm.service rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-hub.service -rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-reactor.service rm -rf $RPM_BUILD_ROOT/usr/lib/systemd/system/cf-postgres.service # Create symlinks to /usr/local/sbin and /usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/local/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin -for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd; do +for binary in cf-agent cf-check cf-execd cf-key cf-monitord cf-net cf-promises cf-runagent cf-secret cf-serverd cf-support cf-watchd cf-reactor; do ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/local/sbin/$binary ln -sf %{prefix}/bin/$binary $RPM_BUILD_ROOT/usr/sbin/$binary done @@ -129,6 +128,7 @@ exit 0 %prefix/bin/cf-support %prefix/bin/cf-upgrade %prefix/bin/cf-watchd +%prefix/bin/cf-reactor # Libraries %dir %prefix/lib %prefix/lib/lib*.so* @@ -193,6 +193,7 @@ exit 0 /usr/local/sbin/cf-serverd /usr/local/sbin/cf-support /usr/local/sbin/cf-watchd +/usr/local/sbin/cf-reactor # Symlinks to /usr/sbin (included in secure_path) /usr/sbin/cf-agent @@ -207,6 +208,7 @@ exit 0 /usr/sbin/cf-serverd /usr/sbin/cf-support /usr/sbin/cf-watchd +/usr/sbin/cf-reactor # Documentation %defattr(644,root,root,755) diff --git a/packaging/cfengine-nova/cfengine-nova.wxs b/packaging/cfengine-nova/cfengine-nova.wxs index 19129f7b5..00e457759 100644 --- a/packaging/cfengine-nova/cfengine-nova.wxs +++ b/packaging/cfengine-nova/cfengine-nova.wxs @@ -99,6 +99,9 @@ + + + diff --git a/packaging/cfengine-nova/debian/cfengine-nova.install b/packaging/cfengine-nova/debian/cfengine-nova.install index 7031c320f..f0faec9b0 100644 --- a/packaging/cfengine-nova/debian/cfengine-nova.install +++ b/packaging/cfengine-nova/debian/cfengine-nova.install @@ -18,6 +18,7 @@ /var/cfengine/bin/cf-support /var/cfengine/bin/cf-upgrade /var/cfengine/bin/cf-watchd +/var/cfengine/bin/cf-reactor /var/cfengine/lib/lib*.so.* /var/cfengine/lib/python/* /var/cfengine/lib/cfengine-enterprise.so diff --git a/packaging/common/cfengine-hub/postremove.sh b/packaging/common/cfengine-hub/postremove.sh index 1ea58b679..758d347a4 100644 --- a/packaging/common/cfengine-hub/postremove.sh +++ b/packaging/common/cfengine-hub/postremove.sh @@ -28,7 +28,7 @@ fi if [ `os_type` != redhat ]; then # These links are handled in .spec file for RedHat - for i in cf-agent cf-key cf-secret cf-promises cf-execd cf-serverd cf-monitord cf-net cf-check cf-support cf-watchd; do + for i in cf-agent cf-key cf-secret cf-promises cf-execd cf-serverd cf-monitord cf-net cf-check cf-support cf-watchd cf-reactor; do rm -f /usr/local/sbin/$i || true done fi diff --git a/packaging/common/cfengine-non-hub/postinstall.sh b/packaging/common/cfengine-non-hub/postinstall.sh index abfe61907..edbdbd346 100644 --- a/packaging/common/cfengine-non-hub/postinstall.sh +++ b/packaging/common/cfengine-non-hub/postinstall.sh @@ -45,7 +45,7 @@ if [ -f $PREFIX/bin/cf-twin ]; then fi mkdir -p /usr/local/sbin -for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd; +for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd cf-reactor; do if [ `os_type` != redhat ] && [ -x $PREFIX/bin/$i ]; then # These links are handled in .spec file for RedHat diff --git a/packaging/common/cfengine-non-hub/postremove.sh b/packaging/common/cfengine-non-hub/postremove.sh index 48355ac54..7bc84bfc1 100644 --- a/packaging/common/cfengine-non-hub/postremove.sh +++ b/packaging/common/cfengine-non-hub/postremove.sh @@ -9,7 +9,7 @@ esac if [ `os_type` != redhat ]; then # These links are handled in .spec file for RedHat - for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd; do + for i in cf-agent cf-promises cf-key cf-secret cf-execd cf-serverd cf-monitord cf-runagent cf-net cf-check cf-support cf-watchd cf-reactor; do rm -f /usr/local/sbin/$i || true done fi