From 61280803b40e0e8c9080db8b61e6cca5d2649e60 Mon Sep 17 00:00:00 2001 From: Raul Del Pozo Moreno Date: Wed, 11 Oct 2023 20:27:40 +0200 Subject: [PATCH 01/11] Removed negation from the reference condition --- stack/indexer/rpm/build_package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stack/indexer/rpm/build_package.sh b/stack/indexer/rpm/build_package.sh index b9fcec92a7..41abeee729 100755 --- a/stack/indexer/rpm/build_package.sh +++ b/stack/indexer/rpm/build_package.sh @@ -51,7 +51,7 @@ build_rpm() { fi ../base/generate_base.sh -s ${outdir} -r ${revision} ${base_cmd} else - if ! [ "${reference}" ];then + if [ "${reference}" ];then version=$(curl -sL https://raw.githubusercontent.com/wazuh/wazuh-packages/${reference}/VERSION | cat) else version=$(cat ${current_path}/../../../VERSION) From 310bf063dc959df8f7f59a5d2a2719d91e91197a Mon Sep 17 00:00:00 2001 From: DFolchA Date: Fri, 13 Oct 2023 09:41:12 +0200 Subject: [PATCH 02/11] Update 4.7.0 release date --- aix/SPECS/wazuh-agent-aix.spec | 2 +- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/copyright | 2 +- rpms/SPECS/wazuh-agent.spec | 2 +- rpms/SPECS/wazuh-manager.spec | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 +- stack/indexer/deb/debian/changelog | 2 +- stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 81c65e08dd..f02abcf9e5 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,7 +290,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Sat Oct 28 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - 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 diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 51f2f286f0..c59f655b7e 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,7 +2,7 @@ wazuh-agent (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-agent (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 0950ba55a8..347633fd46 100644 --- 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 on Tue, 24 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 08 Nov 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 index 574976a0c4..a5ef3691cd 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,7 +2,7 @@ wazuh-manager (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-manager (4.6.0-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 0950ba55a8..347633fd46 100644 --- 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 on Tue, 24 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Wed, 08 Nov 2023 00:00:00 +0000 It was downloaded from: diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index 45f6b19087..aae3eab9e2 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -599,7 +599,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - 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 diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 4145737f05..2a1289fc81 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -822,7 +822,7 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - 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 diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index a97f1ea4a4..1207151fcf 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-dashboard (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-dashboard (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index feb59cc7da..6edb5d9d84 100644 --- 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 on Tue, 07 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/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec index f1736114e4..a192218e91 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -408,7 +408,7 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - 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 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 267484155d..e4aa662206 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,7 +2,7 @@ wazuh-indexer (4.7.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-7-0.html - -- Wazuh, Inc Tue, 07 Nov 2023 00:00:00 +0000 + -- Wazuh, Inc Wed, 08 Nov 2023 00:00:00 +0000 wazuh-indexer (4.6.0-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index be3e4b1203..d0501ba381 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 Tue, 24 Oct 2023 00:00:00 +0000 + Wazuh, Inc 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 44f55889a8..3f6f94223f 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1444,7 +1444,7 @@ rm -fr %{buildroot} %changelog -* Tue Nov 07 2023 support - 4.7.0 +* Wed Nov 08 2023 support - 4.7.0 - 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 From f21b2089c842385df1e5076e9bc9ebeeacabecc5 Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Tue, 17 Oct 2023 09:29:22 +0200 Subject: [PATCH 03/11] Bump version to 4.5.4 --- CHANGELOG.md | 3 + aix/SPECS/wazuh-agent-aix.spec | 4 +- bump_version.py | 188 ++++++++++++++++++ debs/SPECS/wazuh-agent/debian/changelog | 6 + debs/SPECS/wazuh-agent/debian/copyright | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 6 + debs/SPECS/wazuh-manager/debian/copyright | 2 +- macos/specs/wazuh-agent-arm64.pkgproj | 4 +- macos/specs/wazuh-agent-intel64.pkgproj | 4 +- rpms/SPECS/wazuh-agent.spec | 4 +- rpms/SPECS/wazuh-manager.spec | 4 +- solaris/solaris10/pkginfo | 4 +- stack/dashboard/deb/debian/changelog | 6 + stack/dashboard/deb/debian/copyright | 2 +- stack/dashboard/rpm/wazuh-dashboard.spec | 2 + stack/indexer/deb/debian/changelog | 6 + stack/indexer/deb/debian/copyright | 2 +- stack/indexer/rpm/wazuh-indexer.spec | 2 + tests/unattended/unit/suites/test-common.sh | 4 +- .../unattended/unit/suites/test-dashboard.sh | 10 +- tests/unattended/unit/suites/test-indexer.sh | 8 +- .../install_functions/installVariables.sh | 2 +- 22 files changed, 250 insertions(+), 25 deletions(-) create mode 100644 bump_version.py diff --git a/CHANGELOG.md b/CHANGELOG.md index e1d07ffc09..3f61247a7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log All notable changes to this project will be documented in this file. +## [4.5.4] + +- https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.4 ## [4.5.3] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.3 diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 9c3ef7b99a..4ed5813f8a 100644 --- 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.3 +Version: 4.5.4 Release: 1 License: GPL URL: https://www.wazuh.com/ @@ -290,6 +290,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog +* 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 new file mode 100644 index 0000000000..a6c4429041 --- /dev/null +++ b/bump_version.py @@ -0,0 +1,188 @@ +""" +This script is used to bump the version of the Wazuh packages repository. + Copyright (C) 2015-2020, Wazuh Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. +""" +import argparse +import datetime +import glob +import re +from packaging.version import Version + +FORMAT_STRING="%m-%d-%Y" + +arg_parser=argparse.ArgumentParser() +arg_parser.add_argument('-v', '--version', action='store', dest='version', + help='Version to bump to', required=True) +arg_parser.add_argument('-r', '--revision', action='store', dest='revision', + help='Revision to bump to. Default: 1', default=1) +arg_parser.add_argument('-d', '--date', action='store', dest='date', + help='Date to bump to. Format: m-d-Y. Default: today', + default=datetime.date.today().strftime(FORMAT_STRING)) +args=arg_parser.parse_args() + +date=datetime.datetime.strptime(args.date, FORMAT_STRING) +version=Version(args.version) + +## Find files to bump .spec, changelog, pkginfo, .pkgproj, test-*.sh, +## installVariables.sh, CHANGELOG.md +spec_files=glob.glob('**/*.spec', recursive=True) +changelog_files=glob.glob('**/changelog', recursive=True) +copyright_files=glob.glob('**/copyright', recursive=True) +pkginfo_files=glob.glob('**/pkginfo', recursive=True) +pkgproj_files=glob.glob('**/*.pkgproj', recursive=True) +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) + +## Bump version in .spec files +SPEC_FORMAT_STRING="%a %b %d %Y" +spec_date=date.strftime(SPEC_FORMAT_STRING) +for spec_file in spec_files: + with open(spec_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + spec_file) + filedata=file.read() + # Replace version and revision + REGEX=r'Version:\s*(\d+\.\d+\.\d+)' + filedata=re.sub(REGEX, f"Version: {version}", filedata) + REGEX=r'Revision:\s*(\d+)' + filedata=re.sub(REGEX, 'Revision: ' + str(args.revision), + filedata) + # Add new version to changelog + REGEX=r'%changelog' + changelog_string=(f"* {spec_date} support - {version}" + "\n- More info: https://documentation.wazuh.com/current/release-" + f"notes/release-{version.major}-{version.minor}-" + f"{version.micro}.html") + filedata=re.sub(REGEX, '%changelog\n' + changelog_string, filedata) + + with open(spec_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in deb changelog files +DEB_FORMAT_STRING="%a, %d %b %Y %H:%M:%S +0000" +deb_changelog_date=date.strftime(DEB_FORMAT_STRING) +for changelog_file in changelog_files: + with open(changelog_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + changelog_file) + 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; " + "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 -- " + f"Wazuh, Inc {deb_changelog_date}\n\n") + # Add new version to changelog + filedata=changelog_string + filedata + + with open(changelog_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in deb copyrigth files + +for copyrigth_file in copyright_files: + with open(copyrigth_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + copyrigth_file) + filedata=file.read() + # Replace version and revision + REGEX=(r'Wazuh, Inc on ' + r'(\w+),\s(\d+)\s(\w+)\s(\d+)\s(\d+):(\d+):(\d+)\s\+(\d+)') + filedata=re.sub(REGEX, + f"Wazuh, Inc on {deb_changelog_date}", + filedata) + + with open(copyrigth_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in pkginfo files + +PKGINFO_FORMAT_STRING="%d%b%Y" + +for pkginfo_file in pkginfo_files: + with open(pkginfo_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + pkginfo_file) + filedata=file.read() + # Replace version and revision + REGEX=r'VERSION=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'VERSION=\"{version}\"', filedata) + REGEX=r'PSTAMP=(.*)' + filedata=re.sub(REGEX, + f'PSTAMP=\"{date.strftime(PKGINFO_FORMAT_STRING)}\"', + filedata) + + with open(pkginfo_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in .pkgproj files + +for pkgproj_file in pkgproj_files: + with open(pkgproj_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + pkgproj_file) + filedata=file.read() + # Replace version and revision + REGEX=r'(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, f'{version}-{args.revision}', + filedata) + REGEX=r'wazuh-agent-(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, + f'wazuh-agent-{version}-{args.revision}', + filedata) + + with open(pkgproj_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in test-*.sh files + +for test_file in test_files: + with open(test_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + test_file) + filedata=file.read() + # Replace version and revision + REGEX=r'wazuh-manager.x86_64\s+(\d+\.\d+\.\d+)-(\d+)' + filedata=re.sub(REGEX, + f'wazuh-manager.x86_64 {version}-{args.revision}', + filedata) + REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata) + + with open(test_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in installVariables.sh files + +for install_variables_file in install_variables_files: + with open(install_variables_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + install_variables_file) + filedata=file.read() + # Replace version and revision + REGEX=r'wazuh_major=\"(\d+\.\d+)\"' + filedata=re.sub(REGEX, + f'wazuh_major=\"{version.major}.{version.minor}\"', + filedata) + REGEX=r'wazuh_version=\"(\d+\.\d+\.\d+)\"' + filedata=re.sub(REGEX, f'wazuh_version=\"{version}\"', filedata) + + with open(install_variables_file, 'w', encoding="utf-8") as file: + file.write(filedata) + +## Bump version in CHANGELOG.md files + +for changelog_md_file in changelog_md_files: + with open(changelog_md_file, 'r', encoding="utf-8") as file: + print('Bumping version in ' + changelog_md_file) + filedata=file.read() + # Add new version to changelog + 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}") + filedata=re.sub(REGEX, REGEX + '\n' + changelog_string, + filedata) + + with open(changelog_md_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 d8e327cdec..2c9c0a14bd 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,3 +1,9 @@ +wazuh-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 * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index cadd1b6e86..0950ba55a8 100644 --- 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 on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 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 index a2ccafcd64..276e07a498 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,3 +1,9 @@ +wazuh-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 * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index cadd1b6e86..0950ba55a8 100644 --- 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 on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 Oct 2023 00:00:00 +0000 It was downloaded from: diff --git a/macos/specs/wazuh-agent-arm64.pkgproj b/macos/specs/wazuh-agent-arm64.pkgproj index 592e7f8a0e..4656a75c23 100644 --- a/macos/specs/wazuh-agent-arm64.pkgproj +++ b/macos/specs/wazuh-agent-arm64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.3-1 + 4.5.4-1 TYPE 0 @@ -1240,7 +1240,7 @@ NAME - wazuh-agent-4.5.3-1.arm64 + wazuh-agent-4.5.4-1.arm64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/macos/specs/wazuh-agent-intel64.pkgproj b/macos/specs/wazuh-agent-intel64.pkgproj index 744eba8bf0..bebe498a7a 100644 --- a/macos/specs/wazuh-agent-intel64.pkgproj +++ b/macos/specs/wazuh-agent-intel64.pkgproj @@ -812,7 +812,7 @@ USE_HFS+_COMPRESSION VERSION - 4.5.3-1 + 4.5.4-1 TYPE 0 @@ -1203,7 +1203,7 @@ NAME - wazuh-agent-4.5.3-1.intel64 + wazuh-agent-4.5.4-1.intel64 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index f65045cfd9..b92c73dcf3 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -7,7 +7,7 @@ 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.3 +Version: 4.5.4 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -619,6 +619,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* 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 23c87fe7dd..6131fb8678 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -7,7 +7,7 @@ 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.3 +Version: 4.5.4 Release: %{_release} License: GPL Group: System Environment/Daemons @@ -841,6 +841,8 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog +* 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/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index f62eb32a62..d029eb57fa 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -1,11 +1,11 @@ NAME=Wazuh - Wazuh unifies historically separate functions into a single agent and platform architecture. Providing protection for public clouds, private clouds, and on-premise data centers. PKG="wazuh-agent" -VERSION="4.5.3" +VERSION="4.5.4" ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="10Oct2023" +PSTAMP="24Oct2023" 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 index 0b248b3fb5..916132d779 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-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 * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index 30e4027b5e..67d1ccb788 100644 --- 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 on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 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 index 60b9fe2637..fea7cf7d31 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -397,6 +397,8 @@ rm -fr %{buildroot} %attr(640, root, root) "/etc/systemd/system/wazuh-dashboard.service" %changelog +* 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 4cf4e96573..bfeff8872b 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,3 +1,9 @@ +wazuh-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 * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-3.html diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index 30e4027b5e..67d1ccb788 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 on Tue, 10 Oct 2023 00:00:00 +0000 + Wazuh, Inc on Tue, 24 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 index 8af518b3b4..20255bd7e5 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -1384,6 +1384,8 @@ rm -fr %{buildroot} %attr(640, %{USER}, %{GROUP}) %{INSTALL_DIR}/jdk/lib/security/blocked.certs %changelog +* 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-common.sh b/tests/unattended/unit/suites/test-common.sh index 2a46d5b570..da3be38135 100644 --- 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.3-1 @wazuh + @mock grep wazuh-manager === @echo wazuh-manager.x86_64 4.5.4-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.3-1 @wazuh" + @echo "wazuh-manager.x86_64 4.5.4-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 index ea847e88fa..66a4f58630 100644 --- 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.3" + wazuh_version="4.5.4" elasticsearch_oss_version="7.10.2" wazuh_kibana_plugin_revision="1" repobaseurl="https://packages.wazuh.com/4.x" @@ -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 diff --git a/tests/unattended/unit/suites/test-indexer.sh b/tests/unattended/unit/suites/test-indexer.sh index c706f17101..0fd4cf2980 100644 --- a/tests/unattended/unit/suites/test-indexer.sh +++ b/tests/unattended/unit/suites/test-indexer.sh @@ -49,7 +49,7 @@ test-03-indexer_install-yum() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" indexer_install } @@ -63,7 +63,7 @@ test-ASSERT-FAIL-04-indexer_install-yum-error() { load-indexer_install sys_type="yum" sep="-" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" @mockfalse yum install wazuh-indexer-1.13.2-1 -y indexer_install @@ -73,7 +73,7 @@ test-05-indexer_install-apt() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" indexer_install } @@ -87,7 +87,7 @@ test-ASSERT-FAIL-06-indexer_install-apt-error() { load-indexer_install sys_type="apt-get" sep="=" - wazuh_version="4.5.3" + wazuh_version="4.5.4" wazuh_revision="1" @mockfalse apt install wazuh-indexer=1.13.2-1 -y indexer_install diff --git a/unattended_installer/install_functions/installVariables.sh b/unattended_installer/install_functions/installVariables.sh index 1b00690921..db5c9164c7 100644 --- a/unattended_installer/install_functions/installVariables.sh +++ b/unattended_installer/install_functions/installVariables.sh @@ -8,7 +8,7 @@ ## Package vars readonly wazuh_major="4.5" -readonly wazuh_version="4.5.3" +readonly wazuh_version="4.5.4" readonly filebeat_version="7.10.2" readonly wazuh_install_vesion="0.1" From 17a31d23cfffa10885ebf8cf84098430d10ca5af Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 18 Oct 2023 10:14:04 +0200 Subject: [PATCH 04/11] Fix 4.5.4 changelog --- debs/SPECS/wazuh-agent/debian/changelog | 2 +- debs/SPECS/wazuh-manager/debian/changelog | 2 +- stack/dashboard/deb/debian/changelog | 2 +- stack/indexer/deb/debian/changelog | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 2c9c0a14bd..7ff2d6ae36 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-agent (4.5.4-RELEASE) stable; urgency=low +wazuh-agent (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 276e07a498..06c1396077 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-manager (4.5.4-RELEASE) stable; urgency=low +wazuh-manager (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog index 916132d779..bceab9e196 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low +wazuh-dashboard (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index bfeff8872b..f6df82ca9c 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -1,4 +1,4 @@ -wazuh-wazuh-indexer (4.5.4-RELEASE) stable; urgency=low +wazuh-indexer (4.5.4-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html From 9e140e59178612ca418c796b079033112bb72194 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Wed, 18 Oct 2023 10:35:07 +0200 Subject: [PATCH 05/11] Fix bump script for macos and deb --- bump_version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bump_version.py b/bump_version.py index a6c4429041..d936b1a764 100644 --- a/bump_version.py +++ b/bump_version.py @@ -72,7 +72,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 +128,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: From 63eba8f24afc8257cd2b44fbf762df886d9cb5b1 Mon Sep 17 00:00:00 2001 From: c-bordon Date: Wed, 18 Oct 2023 10:29:42 -0300 Subject: [PATCH 06/11] Fixed mkdir wazuh-install-files error --- unattended_installer/cert_tool/certFunctions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unattended_installer/cert_tool/certFunctions.sh b/unattended_installer/cert_tool/certFunctions.sh index a6cd1c6cd2..4d31c559ad 100644 --- a/unattended_installer/cert_tool/certFunctions.sh +++ b/unattended_installer/cert_tool/certFunctions.sh @@ -438,7 +438,7 @@ function cert_setpermisions() { function cert_convertCRLFtoLF() { if [[ ! -d "/tmp/wazuh-install-files" ]]; then - mkdir "/tmp/wazuh-install-files" "${debug}" + eval "mkdir /tmp/wazuh-install-files ${debug}" fi eval "chmod -R 755 /tmp/wazuh-install-files ${debug}" eval "tr -d '\015' < $1 > /tmp/wazuh-install-files/new_config.yml" From 71ac81b12b66f8918f8ba1f79c194ab0e9b8e650 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 19 Oct 2023 11:58:52 +0200 Subject: [PATCH 07/11] Update version file and add function to bump_version script --- VERSION | 2 +- bump_version.py | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 4e298cc965..0ed2bfe96e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.5.3 +4.5.4 diff --git a/bump_version.py b/bump_version.py index d936b1a764..c709a2b1da 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" @@ -186,3 +187,16 @@ 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) \ No newline at end of file From 0738ddeb7cd694c69e758d3b3d2e38374f0579d6 Mon Sep 17 00:00:00 2001 From: DFolchA Date: Thu, 19 Oct 2023 12:13:14 +0200 Subject: [PATCH 08/11] Add lines between changelog versions --- CHANGELOG.md | 2 ++ bump_version.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f61247a7c..3e648d8e19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,11 @@ All notable changes to this project will be documented in this file. ## [4.5.4] - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.4 + ## [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 diff --git a/bump_version.py b/bump_version.py index c709a2b1da..2dddb27176 100644 --- a/bump_version.py +++ b/bump_version.py @@ -181,7 +181,7 @@ 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) @@ -199,4 +199,4 @@ filedata=re.sub(REGEX, f'{version}', filedata) with open(VERSION_file, 'w', encoding="utf-8") as file: - file.write(filedata) \ No newline at end of file + file.write(filedata) From 3e08cf95bbf52e9b0a1ddff7d8c1f562b5bca677 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Turina?= Date: Fri, 20 Oct 2023 21:17:59 +0200 Subject: [PATCH 09/11] Update Debian copyright for 4.6.0 Co-authored-by: Juan Nicolas Asselle --- debs/SPECS/wazuh-agent/debian/changelog | 2 ++ debs/SPECS/wazuh-manager/debian/changelog | 1 + stack/indexer/deb/debian/changelog | 1 + 3 files changed, 4 insertions(+) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index 74bf3a4dc0..28c6765992 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,6 +2,8 @@ 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 diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index 21d1e0e770..e0225f8143 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,6 +2,7 @@ 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 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index d169fa3175..0960431ad1 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,6 +2,7 @@ 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 From 1aec31a240f20d6270110e729bae7b6129c95395 Mon Sep 17 00:00:00 2001 From: Tomas Turina Date: Mon, 23 Oct 2023 20:27:48 +0000 Subject: [PATCH 10/11] Fix debian changelog sintax --- debs/SPECS/wazuh-agent/debian/changelog | 4 ++-- debs/SPECS/wazuh-manager/debian/changelog | 3 ++- stack/indexer/deb/debian/changelog | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index c77088fb93..7e20a8c9f1 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -19,8 +19,8 @@ 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, 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 diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog index de014283ef..5e0d140505 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -19,7 +19,8 @@ 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, 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 diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index 17ac8b3c44..71b060a95b 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -20,7 +20,8 @@ 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, 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 From 55f5480a9d54bbb81d8d53e7cc97b703d375709f Mon Sep 17 00:00:00 2001 From: Vikman Fernandez-Castro Date: Tue, 24 Oct 2023 09:55:54 +0200 Subject: [PATCH 11/11] Fix master branch version reference at workflows Co-authored-by: DFolchA --- .github/workflows/build-deb-packages.yml | 2 +- .github/workflows/build-rpm-packages.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-deb-packages.yml b/.github/workflows/build-deb-packages.yml index 72b892111a..14f71a7c53 100644 --- a/.github/workflows/build-deb-packages.yml +++ b/.github/workflows/build-deb-packages.yml @@ -52,7 +52,7 @@ jobs: run: | MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION) if [ "${{ steps.changes.outputs.deb_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi - if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi echo "CONTAINER_NAME=deb_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV - name: Download docker image for package building diff --git a/.github/workflows/build-rpm-packages.yml b/.github/workflows/build-rpm-packages.yml index 8e180534a3..2b74397d13 100644 --- a/.github/workflows/build-rpm-packages.yml +++ b/.github/workflows/build-rpm-packages.yml @@ -53,7 +53,7 @@ jobs: run: | MAJOR=$(sed 's/\([0-9]*\.[0-9]*\)\.[0-9]*/\1/' $GITHUB_WORKSPACE/VERSION) if [ "${{ steps.changes.outputs.rpm_images }}" == "true" ]; then echo "TAG=${{ github.head_ref }}" >> $GITHUB_ENV; else echo "TAG=$MAJOR" >> $GITHUB_ENV ; fi - if [ $MAJOR == "4.8" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi + if [ $MAJOR == "4.9" ]; then echo "VERSION=master" >> $GITHUB_ENV ; else echo "VERSION=$(cat $GITHUB_WORKSPACE/VERSION)" >> $GITHUB_ENV; fi if [ "${{ matrix.ARCHITECTURE }}" == "x86_64" ]; then echo "CONTAINER_NAME=rpm_builder_x86" >> $GITHUB_ENV ; else echo "CONTAINER_NAME=rpm_builder_${{ matrix.ARCHITECTURE }}" >> $GITHUB_ENV ; fi - name: Download docker image for package building