Merge branch '4.8.0' into merge-4.8.0-into-4.9.0

wazuh · Apr 30, 2024 · 676573e · 676573e
2 parents 33561f8 + 75bff02
commit 676573e
Show file tree

Hide file tree

Showing 13 changed files with 59 additions and 53 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,10 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.8.0
 
+## [4.7.4]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.4
+
 ## [4.7.3]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.7.3

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -293,12 +293,10 @@ rm -fr %{buildroot}
 %changelog
 * Tue May 14 2024 support <info@wazuh.com> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Apr 17 2024 support <info@wazuh.com> - 4.8.2
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-* Wed Apr 03 2024 support <info@wazuh.com> - 4.8.1
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Wed Mar 20 2024 support <info@wazuh.com> - 4.8.0
+* Thu May 09 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu Apr 25 2024 support <info@wazuh.com> - 4.7.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <info@wazuh.com> - 4.7.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-3.html
 * Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -20,7 +20,13 @@ 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 <info@wazuh.com>  Wed, 20 Mar 2024 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 09 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
+
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 25 Apr 2024 00:00:00 +0000
 
 wazuh-agent (4.7.3-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -20,7 +20,13 @@ 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 <info@wazuh.com>  Wed, 20 Mar 2024 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 09 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
+
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 25 Apr 2024 00:00:00 +0000
 
 wazuh-manager (4.7.3-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright
@@ -6,22 +6,6 @@ It was downloaded from:
 
     https://www.wazuh.com
 
-Upstream Authors:
-
-    dcid@dcid.me
-    Jia-BingJB_Cheng@trendmicro.com
-    vichargrave@gmail.com
-    ossec@michaelstarks.com
-    ddpbsd@gmail.com
-    scott@atomicorp.com
-    brad.lhotsky@gmail.com
-    jeremy@jeremyrossy.com
-    santiago.bassett@gmail.com
-    pedro@wazuh.com
-    alberto.rodriguez@wazuh.com
-    braulio@wazuh.com
-    jose.fernandez@wazuh.com
-
 Copyright:
 
     GNU General Public License version 2.

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -642,12 +642,10 @@ rm -fr %{buildroot}
 %changelog
 * Tue May 14 2024 support <info@wazuh.com> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Apr 17 2024 support <info@wazuh.com> - 4.8.2
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-* Wed Apr 03 2024 support <info@wazuh.com> - 4.8.1
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Wed Mar 20 2024 support <info@wazuh.com> - 4.8.0
+* Thu May 09 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu Apr 25 2024 support <info@wazuh.com> - 4.7.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <info@wazuh.com> - 4.7.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-3.html
 * Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -889,12 +889,10 @@ rm -fr %{buildroot}
 %changelog
 * Tue May 14 2024 support <info@wazuh.com> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Apr 17 2024 support <info@wazuh.com> - 4.8.2
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-* Wed Apr 03 2024 support <info@wazuh.com> - 4.8.1
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Wed Mar 20 2024 support <info@wazuh.com> - 4.8.0
+* Thu May 09 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu Apr 25 2024 support <info@wazuh.com> - 4.7.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <info@wazuh.com> - 4.7.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-3.html
 * Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -20,7 +20,13 @@ 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 <info@wazuh.com>  Wed, 20 Mar 2024 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 09 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
+
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 25 Apr 2024 00:00:00 +0000
 
 wazuh-dashboard (4.7.3-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -337,12 +337,10 @@ rm -fr %{buildroot}
 %changelog
 * Tue May 14 2024 support <info@wazuh.com> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Apr 17 2024 support <info@wazuh.com> - 4.8.2
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-* Wed Apr 03 2024 support <info@wazuh.com> - 4.8.1
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Wed Mar 20 2024 support <info@wazuh.com> - 4.8.0
+* Thu May 09 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu Apr 25 2024 support <info@wazuh.com> - 4.7.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <info@wazuh.com> - 4.7.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-3.html
 * Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -20,7 +20,13 @@ 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 <info@wazuh.com>  Wed, 20 Mar 2024 00:00:00 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 09 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
+
+ -- Wazuh, Inc <info@wazuh.com>  Thu, 25 Apr 2024 00:00:00 +0000
 
 wazuh-indexer (4.7.3-RELEASE) stable; urgency=low
 

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -683,12 +683,10 @@ rm -fr %{buildroot}
 %changelog
 * Tue May 14 2024 support <info@wazuh.com> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Apr 17 2024 support <info@wazuh.com> - 4.8.2
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html
-* Wed Apr 03 2024 support <info@wazuh.com> - 4.8.1
-- More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
-* Wed Mar 20 2024 support <info@wazuh.com> - 4.8.0
+* Thu May 09 2024 support <info@wazuh.com> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
+* Thu Apr 25 2024 support <info@wazuh.com> - 4.7.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-7-4.html
 * Tue Feb 27 2024 support <info@wazuh.com> - 4.7.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-3.html
 * Tue Jan 09 2024 support <info@wazuh.com> - 4.7.2

diff --git a/unattended_installer/install_functions/checks.sh b/unattended_installer/install_functions/checks.sh
@@ -242,8 +242,6 @@ function check_dist() {
 
 function checks_health() {
 
-    common_logger "Verifying that your system meets the recommended minimum hardware requirements."
-
     checks_specifications
 
     common_logger -d "CPU cores detected: ${cores}"

diff --git a/unattended_installer/install_functions/installMain.sh b/unattended_installer/install_functions/installMain.sh
@@ -233,26 +233,32 @@ function main() {
     elif [ -n "${offline_install}" ]; then
         offline_checkDependencies
     fi
-    
+
     common_checkInstalled
     checks_arguments
     if [ -n "${uninstall}" ]; then
         installCommon_rollBack
         exit 0
     fi
 
-# -------------- Preliminary checks and Prerequisites --------------------------------
-
-    if [ -z "${configurations}" ] && [ -z "${AIO}" ] && [ -z "${download}" ]; then
-        checks_previousCertificate
-    fi
     checks_arch
     if [ -n "${ignore}" ]; then
         common_logger -w "Hardware and system checks ignored."
     else
+        common_logger "Verifying that your system meets the recommended minimum hardware requirements."
         checks_health
     fi
 
+# -------------- Preliminary checks and Prerequisites --------------------------------
+
+    if [ -z "${uninstall}" ]; then
+        installCommon_installCheckDependencies
+    fi
+
+    if [ -z "${configurations}" ] && [ -z "${AIO}" ] && [ -z "${download}" ]; then
+        checks_previousCertificate
+    fi
+
     if [ -n "${port_specified}" ]; then
         checks_available_port "${port_number}" "${wazuh_aio_ports[@]}"
         dashboard_changePort "${port_number}"