Merge pull request #2741 from wazuh/merge-4.7.2-into-4.8.0

Merge 4.7.2 into 4.8.0
wazuh · Jan 5, 2024 · 085aeb3 · 085aeb3
2 parents e4b1e9b + c7d4df1
commit 085aeb3
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 11 deletions.
diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -292,7 +292,7 @@ rm -fr %{buildroot}
 %changelog
 * Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
+* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <info@wazuh.com> - 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
@@ -8,7 +8,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 <info@wazuh.com>  Sun, 17 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-agent (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -8,7 +8,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 <info@wazuh.com>  Sun, 17 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-manager (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -627,7 +627,7 @@ rm -fr %{buildroot}
 %changelog
 * Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
+* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <info@wazuh.com> - 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
@@ -855,7 +855,7 @@ rm -fr %{buildroot}
 %changelog
 * Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
+* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <info@wazuh.com> - 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
@@ -8,7 +8,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 <info@wazuh.com>  Sun, 17 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-dashboard (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -337,7 +337,7 @@ rm -fr %{buildroot}
 %changelog
 * Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
+* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <info@wazuh.com> - 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
@@ -8,7 +8,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 <info@wazuh.com>  Sun, 17 Dec 2023 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Tue, 09 Jan 2024 00:00:00 +0000
 
 wazuh-indexer (4.7.1-RELEASE) stable; urgency=low
 

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -688,7 +688,7 @@ rm -fr %{buildroot}
 %changelog
 * Wed Jan 31 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
-* Sun Dec 17 2023 support <info@wazuh.com> - 4.7.2
+* Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html
 * Wed Dec 13 2023 support <info@wazuh.com> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html

diff --git 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.8.0"
 
 function getHelp() {