Merge pull request #2068 from wazuh/bump-4.6.0

Bump master to 4.6.0
wazuh · Feb 2, 2023 · e388902 · e388902
2 parents 85d7293 + 80d7281
commit e388902
Show file tree

Hide file tree

Showing 13 changed files with 37 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [v4.6.0]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0
+
 ## [v4.5.0]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.5.0
+4.6.0
diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec
@@ -1,6 +1,6 @@
 # Spec file for AIX systems
 Name:        wazuh-agent
-Version:     4.5.0
+Version:     4.6.0
 Release:     1
 License:     GPL
 URL:         https://www.wazuh.com/
@@ -290,6 +290,8 @@ rm -fr %{buildroot}
 %attr(750, root, wazuh) %{_localstatedir}/wodles/*
 
 %changelog
+* Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
+- More info: https://documentation.wazuh.com/current/release-notes/
 * Fri May 05 2023 support <info@wazuh.com> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/
 * Wed Jan 18 2023 support <info@wazuh.com> - 4.4.0

diff --git a/alpine/SPECS/wazuh-agent/APKBUILD b/alpine/SPECS/wazuh-agent/APKBUILD
@@ -59,6 +59,7 @@ package() {
   package_files_dir="${pkgdir}${directory_base}/packages_files"
   mkdir -p "${pkgdir}${directory_base}/packages_files/src/init"
   mkdir -p "${pkgdir}${directory_base}/packages_files/etc/templates/config/generic/localfile-logs"
+  mkdir -p "${pkgdir}${directory_base}/packages_files/etc/templates/config/alpine"
   cp -a /wazuh-wazuh*/gen_ossec.sh "${package_files_dir}"
   cp -a /wazuh-wazuh*/add_localfiles.sh "${package_files_dir}"
   cp -a /wazuh-wazuh*/src/init/dist-detect.sh "${package_files_dir}/src/init"
@@ -68,5 +69,6 @@ package() {
   cp -a /wazuh-wazuh*/src/VERSION "${package_files_dir}/src"
   cp -a /wazuh-wazuh*/src/REVISION "${package_files_dir}/src"
   cp -a /wazuh-wazuh*/etc/templates/config/generic/* "${package_files_dir}/etc/templates/config/generic"
+  cp -a /wazuh-wazuh*/etc/templates/config/alpine/* "${package_files_dir}/etc/templates/config/alpine"
 }
 
diff --git a/alpine/SPECS/wazuh-agent/wazuh-agent.post-install b/alpine/SPECS/wazuh-agent/wazuh-agent.post-install
@@ -14,4 +14,6 @@ ${directory_base}/packages_files/gen_ossec.sh conf agent ${DIST_NAME} ${DIST_VER
 # Add default local_files to ossec.conf
 ${directory_base}/packages_files/add_localfiles.sh ${directory_base} >> ${directory_base}/etc/ossec.conf
 
+rm -rf ${directory_base}/packages_files
+
 exit 0
diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -1,3 +1,9 @@
+wazuh-agent (4.6.0-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 04 Sep 2023 11:56:07 +0000
+
 wazuh-agent (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -1,3 +1,9 @@
+wazuh-manager (4.6.0-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 04 Sep 2023 11:56:07 +0000
+
 wazuh-manager (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/

diff --git a/macos/specs/wazuh-agent.pkgproj b/macos/specs/wazuh-agent.pkgproj
@@ -812,7 +812,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>4.5.0-1</string>
+				<string>4.6.0-1</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
@@ -1239,7 +1239,7 @@
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>wazuh-agent-4.5.0-1</string>
+			<string>wazuh-agent-4.6.0-1</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -1,6 +1,6 @@
 Summary:     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
 Name:        wazuh-agent
-Version:     4.5.0
+Version:     4.6.0
 Release:     %{_release}
 License:     GPL
 Group:       System Environment/Daemons
@@ -622,6 +622,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
+- More info: https://documentation.wazuh.com/current/release-notes/
 * Fri May 05 2023 support <info@wazuh.com> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/
 * Wed Jan 18 2023 support <info@wazuh.com> - 4.4.0

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -1,6 +1,6 @@
 Summary:     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
 Name:        wazuh-manager
-Version:     4.5.0
+Version:     4.6.0
 Release:     %{_release}
 License:     GPL
 Group:       System Environment/Daemons
@@ -843,6 +843,8 @@ rm -fr %{buildroot}
 
 
 %changelog
+* Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
+- More info: https://documentation.wazuh.com/current/release-notes/
 * Fri May 05 2023 support <info@wazuh.com> - 4.5.0
 - More info: https://documentation.wazuh.com/current/release-notes/
 * Wed Jan 18 2023 support <info@wazuh.com> - 4.4.0

diff --git a/tests/unattended/unit/suites/test-common.sh b/tests/unattended/unit/suites/test-common.sh
@@ -61,7 +61,7 @@ test-04-common_checkInstalled-all-installed-yum() {
 
     @mocktrue yum list installed
 
-    @mock grep wazuh-manager === @echo wazuh-manager.x86_64  4.5.0-1 @wazuh
+    @mock grep wazuh-manager === @echo wazuh-manager.x86_64  4.6.0-1 @wazuh
     @mkdir /var/ossec
 
     @mock grep wazuh-indexer === @echo wazuh-indexer.x86_64 1.13.2-1 @wazuh
@@ -105,7 +105,7 @@ test-04-common_checkInstalled-all-installed-yum() {
 }
 
 test-05-common_checkInstalled-all-installed-yum-assert() {
-    @echo "wazuh-manager.x86_64 4.5.0-1 @wazuh"
+    @echo "wazuh-manager.x86_64 4.6.0-1 @wazuh"
     @echo 1
 
     @echo "wazuh-indexer.x86_64 1.13.2-1 @wazuh"

diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh
@@ -6,7 +6,7 @@ source "${base_dir}"/bach.sh
 @setup-test {
     @ignore common_logger
     k_certs_path="/etc/wazuh-dashboard/certs/"
-    wazuh_version="4.5.0"
+    wazuh_version="4.6.0"
     elasticsearch_oss_version="7.10.2"
     wazuh_kibana_plugin_revision="1"
     repobaseurl="https://packages.wazuh.com/4.x"

diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh
@@ -7,8 +7,8 @@
 # Foundation.
 
 ## Package vars
-readonly wazuh_major="4.5"
-readonly wazuh_version="4.5.0"
+readonly wazuh_major="4.6"
+readonly wazuh_version="4.6.0"
 readonly filebeat_version="7.10.2"
 readonly wazuh_install_vesion="0.1"