Merge 4.6.0 into 4.7.0

CHANGELOG.md

@@ -8,15 +8,15 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.6.0
 
-## [4.5.3]
+## [v4.5.4]
 
-- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.4
 
-## [4.5.2]
+## [v4.5.3]
 
-- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3
 
-## [v4.5.1]
+## [v4.5.2]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.2
 

aix/SPECS/wazuh-agent-aix.spec

@@ -294,6 +294,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Tue Oct 24 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Tue Oct 24 2023 support <[email protected]> - 4.5.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 * Tue Oct 10 2023 support <[email protected]> - 4.5.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <[email protected]> - 4.5.2

bump_version.py

@@ -38,6 +38,7 @@
 test_files=glob.glob('**/test-*.sh', recursive=True)
 install_variables_files=glob.glob('**/installVariables.sh', recursive=True)
 changelog_md_files=glob.glob('**/CHANGELOG.md', recursive=True)
+VERSION_files=glob.glob('**/VERSION', recursive=True)
 
 ## Bump version in .spec files
 SPEC_FORMAT_STRING="%a %b %d %Y"
@@ -72,7 +73,7 @@
         filedata=file.read()
         install_type=re.search(r'(wazuh-(agent|manager|indexer|dashboard))',
                                filedata).group(1)
-        changelog_string=(f"wazuh-{install_type} ({version}-RELEASE) stable; "
+        changelog_string=(f"{install_type} ({version}-RELEASE) stable; "
             "urgency=low\n\n  * More info: https://documentation.wazuh.com/"
             f"current/release-notes/release-{version.major}-{version.minor}-"
             f"{version.micro}.html\n\n -- "
@@ -128,9 +129,9 @@
         REGEX=r'<string>(\d+\.\d+\.\d+)-(\d+)</string>'
         filedata=re.sub(REGEX, f'<string>{version}-{args.revision}</string>',
                           filedata)
-        REGEX=r'<string>wazuh-agent-(\d+\.\d+\.\d+)-(\d+)</string>'
+        REGEX=r'<string>wazuh-agent-(\d+\.\d+\.\d+)-(\d+)'
         filedata=re.sub(REGEX,
-                    f'<string>wazuh-agent-{version}-{args.revision}</string>',
+                    f'<string>wazuh-agent-{version}-{args.revision}',
                     filedata)
 
     with open(pkgproj_file, 'w', encoding="utf-8") as file:
@@ -180,9 +181,22 @@
         REGEX=(r'All notable changes to this project '
                r'will be documented in this file.')
         changelog_string=(f"## [{version}]\n\n- https://github.com/wazuh/"
-                          f"wazuh-packages/releases/tag/v{version}")
+                          f"wazuh-packages/releases/tag/v{version}\n")
         filedata=re.sub(REGEX, REGEX + '\n' + changelog_string,
                           filedata)
 
     with open(changelog_md_file, 'w', encoding="utf-8") as file:
         file.write(filedata)
+
+## Bump version in VERSION files
+
+for VERSION_file in VERSION_files:
+    with open(VERSION_file, 'r', encoding="utf-8") as file:
+        print('Bumping version in ' + VERSION_file)
+        filedata=file.read()
+        # Replace version and revision
+        REGEX=r'(\d+\.\d+\.\d+)'
+        filedata=re.sub(REGEX, f'{version}', filedata)
+
+    with open(VERSION_file, 'w', encoding="utf-8") as file:
+        file.write(filedata)

debs/SPECS/wazuh-agent/debian/changelog

@@ -8,6 +8,12 @@ wazuh-agent (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
+ -- Wazuh, Inc <[email protected]> Tue, 31 Oct 2023 00:00:00 +0000
+
+wazuh-agent (4.5.4-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
+
  -- Wazuh, Inc <[email protected]>  Tue, 24 Oct 2023 00:00:00 +0000
 
 wazuh-agent (4.5.3-RELEASE) stable; urgency=low

debs/SPECS/wazuh-manager/debian/changelog

@@ -8,6 +8,11 @@ wazuh-manager (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
+ -- Wazuh, Inc <[email protected]> Tue, 31 Oct 2023 00:00:00 +0000
+wazuh-manager (4.5.4-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
+
  -- Wazuh, Inc <[email protected]>  Tue, 24 Oct 2023 00:00:00 +0000
 
 wazuh-manager (4.5.3-RELEASE) stable; urgency=low

rpms/SPECS/wazuh-agent.spec

@@ -603,6 +603,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Tue Oct 24 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Tue Oct 24 2023 support <[email protected]> - 4.5.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 * Tue Oct 10 2023 support <[email protected]> - 4.5.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <[email protected]> - 4.5.2

rpms/SPECS/wazuh-manager.spec

@@ -826,6 +826,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Tue Oct 24 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Tue Oct 24 2023 support <[email protected]> - 4.5.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 * Tue Oct 10 2023 support <[email protected]> - 4.5.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <[email protected]> - 4.5.2

stack/dashboard/deb/debian/changelog

@@ -8,6 +8,10 @@ wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
+wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
+
  -- Wazuh, Inc <[email protected]>  Tue, 24 Oct 2023 00:00:00 +0000
 
 wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low

stack/dashboard/rpm/wazuh-dashboard.spec

@@ -412,6 +412,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Tue Oct 24 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Tue Oct 24 2023 support <[email protected]> - 4.5.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 * Tue Oct 10 2023 support <[email protected]> - 4.5.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <[email protected]> - 4.5.2

stack/indexer/deb/debian/changelog

@@ -8,6 +8,11 @@ wazuh-indexer (4.6.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
 
+ -- Wazuh, Inc <[email protected]> Tue, 31 Oct 2023 00:00:00 +0000
+wazuh-indexer (4.5.4-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
+
  -- Wazuh, Inc <[email protected]>  Tue, 24 Oct 2023 00:00:00 +0000
 
 wazuh-indexer (4.5.3-RELEASE) stable; urgency=low

stack/indexer/deb/debian/copyright

@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Wazuh, Inc <[email protected]>  Wed, 08 Nov 2023 00:00:00 +0000
+    Wazuh, Inc <[email protected]> on Wed, 08 Nov 2023 00:00:00 +0000
 
 It was downloaded from:
 

stack/indexer/rpm/wazuh-indexer.spec

@@ -1448,6 +1448,8 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html
 * Tue Oct 24 2023 support <[email protected]> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html
+* Tue Oct 24 2023 support <[email protected]> - 4.5.4
+- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html
 * Tue Oct 10 2023 support <[email protected]> - 4.5.3
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html
 * Thu Aug 31 2023 support <[email protected]> - 4.5.2

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.3"
+    wazuh_version="4.5.4"
     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.3"
+    wazuh_version="4.5.4"
     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.3"
+    wazuh_version="4.5.4"
     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.3"
+    wazuh_version="4.5.4"
     wazuh_revision="1"
     @mockfalse apt install wazuh-dashboard=1.13.2-1 -y
     dashboard_install