Merge branch '4.5.2' into merge-4.5.2-into-4.6.0

wazuh · Aug 24, 2023 · 984e17b · 984e17b
2 parents 46ba1c3 + faf5b41
commit 984e17b
Show file tree

Hide file tree

Showing 11 changed files with 42 additions and 56 deletions.
diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -292,13 +292,13 @@ rm -fr %{buildroot}
 %changelog
 * Fri Sep 08 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
-* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+* Thu Aug 31 2023 support <[email protected]> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
-* Tue Aug 01 2023 support <[email protected]> - 4.5.1
+* Thu Aug 24 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
-* Fri Jun 30 2023 support <[email protected]> - 4.5.0
+* Thu Aug 10 2023 support <[email protected]> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
-* Mon Jun 26 2023 support <[email protected]> - 4.4.5
+* Mon Jul 10 2023 support <[email protected]> - 4.4.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 * Tue Jun 13 2023 support <[email protected]> - 4.4.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html

diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -8,25 +8,25 @@ wazuh-agent (4.5.2-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 31 Aug 2023 00:00:00 +0000
 
 wazuh-agent (4.5.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Aug 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 24 Aug 2023 15:56:43 +0000
 
 wazuh-agent (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 30 Jun 2023 11:56:07 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 10 Aug 2023 15:56:43 +0000
 
 wazuh-agent (4.4.5-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Mon, 10 Jul 2023 15:56:43 +0000
 
 wazuh-agent (4.4.4-RELEASE) stable; urgency=low
 

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -8,25 +8,25 @@ wazuh-manager (4.5.2-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 31 Aug 2023 00:00:00 +0000
 
 wazuh-manager (4.5.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Aug 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 24 Aug 2023 15:56:43 +0000
 
 wazuh-manager (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 13:45:36 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 10 Aug 2023 13:45:36 +0000
 
 wazuh-manager (4.4.5-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Mon, 10 Jul 2023 15:56:43 +0000
 
 wazuh-manager (4.4.4-RELEASE) stable; urgency=low
 

diff --git a/ova/assets/steps.sh b/ova/assets/steps.sh
@@ -25,6 +25,10 @@ systemConfig() {
   systemctl daemon-reload
   systemctl enable updateIndexerHeap.service
 
+
+  # Change root password (root:wazuh)
+  sed -i "s/root:.*:/root:\$1\$pNjjEA7K\$USjdNwjfh7A\.vHCf8suK41::0:99999:7:::/g" /etc/shadow
+
   hostname ${HOSTNAME}
 
   # AWS instance has this enabled

diff --git a/ova/wazuh_ovf_template b/ova/wazuh_ovf_template
@@ -28,9 +28,9 @@
       <Info>A human-readable annotation</Info>
       <Annotation>Wazuh helps you to gain security visibility into your infrastructure by monitoring hosts at an operating system and application level. It provides the following capabilities: log analysis, file integrity monitoring, intrusions detection and policy and compliance monitoring.</Annotation>
     </AnnotationSection>
-    <OperatingSystemSection ovf:id="101" vmw:osType="centos64Guest">
+    <OperatingSystemSection ovf:id="101" vmw:osType="otherLinux64Guest">
       <Info>The kind of installed guest operating system</Info>
-      <Description>Linux -CentOS Linux release 7.7</Description>
+      <Description>Linux - Amazon Linux 2</Description>
     </OperatingSystemSection>
     <VirtualHardwareSection>
       <Info>Virtual hardware requirements</Info>

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -601,13 +601,13 @@ rm -fr %{buildroot}
 %changelog
 * Fri Sep 08 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
-* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+* Thu Aug 31 2023 support <[email protected]> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
-* Tue Aug 01 2023 support <[email protected]> - 4.5.1
+* Thu Aug 24 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
-* Fri Jun 30 2023 support <[email protected]> - 4.5.0
+* Thu Aug 10 2023 support <[email protected]> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
-* Mon Jun 26 2023 support <[email protected]> - 4.4.5
+* Mon Jul 10 2023 support <[email protected]> - 4.4.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 * Tue Jun 13 2023 support <[email protected]> - 4.4.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -824,13 +824,13 @@ rm -fr %{buildroot}
 %changelog
 * Fri Sep 08 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
-* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+* Thu Aug 31 2023 support <[email protected]> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
-* Tue Aug 01 2023 support <[email protected]> - 4.5.1
+* Thu Aug 24 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
-* Fri Jun 30 2023 support <[email protected]> - 4.5.0
+* Thu Aug 10 2023 support <[email protected]> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
-* Mon Jun 26 2023 support <[email protected]> - 4.4.5
+* Mon Jul 10 2023 support <[email protected]> - 4.4.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 * Tue Jun 13 2023 support <[email protected]> - 4.4.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -8,31 +8,25 @@ wazuh-dashboard (4.5.2-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 31 Aug 2023 00:00:00 +0000
 
 wazuh-dashboard (4.5.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Aug 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 24 Aug 2023 15:56:43 +0000
 
 wazuh-dashboard (4.5.0-RELEASE) unstable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 13:45:36 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 10 Aug 2023 13:45:36 +0000
 
 wazuh-dashboard (4.4.5-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 30 Jun 2023 12:31:50 +0000
-
-wazuh-dashboard (4.4.5-RELEASE) unstable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
-
- -- Wazuh, Inc <[email protected]>  Tue, 01 Aug 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Mon, 10 Jul 2023 13:45:36 +0000
 
 wazuh-dashboard (4.4.4-RELEASE) stable; urgency=low
 

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -401,13 +401,13 @@ rm -fr %{buildroot}
 %changelog
 * Fri Sep 08 2023 support <[email protected]> - %{version}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
-* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+* Thu Aug 31 2023 support <[email protected]> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
-* Tue Aug 01 2023 support <[email protected]> - 4.5.1
+* Thu Aug 24 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
-* Fri Jun 30 2023 support <[email protected]> - 4.5.0
+* Thu Aug 10 2023 support <[email protected]> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
-* Mon Jun 26 2023 support <[email protected]> - 4.4.5
+* Mon Jul 10 2023 support <[email protected]> - 4.4.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 * Tue Jun 13 2023 support <[email protected]> - 4.4.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -8,38 +8,26 @@ wazuh-indexer (4.5.2-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
 
- -- Wazuh, Inc <[email protected]>  Fri, 04 Aug 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 31 Aug 2023 00:00:00 +0000
 
 wazuh-indexer (4.5.1-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-1.html
 
- -- Wazuh, Inc <[email protected]>  Tue, 01 Aug 2023 15:56:43 +0000
-
-wazuh-indexer (4.5.0-RELEASE) unstable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
-
- -- Wazuh, Inc <[email protected]>  Fri, 30 Jun 2023 12:31:50 +0000
-
-wazuh-indexer (4.4.5-RELEASE) stable; urgency=low
-
-  * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
-
- -- Wazuh, Inc <[email protected]>  Tue, 01 Aug 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 24 Aug 2023 15:56:43 +0000
 
 wazuh-indexer (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
 
- -- Wazuh, Inc <[email protected]>  Wed, 19 Jul 2023 15:56:43 +0000
+ -- Wazuh, Inc <[email protected]>  Thu, 10 Aug 2023 15:56:43 +0000
 
 wazuh-indexer (4.4.5-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 
  -- Wazuh, Inc <[email protected]>  Mon, 10 Jul 2023 12:31:50 +0000
- 
+
 wazuh-indexer (4.4.4-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -1396,13 +1396,13 @@ rm -fr %{buildroot}
 %changelog
 * Fri Sep 08 2023 support <[email protected]> - %{version}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
-* Fri Aug 04 2023 support <[email protected]> - 4.5.2
+* Thu Aug 31 2023 support <[email protected]> - 4.5.2
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-2.html
-* Tue Aug 01 2023 support <[email protected]> - 4.5.1
+* Thu Aug 24 2023 support <[email protected]> - 4.5.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5.1.html
-* Fri Jun 30 2023 support <[email protected]> - 4.5.0
+* Thu Aug 10 2023 support <[email protected]> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-0.html
-* Mon Jun 26 2023 support <[email protected]> - 4.4.5
+* Mon Jul 10 2023 support <[email protected]> - 4.4.5
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-5.html
 * Tue Jun 13 2023 support <[email protected]> - 4.4.4
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-4-4.html