From 4892f6178f2d9439c35e433ac5e73e284f2ae02a Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Thu, 25 Jun 2026 10:56:09 +0200 Subject: [PATCH 1/2] Updated dependency 'leech2' from version 5.1.0 to 5.2.0 Signed-off-by: Lars Erik Wik --- deps-packaging/leech2/cfbuild-leech2.spec | 2 +- deps-packaging/leech2/distfiles | 2 +- deps-packaging/leech2/source | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deps-packaging/leech2/cfbuild-leech2.spec b/deps-packaging/leech2/cfbuild-leech2.spec index 236ab6133..7ae7fdd22 100644 --- a/deps-packaging/leech2/cfbuild-leech2.spec +++ b/deps-packaging/leech2/cfbuild-leech2.spec @@ -1,4 +1,4 @@ -%define leech2_version 5.1.0 +%define leech2_version 5.2.0 Summary: CFEngine Build Automation -- leech2 Name: cfbuild-leech2 diff --git a/deps-packaging/leech2/distfiles b/deps-packaging/leech2/distfiles index a12ffd16b..694a54cbb 100644 --- a/deps-packaging/leech2/distfiles +++ b/deps-packaging/leech2/distfiles @@ -1 +1 @@ -f647ef8922b8a154e09a446da58c17fb44326c84fa14d2571e42fa6cfa2a5e31 leech2-5.1.0.tar.gz +b33711aeadf592c3b56dceda683191d83d23d9b0dbb2ef9b690004bcc5ed908d leech2-5.2.0.tar.gz diff --git a/deps-packaging/leech2/source b/deps-packaging/leech2/source index a728eecae..2e0dd3cf8 100644 --- a/deps-packaging/leech2/source +++ b/deps-packaging/leech2/source @@ -1 +1 @@ -https://github.com/larsewi/leech2/releases/download/v5.1.0/ +https://github.com/larsewi/leech2/releases/download/v5.2.0/ From 7fc0786b11c562b6164aff65dfead2d1bdb87da4 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Thu, 25 Jun 2026 14:42:28 +0200 Subject: [PATCH 2/2] Package leech2 config at workdir .leech2 instead of state The leech2 config moved out of the state directory to $(prefix)/.leech2/config.json; update the rpm specs, deb install lists, and MSI packaging to ship it from the new location. Ticket: ENT-14204 Signed-off-by: Lars Erik Wik --- build-scripts/package-msi | 4 ++-- .../cfengine-nova-hub/cfengine-nova-hub.spec.in | 4 ++-- .../debian/cfengine-nova-hub.install | 1 + packaging/cfengine-nova/cfengine-nova.spec.in | 4 ++-- packaging/cfengine-nova/cfengine-nova.wxs | 12 +++++------- packaging/cfengine-nova/debian/cfengine-nova.install | 2 +- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/build-scripts/package-msi b/build-scripts/package-msi index 2483440ef..d8320a057 100755 --- a/build-scripts/package-msi +++ b/build-scripts/package-msi @@ -118,8 +118,8 @@ pre() { esac # Copy default leech2 config (ENT-14100) - install -d "$P"/state/.leech2 - install -m 644 "$BASEDIR"/cfengine/dist"$BUILDPREFIX"/state/.leech2/config.json "$P"/state/.leech2/ + install -d "$P"/.leech2 + install -m 644 "$BASEDIR"/cfengine/dist"$BUILDPREFIX"/.leech2/config.json "$P"/.leech2/ # Copy WiX source file for MSI generation cp "$BASEDIR"/buildscripts/packaging/cfengine-nova/cfengine-nova.wxs "$P" diff --git a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in index 18e6bcf27..1e568c445 100644 --- a/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in +++ b/packaging/cfengine-nova-hub/cfengine-nova-hub.spec.in @@ -469,10 +469,10 @@ exit 0 %dir %prefix/outputs %dir %prefix/inputs %dir %prefix/state -%dir %prefix/state/.leech2 +%dir %prefix/.leech2 # Mode must match the cfengine-nova package, which also ships this file %defattr(600,root,root,700) -%prefix/state/.leech2/config.json +%prefix/.leech2/config.json %changelog diff --git a/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install b/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install index 7088cda9a..b46e4ecdf 100644 --- a/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install +++ b/packaging/cfengine-nova-hub/debian/cfengine-nova-hub.install @@ -36,6 +36,7 @@ /var/cfengine/lib/libpq.so /var/cfengine/lib/libecpg.so /var/cfengine/lib/libleech2.so +/var/cfengine/.leech2/config.json /var/cfengine/bin/lch /var/cfengine/lib/cfengine-*.so /var/cfengine/lib/apr-util-1 diff --git a/packaging/cfengine-nova/cfengine-nova.spec.in b/packaging/cfengine-nova/cfengine-nova.spec.in index 2d3dbd471..d97b91366 100644 --- a/packaging/cfengine-nova/cfengine-nova.spec.in +++ b/packaging/cfengine-nova/cfengine-nova.spec.in @@ -217,8 +217,8 @@ exit 0 %dir %prefix/inputs %dir %prefix/modules %dir %prefix/state -%dir %prefix/state/.leech2 -%prefix/state/.leech2/config.json +%dir %prefix/.leech2 +%prefix/.leech2/config.json %changelog diff --git a/packaging/cfengine-nova/cfengine-nova.wxs b/packaging/cfengine-nova/cfengine-nova.wxs index 9d7c32afc..d10b4d017 100644 --- a/packaging/cfengine-nova/cfengine-nova.wxs +++ b/packaging/cfengine-nova/cfengine-nova.wxs @@ -178,13 +178,11 @@ - - - - - - - + + + + + diff --git a/packaging/cfengine-nova/debian/cfengine-nova.install b/packaging/cfengine-nova/debian/cfengine-nova.install index e26afa9d2..4c99bf514 100644 --- a/packaging/cfengine-nova/debian/cfengine-nova.install +++ b/packaging/cfengine-nova/debian/cfengine-nova.install @@ -23,7 +23,7 @@ /var/cfengine/lib/liblmdb.so /var/cfengine/lib/libleech2.so /var/cfengine/bin/lch -/var/cfengine/state/.leech2/config.json +/var/cfengine/.leech2/config.json /var/cfengine/share/doc /var/cfengine/modules /var/cfengine/inputs