diff --git a/aix/SPECS/wazuh-agent-aix.spec b/aix/SPECS/wazuh-agent-aix.spec index 5b9dc5f6db..36d2246fad 100644 --- a/aix/SPECS/wazuh-agent-aix.spec +++ b/aix/SPECS/wazuh-agent-aix.spec @@ -290,11 +290,11 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/* %changelog -* Wed Mar 26 2024 support - 4.8.2 +* Tue Mar 26 2024 support - 4.8.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html -* Tue Feb 13 2024 support - 4.8.1 +* Wed Feb 28 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Wed Jan 31 2024 support - 4.8.0 +* Wed Feb 21 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/debs/SPECS/wazuh-agent/debian/changelog b/debs/SPECS/wazuh-agent/debian/changelog index be8dbd0a54..532ca0cfa0 100644 --- a/debs/SPECS/wazuh-agent/debian/changelog +++ b/debs/SPECS/wazuh-agent/debian/changelog @@ -2,19 +2,19 @@ wazuh-agent (4.8.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html - -- Wazuh, Inc Wed, 26 Mar 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 26 Mar 2024 00:00:00 +0000 wazuh-agent (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 28 Feb 2024 00:00:00 +0000 wazuh-agent (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 21 Feb 2024 00:00:00 +0000 wazuh-agent (4.7.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-agent/debian/copyright b/debs/SPECS/wazuh-agent/debian/copyright index 151e29c7e9..1c8da5d055 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 Thu, 04 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 26 Mar 2024 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 e841e65ff6..e6572bfd15 100644 --- a/debs/SPECS/wazuh-manager/debian/changelog +++ b/debs/SPECS/wazuh-manager/debian/changelog @@ -2,19 +2,19 @@ wazuh-manager (4.8.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html - -- Wazuh, Inc Wed, 26 Mar 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 26 Mar 2024 00:00:00 +0000 wazuh-manager (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 28 Feb 2024 00:00:00 +0000 wazuh-manager (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 21 Feb 2024 00:00:00 +0000 wazuh-manager (4.7.2-RELEASE) stable; urgency=low diff --git a/debs/SPECS/wazuh-manager/debian/control b/debs/SPECS/wazuh-manager/debian/control index bbdeb2a7c6..907ba3812b 100644 --- a/debs/SPECS/wazuh-manager/debian/control +++ b/debs/SPECS/wazuh-manager/debian/control @@ -8,7 +8,7 @@ Homepage: http://www.wazuh.com Package: wazuh-manager Architecture: any -Depends: ${shlibs:Depends}, libc6 (>= 2.7), lsb-release, debconf, adduser +Depends: ${shlibs:Depends}, libc6 (>= 2.7), lsb-release, debconf, adduser, xz-utils Suggests: expect Conflicts: ossec-hids-agent, wazuh-agent, ossec-hids, wazuh-api Replaces: wazuh-api diff --git a/debs/SPECS/wazuh-manager/debian/copyright b/debs/SPECS/wazuh-manager/debian/copyright index 151e29c7e9..1c8da5d055 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 Thu, 04 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 26 Mar 2024 00:00:00 +0000 It was downloaded from: diff --git a/debs/SPECS/wazuh-manager/debian/postinst b/debs/SPECS/wazuh-manager/debian/postinst index ece01e5b0f..fcb507b51a 100644 --- a/debs/SPECS/wazuh-manager/debian/postinst +++ b/debs/SPECS/wazuh-manager/debian/postinst @@ -15,6 +15,7 @@ case "$1" in OSMYSHELL="/sbin/nologin" SCRIPTS_DIR="${WAZUH_GLOBAL_TMP_DIR}/manager_installation_scripts" SCA_BASE_DIR="${SCRIPTS_DIR}/sca" + VD_FILENAME='vd_1.0.0_vd_4.8.0.tar.xz' if [ -d /run/systemd/system ]; then rm -f /etc/init.d/wazuh-manager @@ -71,6 +72,13 @@ case "$1" in chown ${USER}:${GROUP} ${DIR}/queue/db/global.db* fi + if [ -f "${DIR}/${VD_FILENAME}" ]; then + tar -xf ${DIR}/${VD_FILENAME} -C ${DIR} + chown ${USER}:${GROUP} ${DIR}/queue/vd + chown ${USER}:${GROUP} ${DIR}/queue/vd_updater + rm -rf ${DIR}/${VD_FILENAME} + fi + # Delete uncompatible DBs versions if [ ! -z $2 ]; then @@ -234,6 +242,11 @@ case "$1" in fi + # Ensure that the 'Indexer' is configured + CONFIG_INDEXER_TEMPLATE="${SCRIPTS_DIR}/etc/templates/config/generic/wodle-indexer.manager.template" + . ${SCRIPTS_DIR}/src/init/update-indexer.sh + updateIndexerTemplate "${DIR}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE + # Restoring file permissions ${SCRIPTS_DIR}/restore-permissions.sh > /dev/null 2>&1 || true diff --git a/debs/SPECS/wazuh-manager/debian/rules b/debs/SPECS/wazuh-manager/debian/rules index 76159941e8..8a83b9e4b3 100644 --- a/debs/SPECS/wazuh-manager/debian/rules +++ b/debs/SPECS/wazuh-manager/debian/rules @@ -64,6 +64,7 @@ override_dh_install: USER_GENERATE_AUTHD_CERT="y" \ USER_AUTO_START="n" \ USER_CREATE_SSL_CERT="n" \ + DOWNLOAD_CONTENT="yes" \ ./install.sh # Copying init.d script diff --git a/rpms/SPECS/wazuh-agent.spec b/rpms/SPECS/wazuh-agent.spec index bf09353dd7..79a4263448 100644 --- a/rpms/SPECS/wazuh-agent.spec +++ b/rpms/SPECS/wazuh-agent.spec @@ -625,11 +625,11 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Wed Mar 26 2024 support - 4.8.2 +* Tue Mar 26 2024 support - 4.8.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html -* Tue Feb 13 2024 support - 4.8.1 +* Wed Feb 28 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Wed Jan 31 2024 support - 4.8.0 +* Wed Feb 21 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/rpms/SPECS/wazuh-manager.spec b/rpms/SPECS/wazuh-manager.spec index 2b0d538b6c..35d567c1c3 100644 --- a/rpms/SPECS/wazuh-manager.spec +++ b/rpms/SPECS/wazuh-manager.spec @@ -22,7 +22,7 @@ Conflicts: ossec-hids ossec-hids-agent wazuh-agent wazuh-local Obsoletes: wazuh-api < 4.0.0 AutoReqProv: no -Requires: coreutils +Requires: coreutils xz BuildRequires: coreutils glibc-devel automake autoconf libtool policycoreutils-python curl perl ExclusiveOS: linux @@ -78,6 +78,7 @@ echo 'USER_CA_STORE="/path/to/my_cert.pem"' >> ./etc/preloaded-vars.conf echo 'USER_GENERATE_AUTHD_CERT="y"' >> ./etc/preloaded-vars.conf echo 'USER_AUTO_START="n"' >> ./etc/preloaded-vars.conf echo 'USER_CREATE_SSL_CERT="n"' >> ./etc/preloaded-vars.conf +echo 'DOWNLOAD_CONTENT="yes"' >> ./etc/preloaded-vars.conf ./install.sh # Create directories @@ -95,9 +96,6 @@ install -m 0644 src/init/templates/wazuh-manager.service ${RPM_BUILD_ROOT}/usr/l # Clean the preinstalled configuration assesment files rm -f ${RPM_BUILD_ROOT}%{_localstatedir}/ruleset/sca/* -# Install Vulnerability Detector files -install -m 0440 src/wazuh_modules/vulnerability_detector/*.json ${RPM_BUILD_ROOT}%{_localstatedir}/queue/vulnerabilities/dictionaries - # Add configuration scripts mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/ cp gen_ossec.sh ${RPM_BUILD_ROOT}%{_localstatedir}/packages_files/manager_installation_scripts/ @@ -289,6 +287,8 @@ fi %post echo "VERSION=\"$(%{_localstatedir}/bin/wazuh-control info -v)\"" > /etc/ossec-init.conf + +# Upgrade install code block if [ $1 = 2 ]; then if [ -d %{_localstatedir}/logs/ossec ]; then rm -rf %{_localstatedir}/logs/wazuh @@ -299,6 +299,19 @@ if [ $1 = 2 ]; then rm -rf %{_localstatedir}/queue/sockets cp -rp %{_localstatedir}/queue/ossec %{_localstatedir}/queue/sockets fi + + # Ensure that the 'Indexer' is configured + CONFIG_INDEXER_TEMPLATE="%{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/generic/wodle-indexer.manager.template" + . %{_localstatedir}/packages_files/manager_installation_scripts/src/init/update-indexer.sh + updateIndexerTemplate "%{_localstatedir}/etc/ossec.conf" $CONFIG_INDEXER_TEMPLATE +fi + +%define _vdfilename vd_1.0.0_vd_4.8.0.tar.xz +if [ -f "%{_localstatedir}/%{_vdfilename}" ]; then + tar -xf %{_localstatedir}/%{_vdfilename} -C %{_localstatedir} + chown wazuh:wazuh %{_localstatedir}/queue/vd + chown wazuh:wazuh %{_localstatedir}/queue/vd_updater + rm -rf %{_localstatedir}/%{_vdfilename} fi # Fresh install code block @@ -685,6 +698,11 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/lib/libstdc++.so.6 %attr(750, root, wazuh) %{_localstatedir}/lib/libgcc_s.so.1 %attr(750, root, wazuh) %{_localstatedir}/lib/libfimdb.so +%attr(750, root, wazuh) %{_localstatedir}/lib/libcontent_manager.so +%attr(750, root, wazuh) %{_localstatedir}/lib/libindexer_connector.so +%attr(750, root, wazuh) %{_localstatedir}/lib/librocksdb.so.8 +%attr(750, root, wazuh) %{_localstatedir}/lib/librouter.so +%attr(750, root, wazuh) %{_localstatedir}/lib/libvulnerability_scanner.so %{_localstatedir}/lib/libpython3.10.so.1.0 %dir %attr(770, wazuh, wazuh) %{_localstatedir}/logs %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/active-responses.log @@ -692,6 +710,7 @@ rm -fr %{buildroot} %attr(640, wazuh, wazuh) %ghost %{_localstatedir}/logs/integrations.log %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.log %attr(660, wazuh, wazuh) %ghost %{_localstatedir}/logs/ossec.json +%attr(0440, root, wazuh) %{_localstatedir}/queue/indexer/vd_states_template.json %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/api %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/archives %dir %attr(750, wazuh, wazuh) %{_localstatedir}/logs/alerts @@ -715,6 +734,7 @@ rm -fr %{buildroot} %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/centos/* %dir %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel %attr(750, root, root) %config(missingok) %{_localstatedir}/packages_files/manager_installation_scripts/etc/templates/config/rhel/* +%attr(750, wazuh, wazuh) %{_localstatedir}/%{_vdfilename} %dir %attr(750, root, wazuh) %{_localstatedir}/queue %attr(600, root, wazuh) %ghost %{_localstatedir}/queue/agents-timestamp %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/agentless @@ -731,11 +751,10 @@ rm -fr %{buildroot} %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/rids %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/tasks %dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/sockets -%dir %attr(660, root, wazuh) %{_localstatedir}/queue/vulnerabilities -%dir %attr(440, root, wazuh) %{_localstatedir}/queue/vulnerabilities/dictionaries +%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/vd +%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/indexer +%dir %attr(770, wazuh, wazuh) %{_localstatedir}/queue/router %dir %attr(750, wazuh, wazuh) %{_localstatedir}/queue/logcollector -%attr(0440, root, wazuh) %{_localstatedir}/queue/vulnerabilities/dictionaries/cpe_helper.json -%attr(0440, root, wazuh) %ghost %{_localstatedir}/queue/vulnerabilities/dictionaries/msu.json.gz %dir %attr(750, root, wazuh) %{_localstatedir}/ruleset %dir %attr(750, root, wazuh) %{_localstatedir}/ruleset/sca %dir %attr(750, root, wazuh) %{_localstatedir}/ruleset/decoders @@ -853,11 +872,11 @@ rm -fr %{buildroot} %attr(750, root, wazuh) %{_localstatedir}/wodles/gcloud/* %changelog -* Wed Mar 26 2024 support - 4.8.2 +* Tue Mar 26 2024 support - 4.8.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html -* Tue Feb 13 2024 support - 4.8.1 +* Wed Feb 28 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Wed Jan 31 2024 support - 4.8.0 +* Wed Feb 21 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/solaris/solaris10/pkginfo b/solaris/solaris10/pkginfo index 52490a7d2a..d8cfc5e417 100644 --- a/solaris/solaris10/pkginfo +++ b/solaris/solaris10/pkginfo @@ -5,7 +5,7 @@ ARCH="i386" CLASSES="none" CATEGORY="system" VENDOR="Wazuh, Inc " -PSTAMP="04Jan2024" +PSTAMP="26Mar2024" 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 597194b2e3..dca7e6579e 100644 --- a/stack/dashboard/deb/debian/changelog +++ b/stack/dashboard/deb/debian/changelog @@ -2,19 +2,19 @@ wazuh-dashboard (4.8.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html - -- Wazuh, Inc Wed, 26 Mar 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 26 Mar 2024 00:00:00 +0000 wazuh-dashboard (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 28 Feb 2024 00:00:00 +0000 wazuh-dashboard (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 21 Feb 2024 00:00:00 +0000 wazuh-dashboard (4.7.2-RELEASE) stable; urgency=low diff --git a/stack/dashboard/deb/debian/copyright b/stack/dashboard/deb/debian/copyright index b280340dea..2e96439dd3 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 Thu, 04 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 26 Mar 2024 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 df2d5c5f32..6525edf10a 100644 --- a/stack/dashboard/rpm/wazuh-dashboard.spec +++ b/stack/dashboard/rpm/wazuh-dashboard.spec @@ -335,11 +335,11 @@ rm -fr %{buildroot} %config(noreplace) %attr(640, %{USER}, %{GROUP}) "%{CONFIG_DIR}/opensearch_dashboards.yml" %changelog -* Wed Mar 26 2024 support - 4.8.2 +* Tue Mar 26 2024 support - 4.8.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html -* Tue Feb 13 2024 support - 4.8.1 +* Wed Feb 28 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Wed Jan 31 2024 support - 4.8.0 +* Wed Feb 21 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html diff --git a/stack/indexer/deb/debian/changelog b/stack/indexer/deb/debian/changelog index f43ae5f72f..60ace9c65a 100644 --- a/stack/indexer/deb/debian/changelog +++ b/stack/indexer/deb/debian/changelog @@ -2,19 +2,19 @@ wazuh-indexer (4.8.2-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html - -- Wazuh, Inc Wed, 26 Mar 2024 00:00:00 +0000 + -- Wazuh, Inc Tue, 26 Mar 2024 00:00:00 +0000 wazuh-indexer (4.8.1-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html - -- Wazuh, Inc Tue, 13 Feb 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 28 Feb 2024 00:00:00 +0000 wazuh-indexer (4.8.0-RELEASE) stable; urgency=low * More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html - -- Wazuh, Inc Wed, 31 Jan 2024 00:00:00 +0000 + -- Wazuh, Inc Wed, 21 Feb 2024 00:00:00 +0000 wazuh-indexer (4.7.2-RELEASE) stable; urgency=low diff --git a/stack/indexer/deb/debian/copyright b/stack/indexer/deb/debian/copyright index b280340dea..2e96439dd3 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 Thu, 04 Jan 2024 00:00:00 +0000 + Wazuh, Inc on Tue, 26 Mar 2024 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 dba323be1b..8f1f41459c 100755 --- a/stack/indexer/rpm/wazuh-indexer.spec +++ b/stack/indexer/rpm/wazuh-indexer.spec @@ -686,11 +686,11 @@ rm -fr %{buildroot} %changelog -* Wed Mar 26 2024 support - 4.8.2 +* Tue Mar 26 2024 support - 4.8.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-2.html -* Tue Feb 13 2024 support - 4.8.1 +* Wed Feb 28 2024 support - 4.8.1 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-1.html -* Wed Jan 31 2024 support - 4.8.0 +* Wed Feb 21 2024 support - 4.8.0 - More info: https://documentation.wazuh.com/current/release-notes/release-4-8-0.html * Tue Jan 09 2024 support - 4.7.2 - More info: https://documentation.wazuh.com/current/release-notes/release-4-7-2.html