Merge branch '4.5.3' of https://github.com/wazuh/wazuh-packages into …

…4.6.0
wazuh · Sep 7, 2023 · dbb93f5 · dbb93f5
2 parents 82f9031 + 554521e
commit dbb93f5
Show file tree

Hide file tree

Showing 19 changed files with 68 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,18 @@
 # Change Log
 All notable changes to this project will be documented in this file.
-## [4.5.2]
-
-- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2
 
 ## [v4.6.0]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0
 
+## [4.5.3]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3
+
+## [4.5.2]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2
+
 ## [v4.5.1]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.1

diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -290,8 +290,10 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/*
 
 %changelog
-* Fri Sep 08 2023 support <info@wazuh.com> - 4.6.0
+* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -1,8 +1,14 @@
 wazuh-agent (4.6.0-RELEASE) stable; urgency=low
 
-  * More info: https://documentation.wazuh.com/current/release-notes/
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
- -- Wazuh, Inc <info@wazuh.com>  Fri, 08 Sep 2023 13:46:52 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 16 Oct 2023 00:00:00 +0000
+
+wazuh-agent (4.5.3-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
+
+ -- Wazuh, Inc <info@wazuh.com>  Wed, 06 Sep 2023 00:00:00 +0000
 
 wazuh-agent (4.5.2-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 <info@wazuh.com> on Fri, 08 Sep 2023 13:46:52 +0000
+    Wazuh, Inc <info@wazuh.com> on Mon, 16 Oct 2023 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -1,8 +1,14 @@
 wazuh-manager (4.6.0-RELEASE) stable; urgency=low
 
-  * More info: https://documentation.wazuh.com/current/release-notes/
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
- -- Wazuh, Inc <info@wazuh.com>  Fri, 08 Sep 2023 13:46:52 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 16 Oct 2023 00:00:00 +0000
+
+wazuh-manager (4.5.3-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
+
+ -- Wazuh, Inc <info@wazuh.com>  Wed, 06 Sep 2023 00:00:00 +0000
 
 wazuh-manager (4.5.2-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 <info@wazuh.com> on Fri, 08 Sep 2023 13:46:52 +0000
+    Wazuh, Inc <info@wazuh.com> on Mon, 16 Oct 2023 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj
@@ -812,7 +812,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>4.5.1-1</string>
+				<string>4.6.0-1</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>

diff --git a/ova/assets/custom/grub/grub b/ova/assets/custom/grub/grub
@@ -1,9 +1,8 @@
-
-GRUB_CMDLINE_LINUX="console=tty12"
+GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0 nvme_core.io_timeout=4294967295 rd.emergency=poweroff quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0 rd.shell=0 root=/dev/sda1"
 GRUB_DEFAULT=0
 GRUB_TIMEOUT=0
 GRUB_HIDDEN_TIMEOUT=2
 GRUB_DISABLE_RECOVERY="true"
 GRUB_DISABLE_SUBMENU=y
-GRUB_CMDLINE_LINUX_DEFAULT="net.ifnames=0 biosdevname=0 quiet splash rd.plymouth=0 plymouth.enable=0 loglevel=0 systemd.show_status=0 systemd.log_level=0 vt.cur_default=0"
+GRUB_DISABLE_LINUX_UUID=true
 GRUB_BACKGROUND="/boot/grub2/wazuh.png"
diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -599,8 +599,10 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Fri Sep 08 2023 support <info@wazuh.com> - 4.6.0
+* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -822,8 +822,10 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
 %changelog
-* Fri Sep 08 2023 support <info@wazuh.com> - 4.6.0
+* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1

diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo
@@ -5,7 +5,7 @@ ARCH="i386"
 CLASSES="none"
 CATEGORY="system"
 VENDOR="Wazuh, Inc <info@wazuh.com>"
-PSTAMP="08Sep2023"
+PSTAMP="16Oct2023"
 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
@@ -1,8 +1,14 @@
-wazuh-dashboard (VERSION-RELEASE) unstable; urgency=low
+wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
- -- Wazuh, Inc <info@wazuh.com>  Fri, 08 Sep 2023 13:46:52 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 16 Oct 2023 00:00:00 +0000
+
+wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
+
+ -- Wazuh, Inc <info@wazuh.com>  Wed, 06 Sep 2023 00:00:00 +0000
 
 wazuh-dashboard (4.5.2-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 <info@wazuh.com> on Fri, 08 Sep 2023 13:46:52 +0000
+    Wazuh, Inc <info@wazuh.com> on Mon, 16 Oct 2023 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -408,8 +408,10 @@ rm -fr %{buildroot}
 %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service"
 
 %changelog
-* Fri Sep 08 2023 support <info@wazuh.com> - %{version}
+* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -1,8 +1,14 @@
-wazuh-indexer (VERSION-RELEASE) unstable; urgency=low
+wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
- -- Wazuh, Inc <info@wazuh.com>  Fri, 08 Sep 2023 13:46:52 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 16 Oct 2023 00:00:00 +0000
+
+wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
+
+ -- Wazuh, Inc <info@wazuh.com>  Wed, 06 Sep 2023 00:00:00 +0000
 
 wazuh-indexer (4.5.2-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 <info@wazuh.com> on Fri, 08 Sep 2023 13:46:52 +0000
+    Wazuh, Inc <info@wazuh.com>  Mon, 16 Oct 2023 00:00:00 +0000
 
 It was downloaded from:
 

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -1444,8 +1444,10 @@ rm -fr %{buildroot}
 
 
 %changelog
-* Fri Sep 08 2023 support <info@wazuh.com> - %{version}
+* Mon Oct 16 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Wed Sep 06 2023 support <info@wazuh.com> - 4.5.3
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <info@wazuh.com> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 * Thu Aug 24 2023 support <info@wazuh.com> - 4.5.1

diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh
@@ -108,7 +108,7 @@ test-05-common_checkInstalled-all-installed-yum-assert() {
     @echo "wazuh-manager.x86_64 4.6.0-1 @wazuh"
     @echo 1
 
-    @echo "wazuh-indexer.x86_64 1.13.2-1 @wazuh"
+    @echo "wazuh-indexer.x86_64 4.6.0-1 @wazuh"
     @echo 1
 
     @echo "filebeat.x86_64 7.10.2-1 @wazuh"

diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh
@@ -55,7 +55,7 @@ test-03-dashboard_install-yum() {
     load-dashboard_install
     sys_type="yum"
     sep="-"
-    wazuh_version="4.5.2"
+    wazuh_version="4.5.3"
     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.5.2"
+    wazuh_version="4.5.3"
     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.5.2"
+    wazuh_version="4.5.3"
     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.5.2"
+    wazuh_version="4.5.3"
     wazuh_revision="1"
     @mockfalse apt install wazuh-dashboard=1.13.2-1 -y
     dashboard_install