From nobody Tue Oct 24 01:51:28 2023 X-Original-To: dev-commits-ports-branches@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 4SDw5Y0xrVz4xJHZ; Tue, 24 Oct 2023 01:51:29 +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 4SDw5Y0WHgz4XPN; Tue, 24 Oct 2023 01:51:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698112289; 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=XcWQnDuMzooc+3fH476RCE+kOkhOj11imhk5BphJ5Bg=; b=A78hNwjUI13LrPHD5u0l+xu6NEgsR+QpYTZjUanJXohE7wvJP7ynOHS19BKDX1bCgboSnQ HqAk2aomYJmggV93HA6csov8dX7wvO/aDhfPvgZofX2ZzxJyHBjOKUi+zBFgSUoG/tDjxW fK9VvGZ0g2fF6q57tP8+hzJPHalKB3M4Kr1yCoJC0XWSlCYtk2iBxBIzQXWZuuLlXb2BRS VmJPtlwzxBST8TwY4uRkAZJYycoiLLqZaaHW6jUKpsZnRYRRB/Qd8WYcxX8FgYtutYa8uE hCro4qy8NE5XhG9VmWTaGlmvUH6FzEu8tjiR6UtOhedQ4GpsckamRpG+253EaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698112289; a=rsa-sha256; cv=none; b=eRtLtQmTsI3LBK0KRNm0KUveaIkkUqctpTKCpLkikSZFy6OnW4yOQ2yPsQLOLq89a1g6ri v8eKhQ/NyvBAdtuO/wU3YGJB1wBocgibx47fDlvNsqABCTAS2mMTjjRg/jISAJdSk+eqA7 pOKySjMgfjVzy6A0SGCzt846RdNhS72R2/yb65DfOPT/yDI3llNQuxRBTn2yfZId9QmOBm h1TsH4O0qfzng4MEA8Q7fIF6C8PrZC2IeYWzW+UIwqfKR1WDqmlWO6zgDBfvjixJuIZFI7 5iFUd0jgY7N2sMw+uUDPcPy1+Bd1mboLCKy2A87+KwIv9A1U+5o+alNq+SC7wA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698112289; 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=XcWQnDuMzooc+3fH476RCE+kOkhOj11imhk5BphJ5Bg=; b=JgiH43ARoJ2so7z3SsfDYX5l3/oXC92cqLqdqv4XgtQnAcRdqBjx2DJZ37qadQjH6FO9M0 URleVfofJY0Je38bILiBtm4si/jjgg+lOWFWP9Sclb9PGgtxdRiJS/mCYWULHlS5Bg0CZf Qaak70IPnc8+30uRFG6fPcGp+Ej+5xYNKZ3H3xBRLQgL435a5VDu3TxAET17LrkRAQZyWq cOvlfQYLBEURrHs2C3K0wN0EeirwXnDiOmNkIuaVvkayzYQWlen3LeVjZm70I2fIR54V+g tNtAnz2oZrPUjbhofc55RSO1amjlbVa6W0hLcqhNsLZf7zmhQDOyYkpeCJeYeA== 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 4SDw5X6jPsz13bW; Tue, 24 Oct 2023 01:51:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39O1pS1j018772; Tue, 24 Oct 2023 01:51:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O1pSbg018769; Tue, 24 Oct 2023 01:51:28 GMT (envelope-from git) Date: Tue, 24 Oct 2023 01:51:28 GMT Message-Id: <202310240151.39O1pSbg018769@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 89b330c1c1a3 - 2023Q4 - security/wazuh-*: Update to 4.5.4 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q4 X-Git-Reftype: branch X-Git-Commit: 89b330c1c1a34cd16ef8e538f53343504ec67d07 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=89b330c1c1a34cd16ef8e538f53343504ec67d07 commit 89b330c1c1a34cd16ef8e538f53343504ec67d07 Author: Jose Alonso Cardenas Marquez AuthorDate: 2023-10-23 23:00:52 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2023-10-24 01:50:39 +0000 security/wazuh-*: Update to 4.5.4 ChangeLog at: https://documentation.wazuh.com/current/release-notes/release-4-5-4.html (cherry picked from commit a8e4946f00997f8b410cce6e575901b2aecc62df) --- security/wazuh-manager/files/patch-src_Makefile | 32 ++++++++++--------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/security/wazuh-manager/files/patch-src_Makefile b/security/wazuh-manager/files/patch-src_Makefile index 49b0810acfdd..6bcb407d3c43 100644 --- a/security/wazuh-manager/files/patch-src_Makefile +++ b/security/wazuh-manager/files/patch-src_Makefile @@ -1,6 +1,6 @@ ---- src/Makefile 2023-08-04 05:19:33.000000000 -0500 -+++ src/Makefile 2023-08-11 02:02:09.552633000 -0500 -@@ -39,9 +39,11 @@ +--- src/Makefile 2023-09-05 02:28:24.000000000 -0500 ++++ src/Makefile 2023-09-21 16:31:47.443425000 -0500 +@@ -40,9 +40,11 @@ HAS_CHECKMODULE = $(shell command -v checkmodule > /dev/null && echo YES) HAS_SEMODULE_PACKAGE = $(shell command -v semodule_package > /dev/null && echo YES) @@ -12,7 +12,7 @@ ARCH_FLAGS = -@@ -240,10 +242,10 @@ +@@ -241,10 +243,10 @@ ifeq (${uname_S},FreeBSD) DEFINES+=-DFreeBSD OSSEC_CFLAGS+=-pthread -I/usr/local/include @@ -25,7 +25,7 @@ AR_LDFLAGS+=-L/usr/local/lib AR_LDFLAGS+='-Wl,-rpath,$$ORIGIN/../../lib' PRECOMPILED_OS:=freebsd -@@ -855,6 +857,8 @@ +@@ -860,6 +862,8 @@ EXTERNAL_LIBS += $(LIBCURL_LIB) else ifeq (${uname_S},Linux) EXTERNAL_LIBS += $(LIBCURL_LIB) @@ -34,22 +34,21 @@ else ifeq (${uname_S},Darwin) EXTERNAL_LIBS += $(LIBCURL_LIB) endif -@@ -1036,10 +1040,14 @@ +@@ -1037,9 +1041,13 @@ ifeq (${uname_S},Linux) - cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --disable-ldap --without-libidn2 --without-libpsl --without-brotli + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-ldl -lpthread" ./configure --with-ssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-libpsl --without-brotli else +ifeq (${uname_S},FreeBSD) + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-pthread" ./configure --with-ssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 --without-brotli --without-nghttp2 --without-librtmp +else - cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --disable-ldap --without-libidn2 - endif + cd $(EXTERNAL_CURL) && CPPFLAGS="-fPIC -I${ROUTE_PATH}/${EXTERNAL_OPENSSL}include" LDFLAGS="-L${ROUTE_PATH}/${EXTERNAL_OPENSSL}" LIBS="-lpthread" ./configure --with-ssl="${ROUTE_PATH}/${EXTERNAL_OPENSSL}" --disable-ldap --without-libidn2 endif endif +endif #### procps ######### -@@ -2224,14 +2232,37 @@ +@@ -2245,10 +2253,33 @@ mkdir -p ${WPYTHON_DIR} cp external/${WPYTHON_TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} && ${TAR} ${WPYTHON_DIR}/${WPYTHON_TAR} -C ${WPYTHON_DIR} && rm -rf ${WPYTHON_DIR}/${WPYTHON_TAR} endif @@ -82,18 +81,11 @@ +else install_dependencies: install_python ifneq (,$(wildcard ${EXTERNAL_CPYTHON})) -- ${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple -- LD_LIBRARY_PATH="${INSTALLDIR}/lib" LDFLAGS="-L${INSTALLDIR}/lib" ${WPYTHON_DIR}/bin/pip3 install -r ../framework/${python_dependencies} --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple -+ ${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple -+ LD_LIBRARY_PATH="${INSTALLDIR}/lib" LDFLAGS="-L${INSTALLDIR}/lib" ${WPYTHON_DIR}/bin/pip3 install -r ../framework/${python_dependencies} --index-url=file://${ROUTE_PATH}/${EXTERNAL - endif - - install_framework: install_python -@@ -2244,7 +2275,7 @@ - + ${WPYTHON_DIR}/bin/python3 -m pip install --upgrade pip --index-url=file://${ROUTE_PATH}/${EXTERNAL_CPYTHON}/Dependencies/simple +@@ -2266,6 +2297,7 @@ install_mitre: install_python cd ../tools/mitre && ${WPYTHON_DIR}/bin/python3 mitredb.py -d ${INSTALLDIR}/var/db/mitre.db -- + +endif ####################