git: 5ab61d75914c - main - security/wazuh-manager: Fix pkg-plist

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Mon, 16 Dec 2024 01:52:38 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=5ab61d75914c477cf5bc93669516c01b40d380a6

commit 5ab61d75914c477cf5bc93669516c01b40d380a6
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2024-12-16 00:51:58 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2024-12-16 01:52:24 +0000

    security/wazuh-manager: Fix pkg-plist
    
    - Remove *.bak, *.orig, and tmp files installed from some whl files
    - Fix issues with pkg-plist file
    - Improve Makefile file
    - Bump PORTREVISION
    
    Reported by:    pkg-fallout
---
 security/wazuh-manager/Makefile  | 13 +++++++++----
 security/wazuh-manager/pkg-plist | 14 ++------------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/security/wazuh-manager/Makefile b/security/wazuh-manager/Makefile
index 0a7563ed443f..eaf3452dd023 100644
--- a/security/wazuh-manager/Makefile
+++ b/security/wazuh-manager/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	wazuh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.9.2
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	https://packages.wazuh.com/deps/30/libraries/sources/:wazuh_sources \
 		LOCAL/acm/${PORTNAME}/:wazuh_cache
@@ -389,11 +390,11 @@ do-install:
 		${MAKE_CMD} --quiet -C api install INSTALLDIR=${STAGEDIR}${WAZUHPREFIX}
 
 	@cd ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib && \
-		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "python3.11"
+		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "${PYTHON_VERSION}"
 	@cd ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib && \
-		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -O -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "python3.11"
+		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -O -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "${PYTHON_VERSION}"
 	@cd ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib && \
-		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -OO -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "python3.11"
+		${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3 -OO -m compileall -x 'bad_coding|badsyntax|lib2to3/tests/data' -f -p ${WAZUHPREFIX}/framework/python/lib/ "${PYTHON_VERSION}"
 
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/etc/templates
 	${MKDIR} ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/databases
@@ -411,8 +412,12 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/os_dbd/mysql.schema ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/databases
 	${INSTALL_DATA} ${WRKSRC}/src/os_dbd/postgresql.schema ${STAGEDIR}${WAZUHPREFIX}/packages_files/manager_installation_scripts/databases
 
+	@${FIND} ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib/${PYTHON_VERSION}/site-packages/numpy/distutils/ -type f -name "*.bak" -delete -o -name "*.orig" -delete
+	@${RM} ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib/${PYTHON_VERSION}/site-packages/numpy/f2py/tests/src/temp
+	@${RM} ${STAGEDIR}${WAZUHPREFIX}/framework/python/lib/${PYTHON_VERSION}/site-packages/numpy/core/tests/examples/temp
+
 post-install:
-	@${STRIP_CMD} ${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/python3.11
+	@${STRIP_CMD} ${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/${PYTHON_VERSION}
 	@${FIND} ${STAGEDIR}${WAZUHPREFIX}/framework -type f -name "*.so" -exec ${STRIP_CMD} "{}" \;
 .for FILE in ${WZSHEBANG_FILES}
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||g' ${STAGEDIR}${WAZUHPREFIX}/framework/python/bin/${FILE}
diff --git a/security/wazuh-manager/pkg-plist b/security/wazuh-manager/pkg-plist
index fa52cbe07fb4..b60ee0f1a2a2 100644
--- a/security/wazuh-manager/pkg-plist
+++ b/security/wazuh-manager/pkg-plist
@@ -15076,7 +15076,6 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/examples/limited_api/__pycache__/setup%%PYTHON_EXT_SUFFIX%%.pyc
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/examples/limited_api/limited_api.c
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/examples/limited_api/setup.py
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/examples/temp
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/test__exceptions.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_abc.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/core/tests/test_api.py
@@ -15240,7 +15239,6 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_avx512_knm.c
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_avx512_skx.c
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_avx512_spr.c
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_avx512_spr.c.orig
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_avx512cd.c
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_avx512f.c
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/checks/cpu_f16c.c
@@ -15347,10 +15345,8 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/core.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/cpuinfo.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.py
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/exec_command.py.orig
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/extension.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__init__.py
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__init__.py.orig
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
@@ -15418,8 +15414,6 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/fujitsu.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/g95.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.py
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.py.bak
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/gnu.py.orig
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/hpux.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/ibm.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/fcompiler/intel.py
@@ -15448,8 +15442,6 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/pathccompiler.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/setup.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.py
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.py.bak
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/system_info.py.orig
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/tests/__init__.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/distutils/tests/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
@@ -15619,7 +15611,6 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/crackfortran.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/diagnose.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.py
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/f2py2e.py.orig
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/f90mod_rules.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/func2subr.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/rules.py
@@ -15805,7 +15796,6 @@
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/string/gh25286_bc.pyf
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/string/scalar_string.f90
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/string/string.f
-/var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/temp
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/src/value_attrspec/gh21665.f90
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_abstract_interface.py
 /var/ossec/framework/python/%%PYTHON_SITELIBDIR%%/numpy/f2py/tests/test_array_from_pyobj.py
@@ -30889,7 +30879,7 @@
 /var/ossec/packages_files/manager_installation_scripts/sca/debian/cis_debian9.yml.disabled
 /var/ossec/packages_files/manager_installation_scripts/sca/freebsd/cis_freebsd12.yml.disabled
 /var/ossec/packages_files/manager_installation_scripts/sca/freebsd/cis_freebsd13.yml.disabled
-/var/ossec/packages_files/manager_installation_scripts/sca/freebsd/cis_%%PYTHON_PLATFORM%%.yml.disabled
+/var/ossec/packages_files/manager_installation_scripts/sca/freebsd/cis_freebsd14.yml.disabled
 /var/ossec/packages_files/manager_installation_scripts/sca/freebsd/cis_freebsd15.yml.disabled
 /var/ossec/packages_files/manager_installation_scripts/sca/generic/sca_unix_audit.yml.disabled
 /var/ossec/packages_files/manager_installation_scripts/sca/hpux/cis_hpux_11i.yml.disabled
@@ -31272,7 +31262,7 @@
 /var/ossec/ruleset/sca/cis_debian9.yml.disabled
 /var/ossec/ruleset/sca/cis_freebsd12.yml.disabled
 /var/ossec/ruleset/sca/cis_freebsd13.yml.disabled
-/var/ossec/ruleset/sca/cis_%%PYTHON_PLATFORM%%.yml.disabled
+/var/ossec/ruleset/sca/cis_freebsd14.yml.disabled
 /var/ossec/ruleset/sca/cis_freebsd15.yml.disabled
 /var/ossec/ruleset/sca/cis_hpux_11i.yml.disabled
 /var/ossec/ruleset/sca/cis_hpux_11i_bastille.yml.disabled