Merge branch '4.8.0' into merge-4.8.0-into-master

wazuh · Oct 24, 2023 · 5880756 · 5880756
2 parents 1d825b5 + 9a03238
commit 5880756
Show file tree

Hide file tree

Showing 15 changed files with 68 additions and 22 deletions.
diff --git 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
@@ -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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,15 +19,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
@@ -296,10 +296,12 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Tue Nov 14 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
-* Sat Oct 28 2023 support <[email protected]> - 4.7.0
+* Wed Nov 08 2023 support <[email protected]> - 4.7.0
 - 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

diff --git 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'<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)
diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog
@@ -20,12 +20,18 @@ 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 <[email protected]>  Tue, 07 Nov 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 08 Nov 2023 00:00:00 +0000
 
 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

diff --git a/debs/SPECS/wazuh-manager/debian/changelog b/debs/SPECS/wazuh-manager/debian/changelog
@@ -20,12 +20,18 @@ 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 <[email protected]>  Tue, 07 Nov 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 08 Nov 2023 00:00:00 +0000
 
 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

diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec
@@ -628,10 +628,12 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Tue Nov 14 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
-* Tue Nov 07 2023 support <[email protected]> - 4.7.0
+* Wed Nov 08 2023 support <[email protected]> - 4.7.0
 - 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

diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec
@@ -851,10 +851,12 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Tue Nov 14 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
-* Tue Nov 07 2023 support <[email protected]> - 4.7.0
+* Wed Nov 08 2023 support <[email protected]> - 4.7.0
 - 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

diff --git a/stack/dashboard/deb/debian/changelog b/stack/dashboard/deb/debian/changelog
@@ -20,12 +20,16 @@ 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 <[email protected]>  Tue, 07 Nov 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 08 Nov 2023 00:00:00 +0000
 
 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

diff --git a/stack/dashboard/rpm/wazuh-dashboard.spec b/stack/dashboard/rpm/wazuh-dashboard.spec
@@ -414,10 +414,12 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Tue Nov 14 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
-* Tue Nov 07 2023 support <[email protected]> - 4.7.0
+* Wed Nov 08 2023 support <[email protected]> - 4.7.0
 - 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

diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog
@@ -20,12 +20,18 @@ 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 <[email protected]>  Tue, 07 Nov 2023 00:00:00 +0000
+ -- Wazuh, Inc <[email protected]>  Wed, 08 Nov 2023 00:00:00 +0000
 
 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

diff --git 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)

diff --git a/stack/indexer/rpm/wazuh-indexer.spec b/stack/indexer/rpm/wazuh-indexer.spec
@@ -1450,10 +1450,12 @@ rm -fr %{buildroot}
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html
 * Tue Nov 14 2023 support <[email protected]> - 4.7.1
 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-1.html
-* Tue Nov 07 2023 support <[email protected]> - 4.7.0
+* Wed Nov 08 2023 support <[email protected]> - 4.7.0
 - 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

diff --git 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"