From ce878c4f003b7931f6736dc249fa2b61a3702768 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Fri, 22 Dec 2023 10:28:07 +0100 Subject: [PATCH 1/3] Update release date for 4.7.2 --- 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 51c8f87245..8ba310dd13 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 Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 06be8fd365..90d49039ab 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-agent (4.7.1-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 6730c39e96..35a04448c8 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, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 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 609308ceb8..d5cbb3c422 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-manager (4.7.1-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 6730c39e96..35a04448c8 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, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 2024 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 1f676556b6..6f464ae967 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 Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index cb6fb97d24..9064a94672 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 Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index f973461a36..429d89fdc4 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 256242d968..0d4c3b6b72 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, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 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 544c58aa82..6c808e10c6 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 Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 691eba0ad9..77863584b8 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html - -- Wazuh, Inc Sun, 17 Dec 2023 00:00:00 +0000 + -- Wazuh, Inc Tue, 09 Jan 2024 00:00:00 +0000 wazuh-indexer (4.7.1-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 256242d968..0d4c3b6b72 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, 17 Dec 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 09 Jan 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 f609c6dfc4..6451397765 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Sun Dec 17 2023 support - 4.7.2 +* Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html * Wed Dec 13 2023 support - 4.7.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html From 19cafa22a1b33c06a29af333ced0960ff327284f Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 27 Dec 2023 14:55:29 -0300 Subject: [PATCH 2/3] The change was reverted to obtain the Wazuh version of the VERSION file --- unattended_installer/builder.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index dab949f633..061c77166d 100755 --- a/unattended_installer/builder.sh +++ b/unattended_installer/builder.sh @@ -16,8 +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" -readonly source_directory="$( cd $(dirname $0) ; pwd -P )" -source_branch=$(cat ${source_directory}/../VERSION) +source_branch="4.7.2" function getHelp() { From c7d4df12e7ed70d7a005215bc50cd1d1dd66e582 Mon Sep 17 00:00:00 2001 From: Matias Pereyra Date: Fri, 5 Jan 2024 04:31:03 +0000 Subject: [PATCH 3/3] Fix source branch version --- unattended_installer/builder.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/builder.sh b/unattended_installer/builder.sh index 59a0f99524..f20658d0e9 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.2" +source_branch="4.8.0" function getHelp() {