Merge pull request #3128 from wazuh/merge-4.9.1-into-4.10.0

Merge 4.9.1 into 4.10.0

SECURITY.md

@@ -11,19 +11,15 @@ This policy applies to all open source projects developed, maintained, or hosted
 ## Reporting Security Vulnerabilities
 If you believe you've discovered a potential security vulnerability in one of our open source projects, we strongly encourage you to report it to us responsibly.
 
-Please submit your findings as [security advisories](https://github.com/wazuh/wazuh-packages/security/advisories) under the "Security" tab in the relevant GitHub repository. Alternatively, you may send the details of your findings to [email protected].
+Please submit your findings as security advisories under the "Security" tab in the relevant GitHub repository. Alternatively, you may send the details of your findings to [[email protected]](mailto:[email protected]).
 
 ## Vulnerability Disclosure Policy
 Upon receiving a report of a potential vulnerability, our team will initiate an investigation. If the reported issue is confirmed as a vulnerability, we will take the following steps:
 
 1. Acknowledgment: We will acknowledge the receipt of your vulnerability report and begin our investigation.
-
 2. Validation: We will validate the issue and work on reproducing it in our environment.
-
 3. Remediation: We will work on a fix and thoroughly test it
-
 4. Release & Disclosure: After 90 days from the discovery of the vulnerability, or as soon as a fix is ready and thoroughly tested (whichever comes first), we will release a security update for the affected project. We will also publicly disclose the vulnerability by publishing a CVE (Common Vulnerabilities and Exposures) and acknowledging the discovering party.
-
 5. Exceptions: In order to preserve the security of the Wazuh community at large, we might extend the disclosure period to allow users to patch their deployments.
 
 This 90-day period allows for end-users to update their systems and minimizes the risk of widespread exploitation of the vulnerability.
@@ -46,4 +42,4 @@ We ask that all users and contributors respect this policy and the security of o
 ## Changes to this Security Policy
 This policy may be revised from time to time. Each version of the policy will be identified at the top of the page by its effective date.
 
-If you have any questions about this Security Policy, please contact us at [email protected]
+If you have any questions about this Security Policy, please contact us at [[email protected]](mailto:[email protected])

bump_version.py

@@ -22,6 +22,9 @@
                         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('-s', '--stage', action='store', dest='stage',
+                        help='Stage to bump to. Default: none',
+                        default='')
 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))
@@ -111,6 +114,24 @@ def bump_file_list(file_list, regex_replacement):
             file.write(filedata)
 
 
+def check_version_in_changelog_md():
+    for changelog_md_file in changelog_md_files:
+        with open(changelog_md_file, 'r', encoding="utf-8") as file:
+            filedata = file.read()
+            if re.search(rf'## \[{version}\]', filedata):
+                return True
+    return False
+
+
+def check_version_in_spec_files():
+    for spec_file in spec_files:
+        with open(spec_file, 'r', encoding="utf-8") as file:
+            filedata = file.read()
+            if re.search(rf'support <[email protected]> - {version}', filedata):
+                return True
+    return False
+
+
 ## Bump version in deb changelog files
 for changelog_file in changelog_files:
     with open(changelog_file, 'r', encoding="utf-8") as file:
@@ -130,10 +151,10 @@ def bump_file_list(file_list, regex_replacement):
         file.write(filedata)
 
 
-bump_file_list(spec_files,spec_files_dict)
+None if check_version_in_spec_files() else bump_file_list(spec_files,spec_files_dict)
 bump_file_list(copyright_files,copyright_files_dict)
 bump_file_list(pkginfo_files,pkginfo_files_dict)
 bump_file_list(pkgproj_files,pkgproj_files_dict)
 bump_file_list(test_files,test_files_dict)
-bump_file_list(changelog_md_files,changelog_md_files_dict)
+None if check_version_in_changelog_md() else bump_file_list(changelog_md_files,changelog_md_files_dict)
 bump_file_list(VERSION_files,VERSION_files_dict)