From e7f86fcc9be3c08852d80eed2f0d752a22f7196b Mon Sep 17 00:00:00 2001 From: Tostti Date: Mon, 29 Apr 2024 20:03:20 -0300 Subject: [PATCH 01/17] Set v7 theme as default --- stack/dashboard/base/builder.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/stack/dashboard/base/builder.sh b/stack/dashboard/base/builder.sh index 836406a955..993221fc77 100755 --- a/stack/dashboard/base/builder.sh +++ b/stack/dashboard/base/builder.sh @@ -110,6 +110,11 @@ cp ./etc/styles.js ./src/core/server/rendering/views/styles.js # Customize OpenSearch Dashboards with Wazuh # ----------------------------------------------------------------------------- +# Set v7 theme as default +sed -i "s|value: 'Next (preview)',|value: 'v7',|g" ./src/core/server/ui_settings/settings/theme.js +sed -i "s|defaultValue: 'v8'|defaultValue: 'v7'|g" ./src/core/server/ui_settings/ui_settings_config.js + + # Replace App Title sed -i "s|defaultValue: ''|defaultValue: \'Wazuh\'|g" ./src/core/server/opensearch_dashboards_config.js sed -i "90s|defaultValue: true|defaultValue: false|g" ./src/core/server/opensearch_dashboards_config.js From 59e10505d30cb0dd96fd058a033029e0837e4462 Mon Sep 17 00:00:00 2001 From: Marcel Kemp Date: Fri, 3 May 2024 10:19:35 +0200 Subject: [PATCH 02/17] build: update release date for 4.8.0 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 721f587f39..690e7e939a 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Thu May 09 2024 support - 4.8.0 +* Thu May 16 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 7bdb489f94..68961c6578 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 09 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 wazuh-agent (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index c39f0b3563..7308e780a2 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, 09 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 16 May 2024 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 78b207b4e4..c34c82161e 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 09 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 wazuh-manager (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 22a21fbd10..f158824354 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, 09 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 16 May 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 0931c44925..202a690c6e 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -610,7 +610,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu May 09 2024 support - 4.8.0 +* Thu May 16 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 288ee2cca9..6886328d66 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -855,7 +855,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu May 09 2024 support - 4.8.0 +* Thu May 16 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 6ddbd2bbe0..c20c0f3b5c 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="23Apr2024" +PSTAMP="16May2024" 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 570590a93f..a817887dae 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 09 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 02a1c4b598..f29d23d7fc 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, 09 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 16 May 2024 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 9fc7b352ae..7234d7d6c1 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -335,7 +335,7 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Thu May 09 2024 support - 4.8.0 +* Thu May 16 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index e8fc0b84fd..1ff7a96a96 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 09 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 wazuh-indexer (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 02a1c4b598..f29d23d7fc 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, 09 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 16 May 2024 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 23c4576ed8..72fd15f2e6 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -681,7 +681,7 @@ rm -fr %{buildroot} %changelog -* Thu May 09 2024 support - 4.8.0 +* Thu May 16 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html From a6f0d0adaf4907de27070f5645e09b296d18d2f3 Mon Sep 17 00:00:00 2001 From: Marcelo Ariel Hamra Date: Tue, 7 May 2024 17:20:35 -0300 Subject: [PATCH 03/17] Added chown and chmod to wazuhCheckUpdates and wazuhCore plugins. --- stack/dashboard/rpm/wazuh-dashboard.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index 7234d7d6c1..15c1fa3565 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -108,6 +108,17 @@ find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 755 -exec chmod 750 find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type d -exec chmod 750 {} \; find %{buildroot}%{INSTALL_DIR}/plugins/wazuh/ -type f -perm 744 -exec chmod 740 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -exec chown %{USER}:%{GROUP} {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 644 -exec chmod 640 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 755 -exec chmod 750 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type d -exec chmod 750 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCheckUpdates/ -type f -perm 744 -exec chmod 740 {} \; + +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -exec chown %{USER}:%{GROUP} {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 644 -exec chmod 640 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 755 -exec chmod 750 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type d -exec chmod 750 {} \; +find %{buildroot}%{INSTALL_DIR}/plugins/wazuhCore/ -type f -perm 744 -exec chmod 740 {} \; # ----------------------------------------------------------------------------- %pre From 4c9ece53388db7a57aee3a9832d59f3ea4337055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Thu, 9 May 2024 15:08:12 +0200 Subject: [PATCH 04/17] Added support for Ubuntu 24.04 in Installation assistant --- unattended_installer/install_functions/checks.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 5f2ccf20cb..81a40e4a4b 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -223,7 +223,8 @@ function check_dist() { if [ "${DIST_NAME}" == "ubuntu" ]; then if [ "${DIST_VER}" == "16" ] || [ "${DIST_VER}" == "18" ] || - [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ]; then + [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] || + [ "${DIST_VER}" == "24" ]; then if [ "${DIST_SUBVER}" != "04" ]; then notsupported=1 fi From bc86f34e6bd46769ea489293bfd92d03eaaca4c3 Mon Sep 17 00:00:00 2001 From: Nico Stefani Date: Fri, 15 Dec 2023 14:16:06 -0300 Subject: [PATCH 05/17] Add new Azure module files Signed-off-by: Nico Stefani --- solaris/solaris11/SPECS/template_agent.json | 74 ++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/solaris/solaris11/SPECS/template_agent.json b/solaris/solaris11/SPECS/template_agent.json index 818341a493..1ecf78d0fd 100644 --- a/solaris/solaris11/SPECS/template_agent.json +++ b/solaris/solaris11/SPECS/template_agent.json @@ -2047,7 +2047,79 @@ "type": "file", "user": "root" }, - "/var/ossec/wodles/azure/orm.py": { + "/var/ossec/wodles/azure/azure_utils.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/azure_services": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "drwxr-x---", + "type": "directory", + "user": "root" + }, + "/var/ossec/wodles/azure/azure_services/__init__.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/azure_services/analytics.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/azure_services/graph.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/azure_services/storage.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/db": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "drwxr-x---", + "type": "directory", + "user": "root" + }, + "/var/ossec/wodles/azure/db/__init__.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/db/orm.py": { + "class": "static", + "group": "wazuh", + "mode": "0750", + "prot": "-rwxr-x---", + "type": "file", + "user": "root" + }, + "/var/ossec/wodles/azure/db/utils.py": { "class": "static", "group": "wazuh", "mode": "0750", From 3c22a3c6bdb5441fde6035fbce0910abb34b71b8 Mon Sep 17 00:00:00 2001 From: Juan Cabrera Date: Wed, 15 May 2024 12:30:35 +0200 Subject: [PATCH 06/17] build: bump version to 4.7.5 --- CHANGELOG.md | 4 ++++ 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, 64 insertions(+), 26 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 157a5874a5..dca1f4bcc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.7.5] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.5 + ## [4.7.4] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4 diff --git a/VERSION b/VERSION index b48b2de9d9..70bc9a9f64 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.7.4 +4.7.5 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index fbc24b9318..4bd62a0b44 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.7.4 +Version: 4.7.5 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* Sun May 19 2024 support - 4.7.5 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html * Tue Feb 27 2024 support - 4.7.3 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 1145366608..9aa2131dc8 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-agent (4.7.5-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html + + -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + wazuh-agent (4.7.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 1554a147e0..768ac1e72d 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, 25 Apr 2024 00:00:00 +0000 + Wazuh, Inc on Sun, 19 May 2024 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 c695f20c18..34c48c62df 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-manager (4.7.5-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html + + -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + wazuh-manager (4.7.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 1554a147e0..768ac1e72d 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, 25 Apr 2024 00:00:00 +0000 + Wazuh, Inc on Sun, 19 May 2024 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 0b29ca22d3..016705ad75 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.7.4-1 + 4.7.5-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.7.4-1.arm64 + wazuh-agent-4.7.5-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 a7221c51da..0567508020 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.7.4-1 + 4.7.5-1 TYPE 0 @@ -1239,7 +1239,7 @@ NAME - wazuh-agent-4.7.4-1.intel64 + wazuh-agent-4.7.5-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 d69c300154..cf00a330f3 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.7.4 +Version: 4.7.5 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -599,6 +599,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Sun May 19 2024 support - 4.7.5 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html * Tue Feb 27 2024 support - 4.7.3 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 9ca55b2249..d093624f7d 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.7.4 +Version: 4.7.5 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -827,6 +827,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* Sun May 19 2024 support - 4.7.5 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html * Tue Feb 27 2024 support - 4.7.3 diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 085d099e3c..a4bff9e728 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.7.4" +VERSION="4.7.5" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="25Apr2024" +PSTAMP="19May2024" 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 11f37968d2..865f31c50f 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html + + -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index cd64712886..1f20b016a6 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, 25 Apr 2024 00:00:00 +0000 + Wazuh, Inc on Sun, 19 May 2024 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 ed9248279d..83cc5af3ec 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,6 +408,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* Sun May 19 2024 support - 4.7.5 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html * Tue Feb 27 2024 support - 4.7.3 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 3aeabc8e18..59fdb336ef 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-indexer (4.7.5-RELEASE) stable; urgency=low + + * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html + + -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + wazuh-indexer (4.7.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index cd64712886..1f20b016a6 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, 25 Apr 2024 00:00:00 +0000 + Wazuh, Inc on Sun, 19 May 2024 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 374fd7b0ea..6b71a713ad 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,6 +1444,8 @@ rm -fr %{buildroot} %changelog +* Sun May 19 2024 support - 4.7.5 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html * Tue Feb 27 2024 support - 4.7.3 diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh index d57ee022da..4ef49eb6fa 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.7.4-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.7.5-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.7.4-1 @wazuh" + @echo "wazuh-manager.x86_64 4.7.5-1 @wazuh" @echo 1 @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh" diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index 44efbc8737..58c44a1d25 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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 640941065d..c1cd8134c0 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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.7.4" + wazuh_version="4.7.5" 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 1020ab9394..e322767061 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.7" -readonly wazuh_version="4.7.4" +readonly wazuh_version="4.7.5" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" readonly source_branch="v${wazuh_version}" From 730494304af9774de727cf235cefae8ace0f35da Mon Sep 17 00:00:00 2001 From: Marcel Kemp Date: Wed, 15 May 2024 20:00:40 +0200 Subject: [PATCH 07/17] build: fix release date and modify source_branch --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- unattended_installer/builder.sh | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 4bd62a0b44..e535f4b0f6 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Sun May 19 2024 support - 4.7.5 +* Mon May 20 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 9aa2131dc8..e5736f9c67 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 wazuh-agent (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 768ac1e72d..fc238100ae 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 Sun, 19 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 20 May 2024 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 34c48c62df..319f15b5d7 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 wazuh-manager (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 768ac1e72d..fc238100ae 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 Sun, 19 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 20 May 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index cf00a330f3..e6f7364d78 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Sun May 19 2024 support - 4.7.5 +* Mon May 20 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index d093624f7d..f34afeea16 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -827,7 +827,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Sun May 19 2024 support - 4.7.5 +* Mon May 20 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index a4bff9e728..18604c03e3 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="19May2024" +PSTAMP="20May2024" 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 865f31c50f..9aa91a4242 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 1f20b016a6..b58d562f13 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 Sun, 19 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 20 May 2024 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 83cc5af3ec..9e05517313 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Sun May 19 2024 support - 4.7.5 +* Mon May 20 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 59fdb336ef..b96f879b93 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Sun, 19 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 wazuh-indexer (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 1f20b016a6..b58d562f13 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 Sun, 19 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 20 May 2024 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 6b71a713ad..22fd2e0c20 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Sun May 19 2024 support - 4.7.5 +* Mon May 20 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 8040526392..449763e806 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,7 +16,7 @@ readonly resources_certs="${base_path_builder}/cert_tool" readonly resources_passwords="${base_path_builder}/passwords_tool" readonly resources_common="${base_path_builder}/common_functions" readonly resources_download="${base_path_builder}/downloader" -source_branch="4.7.4" +source_branch="4.7.5" function getHelp() { From df23a5aaa7e8c3b20466cab8c79072e6029f8bfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Fri, 17 May 2024 11:53:36 +0200 Subject: [PATCH 08/17] Fixed check_log_errors pytest --- tests/unattended/install/test_unattended.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py index 80e9c4e3e5..de2916ad31 100644 --- a/tests/unattended/install/test_unattended.py +++ b/tests/unattended/install/test_unattended.py @@ -208,10 +208,17 @@ def test_check_wazuh_api_status(): @pytest.mark.wazuh def test_check_log_errors(): found_error = False + exceptions = [ + 'WARNING: Cluster error detected', + 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.', + "ERROR: Could not send message through the cluster after '10' attempts" + + ] + with open('/var/ossec/logs/ossec.log', 'r') as f: for line in f.readlines(): if 'ERROR' in line: - if 'ERROR: Cluster error detected' not in line and 'agent-upgrade: ERROR: (8123): There has been an error executing the request in the tasks manager.' not in line: + if not any(exception in line for exception in exceptions): found_error = True break assert found_error == False, line From d39b862b7558104b4f71780925050324c08fdeb7 Mon Sep 17 00:00:00 2001 From: GGP1 Date: Wed, 8 May 2024 13:08:01 -0300 Subject: [PATCH 09/17] Update API script file name --- rpms/SPECS/wazuh-manager.spec | 2 +- tests/unattended/install/test_unattended.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index b51a2cddbf..6a55064853 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -625,7 +625,7 @@ rm -fr %{buildroot} %dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/security %dir %attr(770, root, wazuh) %{_localstatedir}/api/configuration/ssl %dir %attr(750, root, wazuh) %{_localstatedir}/api/scripts -%attr(640, root, wazuh) %{_localstatedir}/api/scripts/wazuh-apid.py +%attr(640, root, wazuh) %{_localstatedir}/api/scripts/*.py %dir %attr(750, root, wazuh) %{_localstatedir}/backup %dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/db %dir %attr(750, wazuh, wazuh) %{_localstatedir}/backup/agents diff --git a/tests/unattended/install/test_unattended.py b/tests/unattended/install/test_unattended.py index 80e9c4e3e5..54094a8180 100644 --- a/tests/unattended/install/test_unattended.py +++ b/tests/unattended/install/test_unattended.py @@ -171,7 +171,7 @@ def test_check_wazuh_manager_modulesd(): @pytest.mark.wazuh def test_check_wazuh_manager_apid(): - assert check_call("ps -xa | grep wazuh-apid | grep -v grep", shell=True) != "" + assert check_call("ps -xa | grep wazuh_apid | grep -v grep", shell=True) != "" @pytest.mark.wazuh_cluster def test_check_wazuh_manager_clusterd(): From 50bb879f4fc136672e5b896d6245b9bb5e2a9865 Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Wed, 22 May 2024 15:58:52 +0000 Subject: [PATCH 10/17] Update dates for 4.7.5 --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index e535f4b0f6..52ec752c7b 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Mon May 20 2024 support - 4.7.5 +* Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index e5736f9c67..600a7339b3 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 wazuh-agent (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index fc238100ae..236ed35a9e 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 Mon, 20 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 27 May 2024 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 319f15b5d7..f9650320d1 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 wazuh-manager (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index fc238100ae..236ed35a9e 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 Mon, 20 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 27 May 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index e6f7364d78..91b8105105 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Mon May 20 2024 support - 4.7.5 +* Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index f34afeea16..b1a8c47bfa 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -827,7 +827,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Mon May 20 2024 support - 4.7.5 +* Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 18604c03e3..3a8468c9d2 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="20May2024" +PSTAMP="27May2024" 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 9aa91a4242..da7e99ebb2 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index b58d562f13..5a85c76d92 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 Mon, 20 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 27 May 2024 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 9e05517313..90d8b811fe 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Mon May 20 2024 support - 4.7.5 +* Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index b96f879b93..8e57db6146 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 20 May 2024 00:00:00 +0000 + -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 wazuh-indexer (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index b58d562f13..5a85c76d92 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 Mon, 20 May 2024 00:00:00 +0000 + Wazuh, Inc on Mon, 27 May 2024 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 22fd2e0c20..2643e27f24 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Mon May 20 2024 support - 4.7.5 +* Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html From a12b7ecfb53e6024eae67367ffd0f4ed0396969f Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Thu, 23 May 2024 13:26:47 +0200 Subject: [PATCH 11/17] build: update 4.8.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 163aea7d54..6e5bcf92d5 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Thu May 16 2024 support - 4.8.0 +* Thu May 30 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 142cf5bf5f..3ce561cd2c 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-agent (4.7.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 7308e780a2..eff2d8d7ed 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, 16 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 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 b105fd0312..a5dd6ffca0 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-manager (4.7.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index f158824354..926d3e8c16 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, 16 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index f3606bbdc2..d31405994a 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -610,7 +610,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu May 16 2024 support - 4.8.0 +* Thu May 30 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 6216c8b7a9..4148e25511 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -855,7 +855,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu May 16 2024 support - 4.8.0 +* Thu May 30 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 464f448494..2e2e5c87f2 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index f29d23d7fc..c9d987b1f4 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, 16 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 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 ba30227ee0..f2568c9445 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -346,7 +346,7 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Thu May 16 2024 support - 4.8.0 +* Thu May 30 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 90b73d732e..ce23dde5c1 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 16 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-indexer (4.7.5-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index f29d23d7fc..c9d987b1f4 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, 16 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 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 64a64f9a9f..7e2fe11d38 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -681,7 +681,7 @@ rm -fr %{buildroot} %changelog -* Thu May 16 2024 support - 4.8.0 +* Thu May 30 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html From 7e070d8d12a7a6203b86da18dfb9a9a393ac2c38 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Tue, 28 May 2024 07:32:10 -0300 Subject: [PATCH 12/17] Added support for Ubuntu 24 --- unattended_installer/install_functions/checks.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index edc35afb2f..c6384c9cc2 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -205,7 +205,8 @@ function check_dist() { fi if [ "${DIST_NAME}" == "ubuntu" ]; then if [ "${DIST_VER}" == "16" ] || [ "${DIST_VER}" == "18" ] || - [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ]; then + [ "${DIST_VER}" == "20" ] || [ "${DIST_VER}" == "22" ] || + [ "${DIST_VER}" == "24" ]; then if [ "${DIST_SUBVER}" != "04" ]; then notsupported=1 fi @@ -219,7 +220,7 @@ function check_dist() { fi common_logger -d "Detected distribution name: ${DIST_NAME}" common_logger -d "Detected distribution version: ${DIST_VER}" - + } function checks_health() { From 487cb5ba10e5f4d7b003ab16b14daacfa4e42984 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Correa=20Rodr=C3=ADguez?= Date: Wed, 29 May 2024 16:18:21 +0200 Subject: [PATCH 13/17] Added support for Rocky Linux 9.4 in Installation assistant --- unattended_installer/install_functions/checks.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh index 81a40e4a4b..29916fafca 100644 --- a/unattended_installer/install_functions/checks.sh +++ b/unattended_installer/install_functions/checks.sh @@ -200,7 +200,8 @@ function check_curlVersion() { function check_dist() { common_logger -d "Checking system distribution." dist_detect - if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] && [ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ]; then + if [ "${DIST_NAME}" != "centos" ] && [ "${DIST_NAME}" != "rhel" ] && + [ "${DIST_NAME}" != "amzn" ] && [ "${DIST_NAME}" != "ubuntu" ] && [ "${DIST_NAME}" != "rocky" ]; then notsupported=1 fi if [ "${DIST_NAME}" == "centos" ] && { [ "${DIST_VER}" -ne "7" ] && [ "${DIST_VER}" -ne "8" ]; }; then @@ -211,9 +212,9 @@ function check_dist() { fi if [ "${DIST_NAME}" == "amzn" ]; then - if [ "${DIST_VER}" != "2" ] && - [ "${DIST_VER}" != "2023" ] && - [ "${DIST_VER}" != "2018.03" ]; then + if [ "${DIST_VER}" != "2" ] && + [ "${DIST_VER}" != "2023" ] && + [ "${DIST_VER}" != "2018.03" ]; then notsupported=1 fi if [ "${DIST_VER}" -eq "2023" ]; then @@ -232,6 +233,13 @@ function check_dist() { notsupported=1 fi fi + + if [ "${DIST_NAME}" == "rocky" ]; then + if [ "${DIST_VER}" != "9" ] || [ "${DIST_SUBVER}" != "4" ]; then + notsupported=1 + fi + fi + if [ -n "${notsupported}" ] && [ -z "${ignore}" ]; then common_logger -e "The recommended systems are: Red Hat Enterprise Linux 7, 8, 9; CentOS 7, 8; Amazon Linux 2; Ubuntu 16.04, 18.04, 20.04, 22.04. The current system does not match this list. Use -i|--ignore-check to skip this check." exit 1 From afbc54bb4cdee6e226ae6fc8bce21af029fa09dd Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Wed, 29 May 2024 16:34:26 +0200 Subject: [PATCH 14/17] build: update 4.7.5 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 52ec752c7b..a85b14aea5 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Mon May 27 2024 support - 4.7.5 +* Thu May 30 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 600a7339b3..39242dd8f2 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-agent (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 236ed35a9e..eff2d8d7ed 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 Mon, 27 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 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 f9650320d1..2a638d2388 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-manager (4.7.4-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 236ed35a9e..eff2d8d7ed 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 Mon, 27 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 91b8105105..d0e289023a 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Mon May 27 2024 support - 4.7.5 +* Thu May 30 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index b1a8c47bfa..8af7655463 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -827,7 +827,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Mon May 27 2024 support - 4.7.5 +* Thu May 30 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index da7e99ebb2..2b965255cc 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-dashboard (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 5a85c76d92..c9d987b1f4 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 Mon, 27 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 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 90d8b811fe..9c7a64179c 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Mon May 27 2024 support - 4.7.5 +* Thu May 30 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 8e57db6146..fa95d1c6a6 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.5-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html - -- Wazuh, Inc Mon, 27 May 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 wazuh-indexer (4.7.4-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 5a85c76d92..c9d987b1f4 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 Mon, 27 May 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 30 May 2024 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 2643e27f24..becfc0eed5 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Mon May 27 2024 support - 4.7.5 +* Thu May 30 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html * Thu Apr 25 2024 support - 4.7.4 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html From 91afe0061e2e5f746953c9c1e78d515f270a62d8 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Fri, 31 May 2024 10:23:26 +0200 Subject: [PATCH 15/17] docu: update 4.8.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 6e5bcf92d5..f59f68a65f 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Thu May 30 2024 support - 4.8.0 +* Wed Jun 05 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 3ce561cd2c..7a91d01519 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 05 Jun 2024 00:00:00 +0000 wazuh-agent (4.7.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index eff2d8d7ed..d2007274d9 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, 30 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 05 Jun 2024 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 a5dd6ffca0..be6146e4e6 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 05 Jun 2024 00:00:00 +0000 wazuh-manager (4.7.5-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 926d3e8c16..508f61686b 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, 30 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 05 Jun 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index d31405994a..93e75729af 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -610,7 +610,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu May 30 2024 support - 4.8.0 +* Wed Jun 05 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 4148e25511..c908ca3fe8 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -855,7 +855,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Thu May 30 2024 support - 4.8.0 +* Wed Jun 05 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 2e2e5c87f2..92d7a07bbe 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 05 Jun 2024 00:00:00 +0000 wazuh-dashboard (4.7.5-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index c9d987b1f4..8f0ff1596f 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, 30 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 05 Jun 2024 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 f2568c9445..2a9cea6406 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -346,7 +346,7 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Thu May 30 2024 support - 4.8.0 +* Wed Jun 05 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index ce23dde5c1..13197b8962 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Thu, 30 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 05 Jun 2024 00:00:00 +0000 wazuh-indexer (4.7.5-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index c9d987b1f4..8f0ff1596f 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, 30 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 05 Jun 2024 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 7e2fe11d38..223067f30c 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -681,7 +681,7 @@ rm -fr %{buildroot} %changelog -* Thu May 30 2024 support - 4.8.0 +* Wed Jun 05 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Mon May 27 2024 support - 4.7.5 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-5.html From a4ac7386e814e9b18ecd6405ff671a83ab4bb3ba Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Fri, 31 May 2024 10:57:19 +0200 Subject: [PATCH 16/17] docu: update 4.9.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 4a5bf2952c..ff8f67cdbc 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -291,7 +291,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Tue May 14 2024 support - 4.9.0 +* Wed Jul 10 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html * Thu May 09 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 14b184342a..c5a6e51814 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.9.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html - -- Wazuh, Inc Tue, 14 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 10 Jul 2024 00:00:00 +0000 wazuh-agent (4.8.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 9d0f205188..1389198770 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 Tue, 14 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 10 Jul 2024 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 c32f3b14c6..8b21aa06a2 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.9.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html - -- Wazuh, Inc Tue, 14 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 10 Jul 2024 00:00:00 +0000 wazuh-manager (4.8.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 9803e7f213..1d1368719e 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 Tue, 14 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 10 Jul 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index cf67ef5e73..e5f50f85fa 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -640,7 +640,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue May 14 2024 support - 4.9.0 +* Wed Jul 10 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html * Thu May 09 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 6a55064853..c15b59ceb7 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -887,7 +887,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue May 14 2024 support - 4.9.0 +* Wed Jul 10 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html * Thu May 09 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 85049f2b11..0998312d61 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="14May2024" +PSTAMP="10Jul2024" 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 ed7216d48f..7bfd5adce3 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html - -- Wazuh, Inc Tue, 14 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 10 Jul 2024 00:00:00 +0000 wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 7fd0106f2e..548e5c65fa 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 Tue, 14 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 10 Jul 2024 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 668447f3b6..e50a350376 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -335,7 +335,7 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Tue May 14 2024 support - 4.9.0 +* Wed Jul 10 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html * Thu May 09 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 0a0b491f6e..fb65e13ed7 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.9.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html - -- Wazuh, Inc Tue, 14 May 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 10 Jul 2024 00:00:00 +0000 wazuh-indexer (4.8.2-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 7fd0106f2e..548e5c65fa 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 Tue, 14 May 2024 00:00:00 +0000 + Wazuh, Inc on Wed, 10 Jul 2024 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 ec8f5fede8..bde17936d6 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -681,7 +681,7 @@ rm -fr %{buildroot} %changelog -* Tue May 14 2024 support - 4.9.0 +* Wed Jul 10 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html * Thu May 09 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html From e31b0d2f9175e1eb8a68a1c94db26c6d8a767193 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Fri, 31 May 2024 11:26:50 +0200 Subject: [PATCH 17/17] build: update 5.0.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- solaris/solaris10/pkginfo | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index ec93d14fb6..f58ec1aebc 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -291,7 +291,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Tue Oct 01 2024 support - 5.0.0 +* Thu Dec 12 2024 support - 5.0.0 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html * Tue May 14 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 618d0c1e89..6fbe9d2c9a 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (5.0.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html - -- Wazuh, Inc Tue, 01 Oct 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 12 Dec 2024 00:00:00 +0000 wazuh-agent (4.9.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 2c7805cb1d..d463c9e7ce 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 Tue, 01 Oct 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 12 Dec 2024 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 0876707cab..f4bbc9eefd 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (5.0.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html - -- Wazuh, Inc Tue, 01 Oct 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 12 Dec 2024 00:00:00 +0000 wazuh-manager (4.9.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 943cc7e6ee..c9acacf2b6 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 Tue, 01 Oct 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 12 Dec 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 02b2303c0e..c8bfd1195d 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -640,7 +640,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Oct 01 2024 support - 5.0.0 +* Thu Dec 12 2024 support - 5.0.0 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html * Tue May 14 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index dc0110f7cc..f3d72a0330 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -887,7 +887,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Oct 01 2024 support - 5.0.0 +* Thu Dec 12 2024 support - 5.0.0 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html * Tue May 14 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 8a9ac9a624..45043738a7 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="01Oct2024" +PSTAMP="12Dec2024" 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 08751a3c77..50d6efeaf2 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (5.0.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html - -- Wazuh, Inc Tue, 01 Oct 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 12 Dec 2024 00:00:00 +0000 wazuh-dashboard (4.9.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index a730d8cefa..c9529d1432 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 Tue, 01 Oct 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 12 Dec 2024 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 49998740a2..5c7b967ccc 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -335,7 +335,7 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Tue Oct 01 2024 support - 5.0.0 +* Thu Dec 12 2024 support - 5.0.0 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html * Tue May 14 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index b28f52c6f9..cf477300b7 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (5.0.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html - -- Wazuh, Inc Tue, 01 Oct 2024 00:00:00 +0000 + -- Wazuh, Inc Thu, 12 Dec 2024 00:00:00 +0000 wazuh-indexer (4.9.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index a730d8cefa..c9529d1432 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 Tue, 01 Oct 2024 00:00:00 +0000 + Wazuh, Inc on Thu, 12 Dec 2024 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 348de8a31d..07afc71c02 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -681,7 +681,7 @@ rm -fr %{buildroot} %changelog -* Tue Oct 01 2024 support - 5.0.0 +* Thu Dec 12 2024 support - 5.0.0 - More info: https://documentation.wazuh.com/current/release-notes/release-5-0-0.html * Tue May 14 2024 support - 4.9.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html