This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new 289a43f758f packaging: Uses rng-tools for entropy, not haveged for
cloudstack-management (#6775)
289a43f758f is described below
commit 289a43f758f641fc5c0397a46c3f7ac27a6ca766
Author: Marcus Sorensen <[email protected]>
AuthorDate: Fri Oct 14 05:21:17 2022 -0600
packaging: Uses rng-tools for entropy, not haveged for
cloudstack-management (#6775)
* EL8 uses rng-tools, not haveged, to gather entropy
* packaging: use rng-tools/rngd consistently across all distros
Signed-off-by: Rohit Yadav <[email protected]>
Co-authored-by: Rohit Yadav <[email protected]>
---
debian/control | 2 +-
packaging/centos7/cloud.spec | 4 ++--
packaging/centos8/cloud.spec | 4 ++--
packaging/suse15/cloud.spec | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/debian/control b/debian/control
index d5273d77e92..a61b0012355 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Description: A common package which contains files which are
shared by several C
Package: cloudstack-management
Architecture: all
-Depends: ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless
| java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (=
${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools,
mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2,
qemu-utils, haveged, python3-dnspython, lsb-release, init-system-helpers (>=
1.14~), python3-setuptools
+Depends: ${python3:Depends}, openjdk-11-jre-headless | java11-runtime-headless
| java11-runtime | openjdk-11-jre-headless | zulu-11, cloudstack-common (=
${source:Version}), net-tools, sudo, python3-mysql.connector, augeas-tools,
mysql-client | mariadb-client, adduser, bzip2, ipmitool, file, gawk, iproute2,
qemu-utils, rng-tools, python3-dnspython, lsb-release, init-system-helpers (>=
1.14~), python3-setuptools
Conflicts: cloud-server, cloud-client, cloud-client-ui
Description: CloudStack server library
The CloudStack management server
diff --git a/packaging/centos7/cloud.spec b/packaging/centos7/cloud.spec
index f642c3196fb..aabc46ad6b5 100644
--- a/packaging/centos7/cloud.spec
+++ b/packaging/centos7/cloud.spec
@@ -85,7 +85,7 @@ Requires: ipmitool
Requires: %{name}-common = %{_ver}
Requires: iptables-services
Requires: qemu-img
-Requires: haveged
+Requires: rng-tools
Requires: python3-pip
Requires: python3-setuptools
Group: System Environment/Libraries
@@ -444,7 +444,7 @@ pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-
pip3 install urllib3
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
-/usr/bin/systemctl enable --now haveged > /dev/null 2>&1 || true
+/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
diff --git a/packaging/centos8/cloud.spec b/packaging/centos8/cloud.spec
index 835d288a849..af3b9200990 100644
--- a/packaging/centos8/cloud.spec
+++ b/packaging/centos8/cloud.spec
@@ -80,7 +80,7 @@ Requires: ipmitool
Requires: %{name}-common = %{_ver}
Requires: iptables-services
Requires: qemu-img
-Requires: haveged
+Requires: rng-tools
Requires: python3-pip
Requires: python3-setuptools
Requires: libgcrypt > 1.8.3
@@ -435,7 +435,7 @@ fi
pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl
%{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
-/usr/bin/systemctl enable --now haveged > /dev/null 2>&1 || true
+/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
diff --git a/packaging/suse15/cloud.spec b/packaging/suse15/cloud.spec
index b8368aca19b..334ba6ff81d 100644
--- a/packaging/suse15/cloud.spec
+++ b/packaging/suse15/cloud.spec
@@ -80,7 +80,7 @@ Requires: mkisofs
Requires: ipmitool
Requires: %{name}-common = %{_ver}
Requires: qemu-tools
-Requires: haveged
+Requires: rng-tools
Requires: python3-pip
Requires: python3-setuptools
Requires: libgcrypt20
@@ -437,7 +437,7 @@ fi
pip3 install
%{_datadir}/%{name}-management/setup/wheel/six-1.15.0-py2.py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/setuptools-47.3.1-py3-none-any.whl
%{_datadir}/%{name}-management/setup/wheel/protobuf-3.12.2-cp36-cp36m-manylinux1_x86_64.whl
%{_datadir}/%{name}-management/setup/wheel/mysql_connector_python-8.0.20-cp36-cp36m-manylinux1_x86_64.whl
/usr/bin/systemctl enable cloudstack-management > /dev/null 2>&1 || true
-/usr/bin/systemctl enable --now haveged > /dev/null 2>&1 || true
+/usr/bin/systemctl enable --now rngd > /dev/null 2>&1 || true
grep -s -q "db.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.cloud.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
grep -s -q "db.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties" || sed -i -e
"\$adb.usage.driver=jdbc:mysql"
"%{_sysconfdir}/%{name}/management/db.properties"
