From nobody Wed Jun 21 19:26:47 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmYQw04nPz4gP5H; Wed, 21 Jun 2023 19:26:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmYQv6t3Lz47BS; Wed, 21 Jun 2023 19:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687375607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HG7i2/4YtR292TwoM3UCosB/1+uutgmfLgQEvRLLiBs=; b=kKPlGf0aiYzkH4T681/rtUuCV/RNGm6Xsre7Ij8sR1qtJZOI3xC+6NXPbaRdwswYUjXKLy f86dcJV7P4MFRTUwOIw3ua5UoTPhVfGfF3OlSdv/raQHUsGlPG3K2EA82XP08ind95DzNE cjFBXcrxAO44yuzjFemRFo8sxuF+BAiZp2/fvzdK50Qvsjyh877Firoj/GOq+udEf/SSzg NVhYujT8r8OctXBLATnyOR4et5VdR1f58CoPHIgQgUOQcVQjpc5pON7xGpWO37IT/yEDIu Bs7YLBgCCYtMGiZdC0tLZwyaJKfncqToMRF2OpP/QqMXdYm+jsgxfzafq/ZMYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687375607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HG7i2/4YtR292TwoM3UCosB/1+uutgmfLgQEvRLLiBs=; b=bPIGtAMWVjSu2WsxHVtfs9QXY0dbqnkZUqaHUdUafU4jAm8or2wyqHHcqUwx1gpX4Ej7Ej 7cciMD0Gf+UgRO1RKi+QX+EYf5EWqOmRouNa9rGMSAx16GJJE9Yzp0mxU3AIayuq40HTTn HgB44ZVOMvD6tafNCvaufc9E3h6U15AzJqHSC8BxVMJwxiCkxcBdf7i9LtX5J33wbcFInE kGzQ/RzcTtC1v2seucwaNqX1YPZiydpbq4GYehwQ5r+qORnvxHeEBITnE97HoU6wz960e4 WUGbdD6fsjj5IjwJ7M7BsdwYktFgzR8U0AFg40xdemP4vJddAQk4aE99sC/oug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687375607; a=rsa-sha256; cv=none; b=Ap/vvGtfBvBm1apBrNucwPs7RQ2Iwd4FbzdCqH7bncqpHDwjtmWt2vmTUKLtVcAOooEIXi r1HoFZtdzmUw9tfq0K6QPeYJy0wIJ6igwwU6ph9Kcb6x33gxPoROXP1spgmmeN1c7xLMcT DHmrQpeqLURxH6BTOgBA+GXPAZ8DeBdoXjpSkQ1FzJLjYfXtH6o3VEUkEPP4xBRVcY45tz 02iaPYiVEW5fxNG7kWbr+O4ekXxJZHWVEwM75RtwUpbcRhtNglaH2sNk3EjKxKt4KkNKc8 /38hjWM+cKc/VIqwV6fB8/FJCJLgD4f7w9U6RZHZtO8fP96V+J4PznAAgjCANw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QmYQv5yFGztmr; Wed, 21 Jun 2023 19:26:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LJQl2C019485; Wed, 21 Jun 2023 19:26:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LJQlFg019484; Wed, 21 Jun 2023 19:26:47 GMT (envelope-from git) Date: Wed, 21 Jun 2023 19:26:47 GMT Message-Id: <202306211926.35LJQlFg019484@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 08d0f06faae0 - main - security/wazuh-*: Update to 4.4.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08d0f06faae0a9f67a2b1306954d0e74697cb1b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=08d0f06faae0a9f67a2b1306954d0e74697cb1b8 commit 08d0f06faae0a9f67a2b1306954d0e74697cb1b8 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-06-21 19:19:06 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-06-21 19:19:06 +0000 security/wazuh-*: Update to 4.4.4 - Add python path files from lang/python39/files - wazuh-indexer and wazuh-dashboards now use 2.8.0 version of opensearch and opensearch-dashboard - Update beats dependency to beats8 (filebeat) at security/wazuh-server --- security/wazuh-agent/Makefile | 2 +- security/wazuh-agent/distinfo | 78 +-- security/wazuh-dashboard/Makefile | 4 +- security/wazuh-dashboard/distinfo | 10 +- security/wazuh-dashboard/pkg-plist | 4 +- security/wazuh-indexer/Makefile | 2 +- security/wazuh-indexer/distinfo | 6 +- security/wazuh-manager/Makefile | 4 +- security/wazuh-manager/distinfo | 110 ++-- security/wazuh-manager/files/patch-freebsd-12 | 121 ++++ .../files/patch-issue40422_issue40423 | 206 ++++++ ...l_cpython_Lib_distutils_command_install__lib.py | 41 ++ ...ython_Lib_distutils_tests_test__install__lib.py | 33 + ..._external_cpython_Modules___decimal___decimal.c | 20 + ...ch-src_external_cpython_Modules__socketmodule.c | 29 + .../files/patch-src_external_cpython_configure | 11 + security/wazuh-manager/pkg-plist | 690 ++++++++++----------- security/wazuh-server/Makefile | 4 +- security/wazuh-server/distinfo | 18 +- 19 files changed, 927 insertions(+), 466 deletions(-) diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile index beae6fa45532..18ab7deb4f69 100644 --- a/security/wazuh-agent/Makefile +++ b/security/wazuh-agent/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -DISTVERSION= 4.4.3 +DISTVERSION= 4.4.4 DISTVERSIONPREFIX= v CATEGORIES= security MASTER_SITES= https://packages.wazuh.com/deps/20/libraries/sources/:wazuh_sources diff --git a/security/wazuh-agent/distinfo b/security/wazuh-agent/distinfo index 51244e32d009..ae68914f842c 100644 --- a/security/wazuh-agent/distinfo +++ b/security/wazuh-agent/distinfo @@ -1,39 +1,39 @@ -TIMESTAMP = 1685323696 -SHA256 (wazuh-4.4.3/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.4.3/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.4.3/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 -SIZE (wazuh-4.4.3/curl.tar.gz) = 3692998 -SHA256 (wazuh-4.4.3/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.4.3/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.4.3/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.4.3/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.4.3/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.4.3/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.4.3/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 -SIZE (wazuh-4.4.3/openssl.tar.gz) = 10162682 -SHA256 (wazuh-4.4.3/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.4.3/procps.tar.gz) = 55897 -SHA256 (wazuh-4.4.3/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 -SIZE (wazuh-4.4.3/sqlite.tar.gz) = 2296429 -SHA256 (wazuh-4.4.3/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d -SIZE (wazuh-4.4.3/zlib.tar.gz) = 638616 -SHA256 (wazuh-4.4.3/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.4.3/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.4.3/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.4.3/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.4.3/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.4.3/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.4.3/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe -SIZE (wazuh-4.4.3/nlohmann.tar.gz) = 134429 -SHA256 (wazuh-4.4.3/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.4.3/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.4.3/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa -SIZE (wazuh-4.4.3/libpcre2.tar.gz) = 1252173 -SHA256 (wazuh-4.4.3/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.4.3/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.4.3/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 -SIZE (wazuh-4.4.3/libarchive.tar.gz) = 7040169 -SHA256 (wazuh-4.4.3/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.4.3/popt.tar.gz) = 891309 -SHA256 (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 61d0a05c62021c8606c7fb70becab29a4df5eb82cc79131f4bb53afc368929f3 -SIZE (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 11553359 +TIMESTAMP = 1687022453 +SHA256 (wazuh-4.4.4/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.4.4/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.4.4/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 +SIZE (wazuh-4.4.4/curl.tar.gz) = 3692998 +SHA256 (wazuh-4.4.4/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.4.4/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.4.4/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.4.4/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.4.4/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.4.4/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.4.4/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 +SIZE (wazuh-4.4.4/openssl.tar.gz) = 10162682 +SHA256 (wazuh-4.4.4/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.4.4/procps.tar.gz) = 55897 +SHA256 (wazuh-4.4.4/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 +SIZE (wazuh-4.4.4/sqlite.tar.gz) = 2296429 +SHA256 (wazuh-4.4.4/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d +SIZE (wazuh-4.4.4/zlib.tar.gz) = 638616 +SHA256 (wazuh-4.4.4/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.4.4/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.4.4/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.4.4/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.4.4/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.4.4/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.4.4/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe +SIZE (wazuh-4.4.4/nlohmann.tar.gz) = 134429 +SHA256 (wazuh-4.4.4/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.4.4/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.4.4/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa +SIZE (wazuh-4.4.4/libpcre2.tar.gz) = 1252173 +SHA256 (wazuh-4.4.4/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.4.4/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.4.4/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 +SIZE (wazuh-4.4.4/libarchive.tar.gz) = 7040169 +SHA256 (wazuh-4.4.4/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.4.4/popt.tar.gz) = 891309 +SHA256 (wazuh-4.4.4/wazuh-wazuh-v4.4.4_GH0.tar.gz) = 4bf8602edd5e08ce06589b84d2ddde4f7b71d09ec056b607c826b529fb448b47 +SIZE (wazuh-4.4.4/wazuh-wazuh-v4.4.4_GH0.tar.gz) = 11555040 diff --git a/security/wazuh-dashboard/Makefile b/security/wazuh-dashboard/Makefile index 2cfe8b33ad9a..831b0ce04298 100644 --- a/security/wazuh-dashboard/Makefile +++ b/security/wazuh-dashboard/Makefile @@ -1,6 +1,6 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 4.4.3 +DISTVERSION= 4.4.4 CATEGORIES= security MASTER_SITES= LOCAL/acm/${PORTNAME}/ PKGNAMESUFFIX= -dashboard @@ -20,7 +20,7 @@ NO_BUILD= yes SUB_FILES= pkg-message -OPENSEARCH_VERSION= 2.7.0 +OPENSEARCH_VERSION= 2.8.0 ETCDIR= ${PREFIX}/etc/wazuh-dashboard WRKSRC= ${WRKDIR}/${PORTNAME}-kibana-app-${DISTVERSION} diff --git a/security/wazuh-dashboard/distinfo b/security/wazuh-dashboard/distinfo index 2221a2f50c44..da0b1e039c76 100644 --- a/security/wazuh-dashboard/distinfo +++ b/security/wazuh-dashboard/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1685412511 -SHA256 (wazuh-4.4.3/wazuh-kibana-app-4.4.3-2.7.0.tar.gz) = d4e28bd89c9f728819884ef80a3c6ba00e5febb9adf139ecbc8ec86b5b033295 -SIZE (wazuh-4.4.3/wazuh-kibana-app-4.4.3-2.7.0.tar.gz) = 37111865 -SHA256 (wazuh-4.4.3/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 -SIZE (wazuh-4.4.3/opensearch_dashboards.yml) = 806 +TIMESTAMP = 1687206988 +SHA256 (wazuh-4.4.4/wazuh-kibana-app-4.4.4-2.8.0.tar.gz) = 1fe68e829c3c14723b9c3c15cc2bf1d8b0b5439b996d5950ef8e2fdad69517ca +SIZE (wazuh-4.4.4/wazuh-kibana-app-4.4.4-2.8.0.tar.gz) = 37079427 +SHA256 (wazuh-4.4.4/opensearch_dashboards.yml) = 88affe6dab2e1299b6f8b5264e6dd9ea1aa42885f3aefb8822fe559f2b6bb5d5 +SIZE (wazuh-4.4.4/opensearch_dashboards.yml) = 806 diff --git a/security/wazuh-dashboard/pkg-plist b/security/wazuh-dashboard/pkg-plist index c7d58a9eca1d..885601c13c29 100644 --- a/security/wazuh-dashboard/pkg-plist +++ b/security/wazuh-dashboard/pkg-plist @@ -303,19 +303,19 @@ www/opensearch-dashboards/plugins/wazuh/node_modules/@types/prop-types/index.d.t www/opensearch-dashboards/plugins/wazuh/node_modules/@types/prop-types/package.json www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/LICENSE www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/README.md +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/canary.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/experimental.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/global.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/index.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/jsx-dev-runtime.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/jsx-runtime.d.ts -www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/next.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/package.json +www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/canary.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/experimental.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/global.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/index.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/jsx-dev-runtime.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/jsx-runtime.d.ts -www/opensearch-dashboards/plugins/wazuh/node_modules/@types/react/ts5.0/next.d.ts www/opensearch-dashboards/plugins/wazuh/node_modules/@types/scheduler/LICENSE www/opensearch-dashboards/plugins/wazuh/node_modules/@types/scheduler/README.md www/opensearch-dashboards/plugins/wazuh/node_modules/@types/scheduler/index.d.ts diff --git a/security/wazuh-indexer/Makefile b/security/wazuh-indexer/Makefile index 74c02e59bc41..984af8e43b07 100644 --- a/security/wazuh-indexer/Makefile +++ b/security/wazuh-indexer/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -PORTVERSION= 4.4.3 +PORTVERSION= 4.4.4 CATEGORIES= security MASTER_SITES= LOCAL/acm/${PORTNAME}/ PKGNAMESUFFIX= -indexer diff --git a/security/wazuh-indexer/distinfo b/security/wazuh-indexer/distinfo index 455a3def19c8..6beafbb862c6 100644 --- a/security/wazuh-indexer/distinfo +++ b/security/wazuh-indexer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1685132057 -SHA256 (wazuh-4.4.3/wazuh-indexer.yml) = f6bc1d4de01742268ca42ef285896c31b7a31fb82f0c9f13de32d383fa3669e0 -SIZE (wazuh-4.4.3/wazuh-indexer.yml) = 2123 +TIMESTAMP = 1687023741 +SHA256 (wazuh-4.4.4/wazuh-indexer.yml) = f6bc1d4de01742268ca42ef285896c31b7a31fb82f0c9f13de32d383fa3669e0 +SIZE (wazuh-4.4.4/wazuh-indexer.yml) = 2123 diff --git a/security/wazuh-manager/Makefile b/security/wazuh-manager/Makefile index f10b6d057360..49cfdc60a1f5 100644 --- a/security/wazuh-manager/Makefile +++ b/security/wazuh-manager/Makefile @@ -1,5 +1,5 @@ PORTNAME= wazuh -DISTVERSION= 4.4.3 +DISTVERSION= 4.4.4 DISTVERSIONPREFIX= v CATEGORIES= security MASTER_SITES= https://packages.wazuh.com/deps/20/libraries/sources/:wazuh_sources \ @@ -234,7 +234,7 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/integrations/pagerduty ${STAGEDIR}${WAZUHPREFIX}/integrations/pagerduty ${INSTALL_SCRIPT} ${WRKSRC}/integrations/slack ${STAGEDIR}${WAZUHPREFIX}/integrations/slack.py ${INSTALL_SCRIPT} ${WRKSRC}/integrations/shuffle.py ${STAGEDIR}${WAZUHPREFIX}/integrations/shuffle.py - ${INSTALL_SCRIPT} ${WRKSRC}/integrations/virustotal ${STAGEDIR}${WAZUHPREFIX}/integrations/virustotal.py + ${INSTALL_SCRIPT} ${WRKSRC}/integrations/virustotal.py ${STAGEDIR}${WAZUHPREFIX}/integrations/virustotal.py ${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/queue/vulnerabilities/dictionaries ${INSTALL_DATA} ${WRKSRC}/src/wazuh_modules/vulnerability_detector/cpe_helper.json ${STAGEDIR}${WAZUHPREFIX}/queue/vulnerabilities/dictionaries diff --git a/security/wazuh-manager/distinfo b/security/wazuh-manager/distinfo index 77e347fc1de6..9b600cc26a63 100644 --- a/security/wazuh-manager/distinfo +++ b/security/wazuh-manager/distinfo @@ -1,55 +1,55 @@ -TIMESTAMP = 1685252625 -SHA256 (wazuh-4.4.3/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-4.4.3/cJSON.tar.gz) = 27863 -SHA256 (wazuh-4.4.3/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 -SIZE (wazuh-4.4.3/curl.tar.gz) = 3692998 -SHA256 (wazuh-4.4.3/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 -SIZE (wazuh-4.4.3/jemalloc.tar.gz) = 579864 -SHA256 (wazuh-4.4.3/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e -SIZE (wazuh-4.4.3/libdb.tar.gz) = 3874990 -SHA256 (wazuh-4.4.3/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-4.4.3/libffi.tar.gz) = 964576 -SHA256 (wazuh-4.4.3/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-4.4.3/libyaml.tar.gz) = 424656 -SHA256 (wazuh-4.4.3/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 -SIZE (wazuh-4.4.3/openssl.tar.gz) = 10162682 -SHA256 (wazuh-4.4.3/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 -SIZE (wazuh-4.4.3/procps.tar.gz) = 55897 -SHA256 (wazuh-4.4.3/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 -SIZE (wazuh-4.4.3/sqlite.tar.gz) = 2296429 -SHA256 (wazuh-4.4.3/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d -SIZE (wazuh-4.4.3/zlib.tar.gz) = 638616 -SHA256 (wazuh-4.4.3/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-4.4.3/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-4.4.3/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-4.4.3/msgpack.tar.gz) = 591294 -SHA256 (wazuh-4.4.3/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd -SIZE (wazuh-4.4.3/bzip2.tar.gz) = 71277 -SHA256 (wazuh-4.4.3/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe -SIZE (wazuh-4.4.3/nlohmann.tar.gz) = 134429 -SHA256 (wazuh-4.4.3/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 -SIZE (wazuh-4.4.3/googletest.tar.gz) = 885874 -SHA256 (wazuh-4.4.3/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa -SIZE (wazuh-4.4.3/libpcre2.tar.gz) = 1252173 -SHA256 (wazuh-4.4.3/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c -SIZE (wazuh-4.4.3/libplist.tar.gz) = 1520623 -SHA256 (wazuh-4.4.3/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 -SIZE (wazuh-4.4.3/libarchive.tar.gz) = 7040169 -SHA256 (wazuh-4.4.3/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa -SIZE (wazuh-4.4.3/popt.tar.gz) = 891309 -SHA256 (wazuh-4.4.3/cpython.tar.gz) = d49fb4f23a10576c614dce7c9e6114c082b468198a7547c86d5efe6180897629 -SIZE (wazuh-4.4.3/cpython.tar.gz) = 237260330 -SHA256 (wazuh-4.4.3/wazuh-cache-any-4.4.3.tar.gz) = cc6865fb6dd9aa89c9507741cf50134fcbacf5f83811878d5eeb02a1904d6716 -SIZE (wazuh-4.4.3/wazuh-cache-any-4.4.3.tar.gz) = 15595248 -SHA256 (wazuh-4.4.3/wazuh-cache-fbsd13-aarch64-4.4.3.tar.gz) = 9a13eb243e18f7337664ca64152a5ca53af0cd703455823480133b1f495fe1fe -SIZE (wazuh-4.4.3/wazuh-cache-fbsd13-aarch64-4.4.3.tar.gz) = 15982673 -SHA256 (wazuh-4.4.3/wazuh-cache-fbsd14-aarch64-4.4.3.tar.gz) = c5b11d12c10878b2193c3337774784312edf3f257b754beab9f67818d2825a23 -SIZE (wazuh-4.4.3/wazuh-cache-fbsd14-aarch64-4.4.3.tar.gz) = 17601326 -SHA256 (wazuh-4.4.3/wazuh-cache-fbsd12-amd64-4.4.3.tar.gz) = 1f8b59b188d29be3bf1c44f45577248c5a33595825763650f234449eec8c13f4 -SIZE (wazuh-4.4.3/wazuh-cache-fbsd12-amd64-4.4.3.tar.gz) = 17175513 -SHA256 (wazuh-4.4.3/wazuh-cache-fbsd13-amd64-4.4.3.tar.gz) = 495f6c232763fca3b6a3d3c0dbb3e319c82b0a56613af2ecbdf88d5ff360a3f9 -SIZE (wazuh-4.4.3/wazuh-cache-fbsd13-amd64-4.4.3.tar.gz) = 17214367 -SHA256 (wazuh-4.4.3/wazuh-cache-fbsd14-amd64-4.4.3.tar.gz) = 4eb9e95dae4a10781fe6d1dfb00c1062cbc838e87f9a28de7092567d9bc623bc -SIZE (wazuh-4.4.3/wazuh-cache-fbsd14-amd64-4.4.3.tar.gz) = 17181995 -SHA256 (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 61d0a05c62021c8606c7fb70becab29a4df5eb82cc79131f4bb53afc368929f3 -SIZE (wazuh-4.4.3/wazuh-wazuh-v4.4.3_GH0.tar.gz) = 11553359 +TIMESTAMP = 1686886365 +SHA256 (wazuh-4.4.4/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.4.4/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.4.4/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 +SIZE (wazuh-4.4.4/curl.tar.gz) = 3692998 +SHA256 (wazuh-4.4.4/jemalloc.tar.gz) = 2b22e85b352c7df550ba408a42251e51e8dffa6c91aa2e1fb4804ab317ffbca0 +SIZE (wazuh-4.4.4/jemalloc.tar.gz) = 579864 +SHA256 (wazuh-4.4.4/libdb.tar.gz) = 7e9c44e8c7fdb186ff521a8d085b1bfa634d342dcc777ecea1fbf9a98ab5dc5e +SIZE (wazuh-4.4.4/libdb.tar.gz) = 3874990 +SHA256 (wazuh-4.4.4/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.4.4/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.4.4/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.4.4/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.4.4/openssl.tar.gz) = cdd47d1de792c94eef02344a768afee151c16f5fb92582ba3b97168a7b65ffc0 +SIZE (wazuh-4.4.4/openssl.tar.gz) = 10162682 +SHA256 (wazuh-4.4.4/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07 +SIZE (wazuh-4.4.4/procps.tar.gz) = 55897 +SHA256 (wazuh-4.4.4/sqlite.tar.gz) = e68521637d9e4e60115707cd7f35275a92ce6d0fc1ff04e22d7bbf0c393f8ff1 +SIZE (wazuh-4.4.4/sqlite.tar.gz) = 2296429 +SHA256 (wazuh-4.4.4/zlib.tar.gz) = da229c2ac01c572d6b00085fbbbb141382c818ed29299093153525f84b027b0d +SIZE (wazuh-4.4.4/zlib.tar.gz) = 638616 +SHA256 (wazuh-4.4.4/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.4.4/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.4.4/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.4.4/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.4.4/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd +SIZE (wazuh-4.4.4/bzip2.tar.gz) = 71277 +SHA256 (wazuh-4.4.4/nlohmann.tar.gz) = b5c3a99e9eb5331d958e2bdd3a6283c4b9ea7ad674dd4669ee26d5c5eef845fe +SIZE (wazuh-4.4.4/nlohmann.tar.gz) = 134429 +SHA256 (wazuh-4.4.4/googletest.tar.gz) = 8c1e8a0a7f221c2125e99e6acb709da2ba472476b4d057c58de504bebf38d417 +SIZE (wazuh-4.4.4/googletest.tar.gz) = 885874 +SHA256 (wazuh-4.4.4/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa +SIZE (wazuh-4.4.4/libpcre2.tar.gz) = 1252173 +SHA256 (wazuh-4.4.4/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c +SIZE (wazuh-4.4.4/libplist.tar.gz) = 1520623 +SHA256 (wazuh-4.4.4/libarchive.tar.gz) = f863f382ead9f61abc560ff0ead0be3aa9e95b6f8c62756e1f034f4c2386ba79 +SIZE (wazuh-4.4.4/libarchive.tar.gz) = 7040169 +SHA256 (wazuh-4.4.4/popt.tar.gz) = d6880a06622ca32dc4aa39ad5dcf7bef2faa81bd931afbe64ba434ad8fee1daa +SIZE (wazuh-4.4.4/popt.tar.gz) = 891309 +SHA256 (wazuh-4.4.4/cpython.tar.gz) = d49fb4f23a10576c614dce7c9e6114c082b468198a7547c86d5efe6180897629 +SIZE (wazuh-4.4.4/cpython.tar.gz) = 237260330 +SHA256 (wazuh-4.4.4/wazuh-cache-any-4.4.4.tar.gz) = cc6865fb6dd9aa89c9507741cf50134fcbacf5f83811878d5eeb02a1904d6716 +SIZE (wazuh-4.4.4/wazuh-cache-any-4.4.4.tar.gz) = 15595248 +SHA256 (wazuh-4.4.4/wazuh-cache-fbsd13-aarch64-4.4.4.tar.gz) = 9a13eb243e18f7337664ca64152a5ca53af0cd703455823480133b1f495fe1fe +SIZE (wazuh-4.4.4/wazuh-cache-fbsd13-aarch64-4.4.4.tar.gz) = 15982673 +SHA256 (wazuh-4.4.4/wazuh-cache-fbsd14-aarch64-4.4.4.tar.gz) = c5b11d12c10878b2193c3337774784312edf3f257b754beab9f67818d2825a23 +SIZE (wazuh-4.4.4/wazuh-cache-fbsd14-aarch64-4.4.4.tar.gz) = 17601326 +SHA256 (wazuh-4.4.4/wazuh-cache-fbsd12-amd64-4.4.4.tar.gz) = 1f8b59b188d29be3bf1c44f45577248c5a33595825763650f234449eec8c13f4 +SIZE (wazuh-4.4.4/wazuh-cache-fbsd12-amd64-4.4.4.tar.gz) = 17175513 +SHA256 (wazuh-4.4.4/wazuh-cache-fbsd13-amd64-4.4.4.tar.gz) = 495f6c232763fca3b6a3d3c0dbb3e319c82b0a56613af2ecbdf88d5ff360a3f9 +SIZE (wazuh-4.4.4/wazuh-cache-fbsd13-amd64-4.4.4.tar.gz) = 17214367 +SHA256 (wazuh-4.4.4/wazuh-cache-fbsd14-amd64-4.4.4.tar.gz) = 4eb9e95dae4a10781fe6d1dfb00c1062cbc838e87f9a28de7092567d9bc623bc +SIZE (wazuh-4.4.4/wazuh-cache-fbsd14-amd64-4.4.4.tar.gz) = 17181995 +SHA256 (wazuh-4.4.4/wazuh-wazuh-v4.4.4_GH0.tar.gz) = 4bf8602edd5e08ce06589b84d2ddde4f7b71d09ec056b607c826b529fb448b47 +SIZE (wazuh-4.4.4/wazuh-wazuh-v4.4.4_GH0.tar.gz) = 11555040 diff --git a/security/wazuh-manager/files/patch-freebsd-12 b/security/wazuh-manager/files/patch-freebsd-12 new file mode 100644 index 000000000000..4ca86a6d5f9a --- /dev/null +++ b/security/wazuh-manager/files/patch-freebsd-12 @@ -0,0 +1,121 @@ +From 138af6f7696e5450d11a6ef4cdca869a26fefe13 Mon Sep 17 00:00:00 2001 +From: Yasuhiro Kimura +Date: Tue, 11 May 2021 05:47:21 +0900 +Subject: [PATCH] Revert "[3.9] bpo-43799: OpenSSL 3.0.0: declare + OPENSSL_API_COMPAT 1.1.1 (GH-25329) (GH-25382)" + +This reverts commit 7d9d5bf863bb0af26b74b0732ab89b2053d2fbec. +--- + Modules/_hashopenssl.c | 15 +++++---------- + Modules/_ssl.c | 33 +++++++++++++++++++-------------- + 2 files changed, 24 insertions(+), 24 deletions(-) + +diff --git Modules/_hashopenssl.c Modules/_hashopenssl.c +index 0dd1662101..adc8653773 100644 +--- src/external/cpython/Modules/_hashopenssl.c ++++ src/external/cpython/Modules/_hashopenssl.c +@@ -11,13 +11,6 @@ + * + */ + +-/* Don't warn about deprecated functions, */ +-#ifndef OPENSSL_API_COMPAT +- // 0x10101000L == 1.1.1, 30000 == 3.0.0 +- #define OPENSSL_API_COMPAT 0x10101000L +-#endif +-#define OPENSSL_NO_DEPRECATED 1 +- + #ifndef Py_BUILD_CORE_BUILTIN + # define Py_BUILD_CORE_MODULE 1 + #endif +@@ -35,7 +28,7 @@ + #include + /* We use the object interface to discover what hashes OpenSSL supports. */ + #include +-#include ++#include "openssl/err.h" + + #include // FIPS_mode() + +@@ -1932,11 +1925,12 @@ _hashlib_get_fips_mode_impl(PyObject *module) + /*[clinic end generated code: output=87eece1bab4d3fa9 input=2db61538c41c6fef]*/ + + { ++ int result; + #if OPENSSL_VERSION_NUMBER >= 0x30000000L +- return EVP_default_properties_is_fips_enabled(NULL); ++ result = EVP_default_properties_is_fips_enabled(NULL); + #else + ERR_clear_error(); +- int result = FIPS_mode(); ++ result = FIPS_mode(); + if (result == 0) { + // "If the library was built without support of the FIPS Object Module, + // then the function will return 0 with an error code of +diff --git Modules/_ssl.c Modules/_ssl.c +index 97e314b21f..82069a5832 100644 +--- src/external/cpython/Modules/_ssl.c ++++ src/external/cpython/Modules/_ssl.c +@@ -14,13 +14,6 @@ + http://bugs.python.org/issue8108#msg102867 ? + */ + +-/* Don't warn about deprecated functions, */ +-#ifndef OPENSSL_API_COMPAT +- // 0x10101000L == 1.1.1, 30000 == 3.0.0 +- #define OPENSSL_API_COMPAT 0x10101000L +-#endif +-#define OPENSSL_NO_DEPRECATED 1 +- + #define PY_SSIZE_T_CLEAN + + #include "Python.h" +@@ -50,6 +43,14 @@ static PySocketModule_APIObject PySocketModule; + #include + #endif + ++/* Don't warn about deprecated functions */ ++#ifdef __GNUC__ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif ++#ifdef __clang__ ++#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++#endif ++ + /* Include OpenSSL header files */ + #include "openssl/rsa.h" + #include "openssl/crypto.h" +@@ -147,19 +148,23 @@ static void _PySSLFixErrno(void) { + # define PY_OPENSSL_1_1_API 1 + #endif + +-/* OpenSSL API 1.1.0+ does not include version methods. Define the methods +- * unless OpenSSL is compiled without the methods. It's the easiest way to +- * make 1.0.2, 1.1.0, 1.1.1, and 3.0.0 happy without deprecation warnings. +- */ ++/* OpenSSL API compat */ ++#ifdef OPENSSL_API_COMPAT ++#if OPENSSL_API_COMPAT >= 0x10100000L ++ ++/* OpenSSL API 1.1.0+ does not include version methods */ + #ifndef OPENSSL_NO_TLS1_METHOD +-extern const SSL_METHOD *TLSv1_method(void); ++#define OPENSSL_NO_TLS1_METHOD 1 + #endif + #ifndef OPENSSL_NO_TLS1_1_METHOD +-extern const SSL_METHOD *TLSv1_1_method(void); ++#define OPENSSL_NO_TLS1_1_METHOD 1 + #endif + #ifndef OPENSSL_NO_TLS1_2_METHOD +-extern const SSL_METHOD *TLSv1_2_method(void); ++#define OPENSSL_NO_TLS1_2_METHOD 1 + #endif ++ ++#endif /* >= 1.1.0 compcat */ ++#endif /* OPENSSL_API_COMPAT */ + + /* LibreSSL 2.7.0 provides necessary OpenSSL 1.1.0 APIs */ + #if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL +-- +2.31.1 + diff --git a/security/wazuh-manager/files/patch-issue40422_issue40423 b/security/wazuh-manager/files/patch-issue40422_issue40423 new file mode 100644 index 000000000000..dae5f917dfd6 --- /dev/null +++ b/security/wazuh-manager/files/patch-issue40422_issue40423 @@ -0,0 +1,206 @@ +diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c +index 5d1691ace4..ed046fc5c1 100644 +--- src/external/cpython/Modules/_posixsubprocess.c ++++ src/external/cpython/Modules/_posixsubprocess.c +@@ -250,7 +250,6 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep) + long end_fd = safe_get_max_fd(); + Py_ssize_t num_fds_to_keep = PyTuple_GET_SIZE(py_fds_to_keep); + Py_ssize_t keep_seq_idx; +- int fd_num; + /* As py_fds_to_keep is sorted we can loop through the list closing + * fds in between any in the keep list falling within our range. */ + for (keep_seq_idx = 0; keep_seq_idx < num_fds_to_keep; ++keep_seq_idx) { +@@ -258,21 +257,11 @@ _close_fds_by_brute_force(long start_fd, PyObject *py_fds_to_keep) + int keep_fd = PyLong_AsLong(py_keep_fd); + if (keep_fd < start_fd) + continue; +- for (fd_num = start_fd; fd_num < keep_fd; ++fd_num) { +- close(fd_num); +- } ++ _Py_closerange(start_fd, keep_fd - 1); + start_fd = keep_fd + 1; + } + if (start_fd <= end_fd) { +-#if defined(__FreeBSD__) +- /* Any errors encountered while closing file descriptors are ignored */ +- closefrom(start_fd); +-#else +- for (fd_num = start_fd; fd_num < end_fd; ++fd_num) { +- /* Ignore errors */ +- (void)close(fd_num); +- } +-#endif ++ _Py_closerange(start_fd, end_fd); + } + } + +diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c +index 01e8bcbd29..f6aad2e02e 100644 +--- src/external/cpython/Modules/posixmodule.c ++++ src/external/cpython/Modules/posixmodule.c +@@ -8691,8 +8691,26 @@ os_close_impl(PyObject *module, int fd) + Py_RETURN_NONE; + } + ++/* Our selection logic for which function to use is as follows: ++ * 1. If close_range(2) is available, always prefer that; it's better for ++ * contiguous ranges like this than fdwalk(3) which entails iterating over ++ * the entire fd space and simply doing nothing for those outside the range. ++ * 2. If closefrom(2) is available, we'll attempt to use that next if we're ++ * closing up to sysconf(_SC_OPEN_MAX). ++ * 2a. Fallback to fdwalk(3) if we're not closing up to sysconf(_SC_OPEN_MAX), ++ * as that will be more performant if the range happens to have any chunk of ++ * non-opened fd in the middle. ++ * 2b. If fdwalk(3) isn't available, just do a plain close(2) loop. ++ */ ++#ifdef __FreeBSD__ ++#define USE_CLOSEFROM ++#endif /* __FreeBSD__ */ + + #ifdef HAVE_FDWALK ++#define USE_FDWALK ++#endif /* HAVE_FDWALK */ ++ ++#ifdef USE_FDWALK + static int + _fdwalk_close_func(void *lohi, int fd) + { +@@ -8708,7 +8726,46 @@ _fdwalk_close_func(void *lohi, int fd) + } + return 0; + } +-#endif /* HAVE_FDWALK */ ++#endif /* USE_FDWALK */ ++ ++/* Closes all file descriptors in [first, last], ignoring errors. */ ++void ++_Py_closerange(int first, int last) ++{ ++ first = Py_MAX(first, 0); ++ _Py_BEGIN_SUPPRESS_IPH ++#ifdef HAVE_CLOSE_RANGE ++ if (close_range(first, last, 0) == 0 || errno != ENOSYS) { ++ /* Any errors encountered while closing file descriptors are ignored; ++ * ENOSYS means no kernel support, though, ++ * so we'll fallback to the other methods. */ ++ } ++ else ++#endif /* HAVE_CLOSE_RANGE */ ++#ifdef USE_CLOSEFROM ++ if (last >= sysconf(_SC_OPEN_MAX)) { ++ /* Any errors encountered while closing file descriptors are ignored */ ++ closefrom(first); ++ } ++ else ++#endif /* USE_CLOSEFROM */ ++#ifdef USE_FDWALK ++ { ++ int lohi[2]; ++ lohi[0] = first; ++ lohi[1] = last + 1; ++ fdwalk(_fdwalk_close_func, lohi); ++ } ++#else ++ { ++ for (int i = first; i <= last; i++) { ++ /* Ignore errors */ ++ (void)close(i); ++ } ++ } ++#endif /* USE_FDWALK */ ++ _Py_END_SUPPRESS_IPH ++} + + /*[clinic input] + os.closerange +@@ -8724,32 +8781,8 @@ static PyObject * + os_closerange_impl(PyObject *module, int fd_low, int fd_high) + /*[clinic end generated code: output=0ce5c20fcda681c2 input=5855a3d053ebd4ec]*/ + { +-#ifdef HAVE_FDWALK +- int lohi[2]; +-#endif + Py_BEGIN_ALLOW_THREADS +- _Py_BEGIN_SUPPRESS_IPH +-#ifdef HAVE_FDWALK +- lohi[0] = Py_MAX(fd_low, 0); +- lohi[1] = fd_high; +- fdwalk(_fdwalk_close_func, lohi); +-#else +- fd_low = Py_MAX(fd_low, 0); +-#ifdef __FreeBSD__ +- if (fd_high >= sysconf(_SC_OPEN_MAX)) { +- /* Any errors encountered while closing file descriptors are ignored */ +- closefrom(fd_low); +- } +- else +-#endif +- { +- for (int i = fd_low; i < fd_high; i++) { +- /* Ignore errors */ +- (void)close(i); +- } +- } +-#endif +- _Py_END_SUPPRESS_IPH ++ _Py_closerange(fd_low, fd_high - 1); + Py_END_ALLOW_THREADS + Py_RETURN_NONE; + } +diff --git a/Modules/posixmodule.h b/Modules/posixmodule.h +index 1e00562abc..749833f71c 100644 +--- src/external/cpython/Modules/posixmodule.h ++++ src/external/cpython/Modules/posixmodule.h +@@ -28,6 +28,8 @@ PyAPI_FUNC(int) _Py_Sigset_Converter(PyObject *, void *); + #endif /* HAVE_SIGSET_T */ + #endif /* Py_LIMITED_API */ + ++PyAPI_FUNC(void) _Py_closerange(int first, int last); ++ + #ifdef __cplusplus + } + #endif +diff --git a/configure b/configure +index 9e6fd46583..de517223f6 100755 +--- src/external/cpython/configure ++++ src/external/cpython/configure +@@ -11668,8 +11668,8 @@ fi + + # checks for library functions + for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ +- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \ +- faccessat fchmod fchmodat fchown fchownat \ ++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \ ++ explicit_memset faccessat fchmod fchmodat fchown fchownat \ + fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \ + futimens futimes gai_strerror getentropy \ + getgrgid_r getgrnam_r \ +diff --git a/configure.ac b/configure.ac +index d60f05251a..faa187af69 100644 +--- src/external/cpython/configure.ac ++++ src/external/cpython/configure.ac +@@ -3664,8 +3664,8 @@ fi + + # checks for library functions + AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \ +- clock confstr copy_file_range ctermid dup3 execv explicit_bzero explicit_memset \ +- faccessat fchmod fchmodat fchown fchownat \ ++ clock confstr close_range copy_file_range ctermid dup3 execv explicit_bzero \ ++ explicit_memset faccessat fchmod fchmodat fchown fchownat \ + fdwalk fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \ + futimens futimes gai_strerror getentropy \ + getgrgid_r getgrnam_r \ +diff --git a/pyconfig.h.in b/pyconfig.h.in +index c9589cd102..449b25f551 100644 +--- src/external/cpython/pyconfig.h.in ++++ src/external/cpython/pyconfig.h.in +@@ -136,6 +136,9 @@ + /* Define to 1 if you have the `clock_settime' function. */ + #undef HAVE_CLOCK_SETTIME + ++/* Define to 1 if you have the `close_range' function. */ ++#undef HAVE_CLOSE_RANGE ++ + /* Define if the C compiler supports computed gotos. */ + #undef HAVE_COMPUTED_GOTOS + diff --git a/security/wazuh-manager/files/patch-src_external_cpython_Lib_distutils_command_install__lib.py b/security/wazuh-manager/files/patch-src_external_cpython_Lib_distutils_command_install__lib.py new file mode 100644 index 000000000000..1118a0a704af --- /dev/null +++ b/security/wazuh-manager/files/patch-src_external_cpython_Lib_distutils_command_install__lib.py @@ -0,0 +1,41 @@ +From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001 +From: Brendan Molloy +Date: Mon, 4 Jan 2016 23:14:06 +1100 +Subject: [PATCH] Check bytecode file actually exists and tests + +Should solve issue 20397, where using the --record argument results +in files that failed to generate bytecode files are added to the +record file nonetheless. +--- + Lib/distutils/command/install_lib.py | 17 +++++++++++++---- + Lib/distutils/tests/test_install_lib.py | 8 ++++++-- + 2 files changed, 19 insertions(+), 6 deletions(-) + +--- src/external/cpython/Lib/distutils/command/install_lib.py.orig 2015-12-07 01:39:07 UTC ++++ src/external/cpython/Lib/distutils/command/install_lib.py +@@ -164,12 +164,21 @@ class install_lib(Command): + ext = os.path.splitext(os.path.normcase(py_file))[1] + if ext != PYTHON_SOURCE_EXTENSION: + continue ++ + if self.compile: +- bytecode_files.append(importlib.util.cache_from_source( +- py_file, optimization='')) ++ candidate = importlib.util.cache_from_source( ++ py_file, optimization='') ++ ++ if os.path.isfile(candidate): ++ bytecode_files.append(candidate) ++ + if self.optimize > 0: +- bytecode_files.append(importlib.util.cache_from_source( +- py_file, optimization=self.optimize)) ++ candidate = importlib.util.cache_from_source( ++ py_file, optimization=self.optimize) ++ ++ if os.path.isfile(candidate): ++ bytecode_files.append(candidate) ++ + + return bytecode_files + diff --git a/security/wazuh-manager/files/patch-src_external_cpython_Lib_distutils_tests_test__install__lib.py b/security/wazuh-manager/files/patch-src_external_cpython_Lib_distutils_tests_test__install__lib.py new file mode 100644 index 000000000000..800258234aae --- /dev/null +++ b/security/wazuh-manager/files/patch-src_external_cpython_Lib_distutils_tests_test__install__lib.py @@ -0,0 +1,33 @@ +From 9934ce31b8447667f71c211e559a8de71e8263db Mon Sep 17 00:00:00 2001 +From: Brendan Molloy +Date: Mon, 4 Jan 2016 23:14:06 +1100 +Subject: [PATCH] Check bytecode file actually exists and tests + +Should solve issue 20397, where using the --record argument results +in files that failed to generate bytecode files are added to the +record file nonetheless. +--- + Lib/distutils/command/install_lib.py | 17 +++++++++++++---- + Lib/distutils/tests/test_install_lib.py | 8 ++++++-- + 2 files changed, 19 insertions(+), 6 deletions(-) + +--- src/external/cpython/Lib/distutils/tests/test_install_lib.py.orig 2015-12-07 01:39:07 UTC ++++ src/external/cpython/Lib/distutils/tests/test_install_lib.py +@@ -64,11 +64,15 @@ class InstallLibTestCase(support.Tempdir + cmd.distribution.ext_modules = [Extension('foo', ['xxx'])] + cmd.distribution.packages = ['spam'] + cmd.distribution.script_name = 'setup.py' ++ ++ # Create rubbish, uncompilable file ++ f = os.path.join(project_dir, 'spam', 'rubbish.py') ++ self.write_file(f, 'rubbish()') + + # get_outputs should return 4 elements: spam/__init__.py and .pyc, +- # foo.import-tag-abiflags.so / foo.pyd ++ # foo.import-tag-abiflags.so / foo.pyd and rubbish.py (no .pyc) + outputs = cmd.get_outputs() +- self.assertEqual(len(outputs), 4, outputs) ++ self.assertEqual(len(outputs), 5, outputs) + + def test_get_inputs(self): + project_dir, dist = self.create_dist() diff --git a/security/wazuh-manager/files/patch-src_external_cpython_Modules___decimal___decimal.c b/security/wazuh-manager/files/patch-src_external_cpython_Modules___decimal___decimal.c new file mode 100644 index 000000000000..091beabfe48b --- /dev/null +++ b/security/wazuh-manager/files/patch-src_external_cpython_Modules___decimal___decimal.c @@ -0,0 +1,20 @@ +--- src/external/cpython/Modules/_decimal/_decimal.c.orig 2020-12-07 14:02:38 UTC ++++ src/external/cpython/Modules/_decimal/_decimal.c +@@ -3280,7 +3280,7 @@ dec_format(PyObject *dec, PyObject *args) + } + else { + size_t n = strlen(spec.dot); +- if (n > 1 || (n == 1 && !isascii((uchar)spec.dot[0]))) { ++ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.dot[0]))) { + /* fix locale dependent non-ascii characters */ + dot = dotsep_as_utf8(spec.dot); + if (dot == NULL) { +@@ -3289,7 +3289,7 @@ dec_format(PyObject *dec, PyObject *args) + spec.dot = PyBytes_AS_STRING(dot); + } + n = strlen(spec.sep); +- if (n > 1 || (n == 1 && !isascii((uchar)spec.sep[0]))) { ++ if (n > 1 || (n == 1 && !isascii((unsigned char)spec.sep[0]))) { + /* fix locale dependent non-ascii characters */ + sep = dotsep_as_utf8(spec.sep); + if (sep == NULL) { diff --git a/security/wazuh-manager/files/patch-src_external_cpython_Modules__socketmodule.c b/security/wazuh-manager/files/patch-src_external_cpython_Modules__socketmodule.c new file mode 100644 index 000000000000..af406ed5bad5 --- /dev/null +++ b/security/wazuh-manager/files/patch-src_external_cpython_Modules__socketmodule.c @@ -0,0 +1,29 @@ +--- src/external/cpython/Modules/socketmodule.c ++++ src/external/cpython/Modules/socketmodule.c +@@ -1850,6 +1850,11 @@ getsockaddrarg(PySocketSockObject *s, PyObject *args, + /* RDS sockets use sockaddr_in: fall-through */ + #endif /* AF_RDS */ + ++#ifdef AF_DIVERT ++ case AF_DIVERT: ++ /* FreeBSD divert(4) sockets use sockaddr_in: fall-through */ ++#endif /* AF_DIVERT */ ++ + case AF_INET: + { + struct maybe_idna host = {NULL, NULL}; +@@ -7628,6 +7633,14 @@ PyInit__socket(void) + PyModule_AddIntMacro(m, AF_SYSTEM); + #endif + ++/* FreeBSD divert(4) */ ++#ifdef PF_DIVERT ++ PyModule_AddIntMacro(m, PF_DIVERT); ++#endif ++#ifdef AF_DIVERT ++ PyModule_AddIntMacro(m, AF_DIVERT); ++#endif ++ + #ifdef AF_PACKET + PyModule_AddIntMacro(m, AF_PACKET); + #endif diff --git a/security/wazuh-manager/files/patch-src_external_cpython_configure b/security/wazuh-manager/files/patch-src_external_cpython_configure new file mode 100644 index 000000000000..70a77bf26d9c --- /dev/null +++ b/security/wazuh-manager/files/patch-src_external_cpython_configure @@ -0,0 +1,11 @@ +--- src/external/cpython/configure 2023-06-17 10:52:31.789714000 -0500 ++++ src/external/cpython/configure 2023-06-17 10:52:50.027151000 -0500 +@@ -6566,7 +6566,7 @@ + + if test "$Py_LTO" = 'true' ; then + case $CC in +- *clang*) ++ *clang*|cc) + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}llvm-ar", so it can be a program name with args. diff --git a/security/wazuh-manager/pkg-plist b/security/wazuh-manager/pkg-plist index 3cdbeb38649f..54054afd83bd 100644 --- a/security/wazuh-manager/pkg-plist +++ b/security/wazuh-manager/pkg-plist @@ -4776,11 +4776,11 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/aiosignal/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/aiosignal/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/aiosignal/py.typed -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.3-py%%PYTHON_VER%%.egg-info/PKG-INFO -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.3-py%%PYTHON_VER%%.egg-info/SOURCES.txt -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.3-py%%PYTHON_VER%%.egg-info/dependency_links.txt -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.3-py%%PYTHON_VER%%.egg-info/not-zip-safe -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.3-py%%PYTHON_VER%%.egg-info/top_level.txt +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.4-py%%PYTHON_VER%%.egg-info/PKG-INFO +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.4-py%%PYTHON_VER%%.egg-info/SOURCES.txt +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.4-py%%PYTHON_VER%%.egg-info/dependency_links.txt +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.4-py%%PYTHON_VER%%.egg-info/not-zip-safe +/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api-4.4.4-py%%PYTHON_VER%%.egg-info/top_level.txt /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api/__init__.py /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/api/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc @@ -21506,326 +21506,326 @@ /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/uvloop/server.pyx /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/uvloop/sslproto.pxd /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/uvloop/sslproto.pyx -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/EGG-INFO/PKG-INFO -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/EGG-INFO/SOURCES.txt -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/EGG-INFO/dependency_links.txt -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/EGG-INFO/not-zip-safe -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/EGG-INFO/top_level.txt -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/__pycache__/get_agents%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/__pycache__/get_agents%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/__pycache__/get_agents%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/__pycache__/rules_to_csv%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/__pycache__/rules_to_csv%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/__pycache__/rules_to_csv%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/get_agents.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/examples/rules_to_csv.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__init__.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/agent_groups%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/agent_groups%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/agent_groups%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/agent_upgrade%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/agent_upgrade%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/agent_upgrade%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/cluster_control%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/cluster_control%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/cluster_control%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/wazuh_clusterd%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/wazuh_clusterd%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/wazuh_clusterd%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/wazuh_logtest%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/wazuh_logtest%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/__pycache__/wazuh_logtest%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/agent_groups.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/agent_upgrade.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/cluster_control.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/wazuh_clusterd.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/scripts/wazuh_logtest.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__init__.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__main__.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/__main__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/__main__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/__main__%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/active_response%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/active_response%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/active_response%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/agent%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/agent%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/agent%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/cdb_list%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/cdb_list%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/cdb_list%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/ciscat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/ciscat%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/ciscat%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/cluster%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/cluster%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/cluster%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/decoder%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/decoder%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/decoder%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/logtest%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/logtest%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/logtest%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/manager%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/manager%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/manager%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/mitre%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/mitre%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/mitre%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/rootcheck%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/rootcheck%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/rootcheck%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/rule%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/rule%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/rule%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/sca%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/sca%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/sca%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/security%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/security%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/security%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/stats%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/stats%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/stats%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/syscheck%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/syscheck%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/syscheck%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/syscollector%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/syscollector%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/syscollector%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/task%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/task%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/task%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/vulnerability%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/vulnerability%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/__pycache__/vulnerability%%PYTHON_EXT_SUFFIX%%.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/active_response.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/agent.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/cdb_list.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/ciscat.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/cluster.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/core/InputValidator.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/core/__init__.py -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/core/__pycache__/InputValidator%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/wazuh-4.4.3-py%%PYTHON_VER%%.egg/wazuh/core/__pycache__/InputValidator%%PYTHON_EXT_SUFFIX%%.opt-2.pyc *** 632 LINES SKIPPED ***