Merge 4.5 into master

.github/actions/test-install-components/install_component.sh

@@ -7,6 +7,11 @@ if [ -f /etc/os-release ]; then
         find /etc/yum.repos.d/ -type f -exec sed -i 's/mirrorlist/#mirrorlist/g' {} \;
         find /etc/yum.repos.d/ -type f -exec sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' {} \;
     fi
+
+    if [ "$ID" = "debian" ] && [ "$VERSION_ID" = "9" ]; then
+        echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list
+        echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list
+    fi
 fi
 
 if [ -f /etc/redhat-release ]; then

.github/workflows/offline-installation.yml

@@ -17,7 +17,7 @@ jobs:
 
       - uses: actions/checkout@v2
 
-      - name: Build wazuh-install script and use pre-release packages
+      - name: Build wazuh-install script and use staging packages
         working-directory: ./unattended_installer
         run: |
           bash builder.sh -i -d staging

CHANGELOG.md

@@ -9,6 +9,18 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.5.0
 
+## [v4.4.2]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.2
+
+## [v4.3.11]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.11
+
+## [v4.4.1]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.1
+
 ## [v4.4.0]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.4.0
@@ -36,6 +48,7 @@ All notable changes to this project will be documented in this file.
 ## [v4.3.5]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.5
+
 ## [v4.3.4]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.4
@@ -44,14 +57,14 @@ All notable changes to this project will be documented in this file.
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.3
 
-## [v4.2.7]
-
-- https://github.com/wazuh/wazuh-packages/releases/tag/v4.2.7
-
 ## [v4.3.2]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.2
 
+## [v4.2.7]
+
+- https://github.com/wazuh/wazuh-packages/releases/tag/v4.2.7
+
 ## [v4.3.1]
 
 - https://github.com/wazuh/wazuh-packages/releases/tag/v4.3.1

README.md

@@ -30,19 +30,21 @@ In this repository, you can find the necessary tools to build a Wazuh package fo
 
 The following table shows the references for the versions of each component.
 
-### Dashboard
+### Wazuh dashboard
 
 | Wazuh dashboard | Opensearch dashboards |
 |-----------------|-----------------------|
 | 4.3.x           | 1.2.0                 |
-| 4.4.x           | 2.4.1                 |
+| 4.4.0           | 2.4.1                 |
+| 4.4.1 - 4.4.2   | 2.6.0                 |
 
-### Indexer
+### Wazuh indexer
 
 | Wazuh indexer   | Opensearch            |
 |-----------------|-----------------------|
 | 4.3.x           | 1.2.4                 |
-| 4.4.x           | 2.4.1                 |
+| 4.4.0           | 2.4.1                 |
+| 4.4.1 - 4.4.2   | 2.6.0                 |
 
 ## Contribute
 

aix/SPECS/wazuh-agent-aix.spec

@@ -292,7 +292,13 @@ rm -fr %{buildroot}
 %changelog
 * Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/
-* Fri May 05 2023 support <info@wazuh.com> - 4.5.0
+* Sun May 30 2023 support <info@wazuh.com> - 4.5.0
+- More info: https://documentation.wazuh.com/current/release-notes/
+* Mon May 08 2023 support <info@wazuh.com> - 4.4.2
+- More info: https://documentation.wazuh.com/current/release-notes/
+* Mon Apr 24 2023 support <info@wazuh.com> - 4.3.11
+- More info: https://documentation.wazuh.com/current/release-notes/
+* Mon Apr 17 2023 support <info@wazuh.com> - 4.4.1
 - More info: https://documentation.wazuh.com/current/release-notes/
 * Wed Jan 18 2023 support <info@wazuh.com> - 4.4.0
 - More info: https://documentation.wazuh.com/current/release-notes/

debs/Debian/arm64/Dockerfile

@@ -3,8 +3,9 @@ FROM arm64v8/debian:stretch
 ENV DEBIAN_FRONTEND noninteractive
 
 # Installing necessary packages
-RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
+RUN echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian stretch main" >> /etc/apt/sources.list && \
     apt-get update && apt-get install -y --allow-change-held-packages apt apt-utils  \
     curl gcc g++ make sudo expect gnupg \
     perl-base perl wget libc-bin libc6 libc6-dev \

debs/Debian/armhf/Dockerfile

@@ -3,8 +3,9 @@ FROM arm32v7/debian:stretch
 ENV DEBIAN_FRONTEND noninteractive
 
 # Installing necessary packages
-RUN echo "deb http://deb.debian.org/debian stretch contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
+RUN echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian stretch main" >> /etc/apt/sources.list && \
     apt-get update && apt-get install -y --allow-change-held-packages apt-utils \
     curl gcc make wget sudo expect gnupg perl-base \
     perl libc-bin libc6 libc6-dev \

debs/Debian/ppc64le/Dockerfile

@@ -5,8 +5,9 @@ ENV DEBIAN_FRONTEND noninteractive
 RUN apt-get -v
 
 # Installing necessary packages
-RUN echo "deb http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
-    echo "deb-src http://deb.debian.org/debian stretch main contrib non-free" >> /etc/apt/sources.list && \
+RUN echo "deb http://archive.debian.org/debian stretch contrib main non-free" > /etc/apt/sources.list && \
+    echo "deb http://archive.debian.org/debian-security stretch/updates main" >> /etc/apt/sources.list && \
+    echo "deb-src http://archive.debian.org/debian stretch main" >> /etc/apt/sources.list && \
     apt-get update && apt-get install -y --allow-change-held-packages apt-utils && \
     apt-get install -y --allow-change-held-packages \
     curl gcc make sudo expect gnupg perl-base perl wget \

debs/SPECS/wazuh-agent/debian/changelog

@@ -8,7 +8,25 @@ wazuh-agent (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/
 
- -- Wazuh, Inc <info@wazuh.com>  Fri, 05 May 2023 11:56:07 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Sun, 30 May 2023 11:56:07 +0000
+
+wazuh-agent (4.4.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 08 May 2023 12:31:50 +0000
+
+wazuh-agent (4.3.11-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 24 Apr 2023 15:00:00 +0000
+
+wazuh-agent (4.4.1-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 17 Apr 2023 12:31:50 +0000
 
 wazuh-agent (4.4.0-RELEASE) stable; urgency=low
 

debs/SPECS/wazuh-agent/debian/postinst

@@ -19,6 +19,10 @@ case "$1" in
 
     OSMYSHELL="/sbin/nologin"
 
+    if [ -d /run/systemd/system ]; then
+        rm -f /etc/init.d/wazuh-agent
+    fi
+
     if [ ! -f ${OSMYSHELL} ]; then
         if [ -f "/bin/false" ]; then
             OSMYSHELL="/bin/false"

debs/SPECS/wazuh-agent/debian/rules

@@ -103,6 +103,8 @@ override_dh_install:
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9
+	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10
+	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/12/04
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/14/04
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/16/04
@@ -119,6 +121,8 @@ override_dh_install:
 	cp etc/templates/config/debian/7/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7
 	cp etc/templates/config/debian/8/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8
 	cp etc/templates/config/debian/9/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9
+	cp etc/templates/config/debian/10/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10
+	cp etc/templates/config/debian/11/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11
 
 	cp etc/templates/config/ubuntu/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu
 	cp etc/templates/config/ubuntu/12/04/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/ubuntu/12/04

debs/SPECS/wazuh-manager/debian/changelog

@@ -8,7 +8,25 @@ wazuh-manager (4.5.0-RELEASE) stable; urgency=low
 
   * More info: https://documentation.wazuh.com/current/release-notes/
 
- -- Wazuh, Inc <info@wazuh.com>  Fri, 05 May 2023 11:56:07 +0000
+ -- Wazuh, Inc <info@wazuh.com>  Sun, 30 May 2023 11:56:07 +0000
+
+wazuh-manager (4.4.2-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 08 May 2023 12:31:50 +0000
+
+wazuh-manager (4.3.11-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 24 Apr 2023 15:00:00 +0000
+
+wazuh-manager (4.4.1-RELEASE) stable; urgency=low
+
+  * More info: https://documentation.wazuh.com/current/release-notes/
+
+ -- Wazuh, Inc <info@wazuh.com>  Mon, 17 Apr 2023 12:31:50 +0000
 
 wazuh-manager (4.4.0-RELEASE) stable; urgency=low
 

debs/SPECS/wazuh-manager/debian/postinst

@@ -16,6 +16,10 @@ case "$1" in
     SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts"
     SCA_BASE_DIR="${SCRIPTS_DIR}/sca"
 
+    if [ -d /run/systemd/system ]; then
+        rm -f /etc/init.d/wazuh-manager
+    fi
+
     if [ ! -f ${OSMYSHELL} ]; then
         if [ -f "/bin/false" ]; then
             OSMYSHELL="/bin/false"

debs/SPECS/wazuh-manager/debian/rules

@@ -128,9 +128,12 @@ override_dh_install:
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/19
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21
+	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9
+	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10
+	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rhel/5
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rhel/6
 	mkdir -p ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/rhel/7
@@ -166,11 +169,14 @@ override_dh_install:
 	cp etc/templates/config/darwin/18/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/19
 	cp etc/templates/config/darwin/20/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/20
 	cp etc/templates/config/darwin/21/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/21
+	cp etc/templates/config/darwin/22/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/darwin/22
 
 	cp etc/templates/config/debian/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian
 	cp etc/templates/config/debian/7/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/7
 	cp etc/templates/config/debian/8/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/8
 	cp etc/templates/config/debian/9/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/9
+	cp etc/templates/config/debian/10/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/10
+	cp etc/templates/config/debian/11/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/debian/11
 
 	cp etc/templates/config/centos/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos
 	cp etc/templates/config/centos/5/sca.files ${TARGET_DIR}$(INSTALLATION_SCRIPTS_DIR)/sca/centos/5

macos/package_files/build.sh

@@ -60,7 +60,7 @@ function build() {
     find ${SOURCES_PATH}/src/init/ -name *.sh -type f -exec install -m 0640 {} ${INSTALLATION_SCRIPTS_DIR}/src/init \;
 
     mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/generic
-    mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21}
+    mkdir -p ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/{15,16,17,18,20,21,22}
 
     cp -r ${SOURCES_PATH}/ruleset/sca/darwin ${INSTALLATION_SCRIPTS_DIR}/sca
     cp -r ${SOURCES_PATH}/ruleset/sca/generic ${INSTALLATION_SCRIPTS_DIR}/sca
@@ -72,6 +72,7 @@ function build() {
     cp ${SOURCES_PATH}/etc/templates/config/darwin/19/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/19/
     cp ${SOURCES_PATH}/etc/templates/config/darwin/20/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/20/
     cp ${SOURCES_PATH}/etc/templates/config/darwin/21/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/21/
+    cp ${SOURCES_PATH}/etc/templates/config/darwin/22/sca.files ${INSTALLATION_SCRIPTS_DIR}/sca/darwin/22/
 
     cp ${SOURCES_PATH}/src/VERSION ${INSTALLATION_SCRIPTS_DIR}/src/
     cp ${SOURCES_PATH}/src/REVISION ${INSTALLATION_SCRIPTS_DIR}/src/

ova/provision.sh

@@ -42,5 +42,7 @@ bash ${RESOURCES_PATH}/${INSTALLER} ${INSTALL_ARGS}
 
 systemctl stop wazuh-dashboard filebeat wazuh-indexer wazuh-manager
 systemctl enable wazuh-manager
+rm -f /var/log/wazuh-indexer/*
+rm -f /var/log/filebeat/*
 
 clean

rpms/SPECS/wazuh-agent.spec

@@ -1,3 +1,10 @@
+%if %{_debugenabled} == yes
+  %global _enable_debug_package 0
+  %global debug_package %{nil}
+  %global __os_install_post %{nil}
+  %define __strip /bin/true
+%endif
+
 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.6.0
@@ -171,9 +178,6 @@ install -m 0640 src/init/*.sh ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/
 cp src/VERSION ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/agent_installation_scripts/src/
 cp src/REVISION ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/agent_installation_scripts/src/
 
-if [ %{_debugenabled} = "yes" ]; then
-  %{_rpmconfigdir}/find-debuginfo.sh
-fi
 exit 0
 
 %pre
@@ -595,16 +599,16 @@ rm -fr %{buildroot}
 %dir %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud
 %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/*
 
-%if %{_debugenabled} == "yes"
-/usr/lib/debug/%{_localstatedir}/*
-/usr/src/debug/%{name}-%{version}/*
-%endif
-
-
 %changelog
 * Mon Sep 04 2023 support <info@wazuh.com> - 4.6.0
 - More info: https://documentation.wazuh.com/current/release-notes/
-* Fri May 05 2023 support <info@wazuh.com> - 4.5.0
+* Sun May 30 2023 support <info@wazuh.com> - 4.5.0
+- More info: https://documentation.wazuh.com/current/release-notes/
+* Mon May 08 2023 support <info@wazuh.com> - 4.4.2
+- More info: https://documentation.wazuh.com/current/release-notes/
+* Mon Apr 24 2023 support <info@wazuh.com> - 4.3.11
+- More info: https://documentation.wazuh.com/current/release-notes/
+* Mon Apr 17 2023 support <info@wazuh.com> - 4.4.1
 - More info: https://documentation.wazuh.com/current/release-notes/
 * Wed Jan 18 2023 support <info@wazuh.com> - 4.4.0
 - More info: https://documentation.wazuh.com/current/release-notes/