Merging upstream version 1.42.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 118 insertions, 110 deletions

diff --git a/packaging/installer/dependencies/centos.sh b/packaging/installer/dependencies/centos.sh
index 845f1113a..7d7c6cb40 100755
--- a/packaging/installer/dependencies/centos.sh
+++ b/packaging/installer/dependencies/centos.sh
@@ -5,30 +5,31 @@
 set -e
 
 declare -a package_tree=(
-  gcc
-  gcc-c++
-  make
   autoconf
   autoconf-archive
   automake
+  cmake
+  curl
+  elfutils-libelf-devel
+  gcc
+  gcc-c++
+  git
+  gzip
+  json-c-devel
   libatomic
+  libmnl-devel
   libtool
-  pkgconfig
-  cmake
-  zlib-devel
   libuuid-devel
-  libmnl-devel
-  json-c-devel
-  libyaml-devel
   libuv-devel
+  libyaml-devel
   lz4-devel
+  make
   openssl-devel
+  pkgconfig
   python3
-  elfutils-libelf-devel
-  git
+  systemd-devel
   tar
-  curl
-  gzip
+  zlib-devel
 )
 
 os_version() {
diff --git a/packaging/installer/dependencies/clearlinux.sh b/packaging/installer/dependencies/clearlinux.sh
index f6f616d66..67d3ea24f 100755
--- a/packaging/installer/dependencies/clearlinux.sh
+++ b/packaging/installer/dependencies/clearlinux.sh
@@ -9,22 +9,23 @@ DONT_WAIT=0
 
 declare -a package_tree=(
   c-basic
-  make
-  sysadmin-basic
-  devpkg-zlib
-  devpkg-util-linux
-  devpkg-libmnl
+  curl
+  devpkg-elfutils
   devpkg-json-c
-  yaml-dev
+  devpkg-libmnl
   devpkg-libuv
   devpkg-lz4
   devpkg-openssl
-  devpkg-elfutils
-  git
+  devpkg-util-linux
+  devpkg-zlib
   findutils
-  curl
+  git
   gzip
+  make
   python3-basic
+  service-os-dev
+  sysadmin-basic
+  yaml-dev
 )
 
 usage() {
diff --git a/packaging/installer/dependencies/debian.sh b/packaging/installer/dependencies/debian.sh
index 8186940e5..09a5d6338 100755
--- a/packaging/installer/dependencies/debian.sh
+++ b/packaging/installer/dependencies/debian.sh
@@ -8,32 +8,33 @@ NON_INTERACTIVE=0
 DONT_WAIT=0
 
 package_tree="
-  git
-  gcc
-  g++
-  make
-  automake
-  cmake
   autoconf
   autoconf-archive
   autogen
-  libatomic1
-  libtool
-  pkg-config
-  tar
+  automake
+  cmake
   curl
+  g++
+  gcc
+  git
   gzip
-  zlib1g-dev
-  uuid-dev
-  libmnl-dev
+  libatomic1
+  libelf-dev
   libjson-c-dev
-  libuv1-dev
   liblz4-dev
+  libmnl-dev
   libssl-dev
-  libelf-dev
+  libsystemd-dev
+  libtool
+  libuv1-dev
   libyaml-dev
+  make
+  pkg-config
   python
   python3
+  tar
+  uuid-dev
+  zlib1g-dev
   "
 
 usage() {
diff --git a/packaging/installer/dependencies/fedora.sh b/packaging/installer/dependencies/fedora.sh
index 589122882..a457ef2e2 100755
--- a/packaging/installer/dependencies/fedora.sh
+++ b/packaging/installer/dependencies/fedora.sh
@@ -24,32 +24,33 @@ else
 fi
 
 declare -a package_tree=(
-  findutils
-  gcc
-  gcc-c++
-  make
   autoconf
   autoconf-archive
   autogen
   automake
+  cmake
+  curl
+  elfutils-libelf-devel
+  findutils
+  gcc
+  gcc-c++
+  git
+  gzip
+  json-c-devel
   libatomic
+  libmnl-devel
   libtool
-  cmake
-  zlib-devel
   libuuid-devel
-  libmnl-devel
-  json-c-devel
-  libyaml-devel
   libuv-devel
+  libyaml-devel
   lz4-devel
+  make
   openssl-devel
-  elfutils-libelf-devel
-  git
   pkgconfig
-  tar
-  curl
-  gzip
   python3
+  systemd-devel
+  tar
+  zlib-devel
   "${ulogd_pkg}"
 )
 
diff --git a/packaging/installer/dependencies/ol.sh b/packaging/installer/dependencies/ol.sh
index 2166bcc50..f0d8341f1 100755
--- a/packaging/installer/dependencies/ol.sh
+++ b/packaging/installer/dependencies/ol.sh
@@ -8,31 +8,32 @@ NON_INTERACTIVE=0
 DONT_WAIT=0
 
 declare -a package_tree=(
-  gcc
-  gcc-c++
-  make
   autoconf
   autoconf-archive
   autogen
   automake
+  cmake
+  curl
+  elfutils-libelf-devel
+  gcc
+  gcc-c++
+  git
+  gzip
+  json-c-devel
   libatomic
+  libmnl-devel
   libtool
-  pkgconfig
-  cmake
-  tar
-  zlib-devel
   libuuid-devel
-  libmnl-devel
-  json-c-devel
-  libyaml-devel
   libuv-devel
+  libyaml-devel
   lz4-devel
+  make
   openssl-devel
+  pkgconfig
   python3
-  elfutils-libelf-devel
-  git
-  curl
-  gzip
+  systemd-devel
+  tar
+  zlib-devel
 )
 
 prompt() {
diff --git a/packaging/installer/dependencies/opensuse.sh b/packaging/installer/dependencies/opensuse.sh
index 81291ef72..3f14d58be 100755
--- a/packaging/installer/dependencies/opensuse.sh
+++ b/packaging/installer/dependencies/opensuse.sh
@@ -10,31 +10,32 @@ NON_INTERACTIVE=0
 DONT_WAIT=0
 
 declare -a package_tree=(
-  gcc
-  gcc-c++
-  make
   autoconf
   autoconf-archive
   autogen
   automake
-  libatomic1
-  libtool
-  pkg-config
   cmake
-  zlib-devel
-  libuuid-devel
-  libmnl-devel
+  curl
+  gcc
+  gcc-c++
+  git
+  gzip
+  libatomic1
+  libelf-devel
   libjson-c-devel
-  libyaml-devel
-  libuv-devel
   liblz4-devel
+  libmnl-devel
   libopenssl-devel
-  libelf-devel
-  git
-  tar
-  curl
-  gzip
+  libtool
+  libuuid-devel
+  libuv-devel
+  libyaml-devel
+  make
+  pkg-config
   python3
+  systemd-devel
+  tar
+  zlib-devel
 )
 
 usage() {
diff --git a/packaging/installer/dependencies/rockylinux.sh b/packaging/installer/dependencies/rockylinux.sh
index 7ac98f5e2..f90b997bb 100755
--- a/packaging/installer/dependencies/rockylinux.sh
+++ b/packaging/installer/dependencies/rockylinux.sh
@@ -8,31 +8,32 @@ NON_INTERACTIVE=0
 DONT_WAIT=0
 
 declare -a package_tree=(
-  gcc
-  gcc-c++
-  make
   autoconf
   autoconf-archive
   autogen
   automake
+  cmake
+  curl
+  elfutils-libelf-devel
+  gcc
+  gcc-c++
+  git
+  gzip
+  json-c-devel
   libatomic
+  libmnl-devel
   libtool
-  pkgconfig
-  cmake
-  zlib-devel
   libuuid-devel
-  libmnl-devel
-  json-c-devel
-  libyaml-devel
   libuv-devel
+  libyaml-devel
   lz4-devel
+  make
   openssl-devel
+  pkgconfig
   python3
-  elfutils-libelf-devel
-  git
+  systemd-devel
   tar
-  curl
-  gzip
+  zlib-devel
 )
 
 prompt() {
diff --git a/packaging/installer/dependencies/ubuntu.sh b/packaging/installer/dependencies/ubuntu.sh
index e3d734c68..a5dc2eae5 100755
--- a/packaging/installer/dependencies/ubuntu.sh
+++ b/packaging/installer/dependencies/ubuntu.sh
@@ -8,31 +8,32 @@ NON_INTERACTIVE=0
 DONT_WAIT=0
 
 package_tree="
-  git
-  gcc
-  g++
-  make
-  automake
-  cmake
   autoconf
   autoconf-archive
   autogen
-  libatomic1
-  libtool
-  pkg-config
-  tar
+  automake
+  cmake
   curl
+  g++
+  gcc
+  git
   gzip
-  zlib1g-dev
-  uuid-dev
-  libmnl-dev
+  libatomic1
+  libelf-dev
   libjson-c-dev
-  libyaml-dev
-  libuv1-dev
   liblz4-dev
+  libmnl-dev
   libssl-dev
-  libelf-dev
+  libsystemd-dev
+  libtool
+  libuv1-dev
+  libyaml-dev
+  make
+  pkg-config
   python3
+  tar
+  uuid-dev
+  zlib1g-dev
   "
 usage() {
   cat << EOF