diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c287e6653..60045d86de 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index f02abcf9e5..f118c30fe2 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/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 - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/bump_version.py b/bump_version.py index a6c4429041..2dddb27176 100644 --- a/bump_version.py +++ b/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'(\d+\.\d+\.\d+)-(\d+)' filedata=re.sub(REGEX, f'{version}-{args.revision}', filedata) - REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' + REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' filedata=re.sub(REGEX, - f'wazuh-agent-{version}-{args.revision}', + f'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) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index c59f655b7e..4c5132e898 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/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 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 Tue, 24 Oct 2023 00:00:00 +0000 wazuh-agent (4.5.3-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index a5ef3691cd..f452433317 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/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 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 Tue, 24 Oct 2023 00:00:00 +0000 wazuh-manager (4.5.3-RELEASE) stable; urgency=low diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index aae3eab9e2..03ab0a239a 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/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 - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 2a1289fc81..917cedc0b5 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/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 - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 1207151fcf..ade74ea8f9 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/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 Tue, 24 Oct 2023 00:00:00 +0000 wazuh-dashboard (4.5.3-RELEASE) stable; urgency=low diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index a192218e91..fc4d5cf4ea 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/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 - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index e4aa662206..471b47b9bd 100644 --- a/stack/indexer/deb/debian/changelog +++ b/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 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 Tue, 24 Oct 2023 00:00:00 +0000 wazuh-indexer (4.5.3-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index d0501ba381..6edb5d9d84 100644 --- 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 Wed, 08 Nov 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 08 Nov 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 index 3f6f94223f..29663c527d 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/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 - 4.6.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-6-0.html +* Tue Oct 24 2023 support - 4.5.4 +- More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html * Tue Oct 10 2023 support - 4.5.3 - More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html * Thu Aug 31 2023 support - 4.5.2 diff --git a/tests/unattended/unit/suites/test-dashboard.sh b/tests/unattended/unit/suites/test-dashboard.sh index c32795c004..4b1e53200e 100644 --- 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.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