Merge pull request #3029 from wazuh/merge-4.8.1-into-4.9.0

Merge 4.8.1 into 4.9.0
wazuh · Jul 9, 2024 · db69f72 · db69f72
2 parents 1a7c7cc + 5ffc2a4
commit db69f72
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 23 deletions.
diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -291,9 +291,9 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/*
 
 %changelog
-* Wed Jul 10 2024 support <[email protected]> - 4.9.0
+* Fri Aug 02 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+* Thu Jul 11 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jun 12 2024 support <[email protected]> - 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
@@ -2,13 +2,13 @@ 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 <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Fri, 02 Aug 2024 00:00:00 +0000
 
 wazuh-agent (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 11 Jul 2024 00:00:00 +0000
 
 wazuh-agent (4.8.0-RELEASE) stable; urgency=low
 

diff --git 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 <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Fri, 02 Aug 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
@@ -2,13 +2,13 @@ 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 <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Fri, 02 Aug 2024 00:00:00 +0000
 
 wazuh-manager (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 11 Jul 2024 00:00:00 +0000
 
 wazuh-manager (4.8.0-RELEASE) stable; urgency=low
 

diff --git 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 <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Fri, 02 Aug 2024 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -640,9 +640,9 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Wed Jul 10 2024 support <[email protected]> - 4.9.0
+* Fri Aug 02 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+* Thu Jul 11 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jun 12 2024 support <[email protected]> - 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
@@ -887,9 +887,9 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Wed Jul 10 2024 support <[email protected]> - 4.9.0
+* Fri Aug 02 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+* Thu Jul 11 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jun 12 2024 support <[email protected]> - 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
@@ -5,7 +5,7 @@ ARCH="i386"
 CLASSES="none"
 CATEGORY="system"
 VENDOR="Wazuh, Inc <[email protected]>"
-PSTAMP="10Jul2024"
+PSTAMP="02Aug2024"
 EMAIL="[email protected]"
 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
@@ -2,13 +2,13 @@ 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 <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Fri, 02 Aug 2024 00:00:00 +0000
 
 wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 11 Jul 2024 00:00:00 +0000
 
 wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low
 

diff --git 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 <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Fri, 02 Aug 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
@@ -346,9 +346,9 @@ rm -fr %{buildroot}
 %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml"
 
 %changelog
-* Wed Jul 10 2024 support <[email protected]> - 4.9.0
+* Fri Aug 02 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+* Thu Jul 11 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jun 12 2024 support <[email protected]> - 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
@@ -2,13 +2,13 @@ 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 <[email protected]>  Wed, 10 Jul 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Fri, 02 Aug 2024 00:00:00 +0000
 
 wazuh-indexer (4.8.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 26 Jun 2024 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 11 Jul 2024 00:00:00 +0000
 
 wazuh-indexer (4.8.0-RELEASE) stable; urgency=low
 

diff --git 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 <[email protected]> on Wed, 10 Jul 2024 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Fri, 02 Aug 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
@@ -681,9 +681,9 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Wed Jul 10 2024 support <[email protected]> - 4.9.0
+* Fri Aug 02 2024 support <[email protected]> - 4.9.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-9-0.html
-* Wed Jun 26 2024 support <[email protected]> - 4.8.1
+* Thu Jul 11 2024 support <[email protected]> - 4.8.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html
 * Wed Jun 12 2024 support <[email protected]> - 4.8.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html

diff --git a/unattended_installer/passwords_tool/passwordsMain.sh b/unattended_installer/passwords_tool/passwordsMain.sh
@@ -26,9 +26,11 @@ function getHelp() {
     echo -e ""
     echo -e "        -au,  --admin-user <adminUser>"
     echo -e "                Admin user for Wazuh API, Required to change Wazuh API passwords."
+    echo -e "                Requires -A|--api."
     echo -e ""
     echo -e "        -ap,  --admin-password <adminPassword>"
     echo -e "                Password for Wazuh API admin user, Required to change Wazuh API passwords."
+    echo -e "                Requires -A|--api."
     echo -e ""
     echo -e "        -u,  --user <user>"
     echo -e "                Indicates the name of the user whose password will be changed."
@@ -217,6 +219,10 @@ function main() {
             getHelp
         fi
 
+        if [ -n "${adminUser}" ] && [ -n "${adminPassword}" ] && [ -z "${api}" ]; then
+            getHelp
+        fi
+
         if [ -n "${nuser}" ]; then
             if [ -n "${adminUser}" ] && [ -n "${adminPassword}" ]; then
                 passwords_getApiToken