From ec6532cfade1abe9cffb46f4640001dc95754ee7 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Tue, 29 Aug 2023 12:37:39 +0200 Subject: [PATCH 1/2] Bump version to 4.5.3 --- CHANGELOG.md | 3 +++ VERSION | 2 +- aix/SPECS/wazuh-agent-aix.spec | 4 +++- debs/SPECS/wazuh-agent/debian/changelog | 6 ++++++ debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 ++++++ debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 ++-- macos/specs/wazuh-agent-intel64.pkgproj | 4 ++-- rpms/SPECS/wazuh-agent.spec | 4 +++- rpms/SPECS/wazuh-manager.spec | 4 +++- solaris/solaris10/pkginfo | 4 ++-- stack/dashboard/deb/debian/changelog | 6 ++++++ stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 ++ stack/indexer/deb/debian/changelog | 6 ++++++ stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 ++ tests/unattended/unit/suites/test-common.sh | 4 ++-- tests/unattended/unit/suites/test-dashboard.sh | 10 +++++----- tests/unattended/unit/suites/test-indexer.sh | 8 ++++---- .../install_functions/installVariables.sh | 2 +- 22 files changed, 63 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cd974888..e1d07ffc09 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.5.3] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3 ## [4.5.2] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2 diff --git a/VERSION b/VERSION index 6cedcff630..4e298cc965 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.2 +4.5.3 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 8343b00963..7f04ae94a0 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -1,6 +1,6 @@ # Spec file for AIX systems Name: wazuh-agent -Version: 4.5.2 +Version: 4.5.3 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 344fdbbd51..091aaa1c59 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-agent (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 6335634cd3..77cc28d2fe 100644 --- a/debs/SPECS/wazuh-agent/debian/copyright +++ b/debs/SPECS/wazuh-agent/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index d166ff9ed7..24a4976350 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-manager (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 6335634cd3..77cc28d2fe 100644 --- a/debs/SPECS/wazuh-manager/debian/copyright +++ b/debs/SPECS/wazuh-manager/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index e170f7622f..592e7f8a0e 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.2-1 + 4.5.3-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.5.2-1.arm64 + wazuh-agent-4.5.3-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index b089429c2f..744eba8bf0 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.1-1 + 4.5.3-1 TYPE 0 @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.5.2-1.intel64 + wazuh-agent-4.5.3-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 8d0cb4c034..5a5e002408 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ Summary: Wazuh helps you to gain security visibility into your infrastructure by monitoring hosts at an operating system and application level. It provides the following capabilities: log analysis, file integrity monitoring, intrusions detection and policy and compliance monitoring Name: wazuh-agent -Version: 4.5.2 +Version: 4.5.3 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -619,6 +619,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 05f3267ecd..f6f28b81c6 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ Summary: Wazuh helps you to gain security visibility into your infrastructure by monitoring hosts at an operating system and application level. It provides the following capabilities: log analysis, file integrity monitoring, intrusions detection and policy and compliance monitoring Name: wazuh-manager -Version: 4.5.2 +Version: 4.5.3 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -841,6 +841,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index cd5724079e..e13d825342 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.5.2" +VERSION="4.5.3" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="31Aug2023" +PSTAMP="28Sep2023" EMAIL="info@wazuh.com" ISTATES="S s 1 2 3" RSTATES="S s 1 2 3" diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 4ddfafea59..ddfa5a233d 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 754c66c793..f5cb42a7f0 100644 --- a/stack/dashboard/deb/debian/copyright +++ b/stack/dashboard/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 5ca99324f4..974e4ee876 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,6 +397,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 21890477c8..9cde7d337a 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.5.3-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html + + -- Wazuh, Inc Thu, 28 Sep 2023 00:00:00 +0000 + wazuh-indexer (4.5.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 754c66c793..f5cb42a7f0 100644 --- a/stack/indexer/deb/debian/copyright +++ b/stack/indexer/deb/debian/copyright @@ -1,6 +1,6 @@ This work was packaged for Debian by: - Wazuh, Inc on Thu, 31 Aug 2023 00:00:00 +0000 + Wazuh, Inc on Thu, 28 Sep 2023 00:00:00 +0000 It was downloaded from: diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec index 4375fd0a7a..88d18d1c31 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,6 +1384,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* Thu Sep 28 2023 support - 4.5.3 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html * Thu Aug 24 2023 support - 4.5.1 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index d19a50e134..2a46d5b570 100644 --- a/tests/unattended/unit/suites/test-common.sh +++ b/tests/unattended/unit/suites/test-common.sh @@ -61,7 +61,7 @@ test-04-common_checkInstalled-all-installed-yum() { @mocktrue yum list installed - @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.2-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.3-1 @wazuh @mkdir /var/ossec @mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh @@ -105,7 +105,7 @@ test-04-common_checkInstalled-all-installed-yum() { } test-05-common_checkInstalled-all-installed-yum-assert() { - @echo "wazuh-manager.x86_64 4.5.2-1 @wazuh" + @echo "wazuh-manager.x86_64 4.5.3-1 @wazuh" @echo 1 @echo "wazuh-indexer.x86_64 1.13.2-1 @wazuh" diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index 6738f1226a..ea847e88fa 100644 --- a/tests/unattended/unit/suites/test-dashboard.sh +++ b/tests/unattended/unit/suites/test-dashboard.sh @@ -6,7 +6,7 @@ source "${base_dir}"/bach.sh @setup-test { @ignore common_logger k_certs_path="/etc/wazuh-dashboard/certs/" - wazuh_version="4.5.2" + wazuh_version="4.5.3" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -55,7 +55,7 @@ test-03-dashboard_install-yum() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" dashboard_install } @@ -68,7 +68,7 @@ test-ASSERT-FAIL-04-dashboard_install-yum-error() { load-dashboard_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse yum install wazuh-dashboard-1.13.2-1 -y dashboard_install @@ -78,7 +78,7 @@ test-05-dashboard_install-apt() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" dashboard_install } @@ -91,7 +91,7 @@ test-ASSERT-FAIL-06-dashboard_install-apt-error() { load-dashboard_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse apt install wazuh-dashboard=1.13.2-1 -y dashboard_install diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index 27c2ab05f6..c706f17101 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.2" + wazuh_version="4.5.3" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 94667acf0e..357c775e17 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -8,7 +8,7 @@ ## Package vars readonly wazuh_major="4.5" -readonly wazuh_version="4.5.2" +readonly wazuh_version="4.5.3" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 43d889bcfb87c127d3d76c1e3ca9fed0378e2934 Mon Sep 17 00:00:00 2001 From: vcerenu Date: Thu, 31 Aug 2023 10:20:44 -0300 Subject: [PATCH 2/2] change GRUB options --- ova/assets/custom/grub/grub | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ova/assets/custom/grub/grub b/ova/assets/custom/grub/grub index 2eb9b7ade9..6cc85d8b52 100644 --- a/ova/assets/custom/grub/grub +++ b/ova/assets/custom/grub/grub @@ -1,9 +1,8 @@ - -GRUB_CMDLINE_LINUX="console=tty12" +GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 nvme_core.io_timeout=4294967295 rd.emergency=poweroff quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0 rd.shell=0 root=/dev/sda1" GRUB_DEFAULT=0 GRUB_TIMEOUT=0 GRUB_HIDDEN_TIMEOUT=2 GRUB_DISABLE_RECOVERY="true" GRUB_DISABLE_SUBMENU=y -GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 biosdevname=0 quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0" +GRUB_DISABLE_LINUX_UUID=true GRUB_BACKGROUND="/boot/grub2/wazuh.png" \ No newline at end of file