Attachment 228652 Details for Bug 258983 – Makefile 4.2.3

[patch] Makefile 4.2.3

wazuh-agent-4.2.3.diff (text/plain), 14.34 KB, created by Michael on 2021-10-13 07:59:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael

Created: 2021-10-13 07:59:35 UTC

Size: 14.34 KB

patch

obsolete

>diff --git a/security/wazuh-agent/Makefile b/security/wazuh-agent/Makefile
>index f6a809ffb7f5..9f6083c705c0 100644
>--- a/security/wazuh-agent/Makefile
>+++ b/security/wazuh-agent/Makefile
>@@ -1,8 +1,8 @@
> PORTNAME=	wazuh
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	4.1.5
>+DISTVERSION=	4.2.3
> CATEGORIES=	security
>-MASTER_SITES=	https://packages.wazuh.com/deps/11/libraries/sources/
>+MASTER_SITES=	https://packages.wazuh.com/deps/13/libraries/sources/
> PKGNAMESUFFIX=	-agent
> DISTFILES=	cJSON.tar.gz libplist.tar.gz curl.tar.gz libdb.tar.gz libffi.tar.gz \
> 		libyaml.tar.gz openssl.tar.gz procps.tar.gz sqlite.tar.gz zlib.tar.gz \
>@@ -19,15 +19,15 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> BROKEN_aarch64=		fails to compile: rootcheck/os_string.c:188:20: use of undeclared identifier '__LDPGSZ'
> BROKEN_i386=		fails to build external OpenSSL dependency
> 
>-USES=		cpe gmake perl5 readline shebangfix uidfix
>+BUILD_DEPENDS=	curl:ftp/curl
>+
>+USES=		gmake perl5 readline shebangfix uidfix
> USE_GITHUB=	yes
> USE_RC_SUBR=	${PORTNAME}-agent
> 
>-SHEBANG_FILES=	${WRKSRC}/contrib/util.sh \
>-		${WRKSRC}/src/external/openssl/Configurations/unix-checker.pm \
>-		${WRKSRC}/src/init/ossec-client.sh \
>+SHEBANG_FILES=	${WRKSRC}/src/external/openssl/Configurations/unix-checker.pm \
>+		${WRKSRC}/src/init/wazuh-client.sh \
> 		${WRKSRC}/wodles/oscap/oscap.py \
>-		${WRKSRC}/active-response/*.sh
> 
> CONFLICTS_INSTALL=	ossec-*
> 
>@@ -37,13 +37,13 @@ GROUPS=		ossec
> OSSEC_GROUP=	ossec
> OSSEC_USER=	ossec
> 
>-WAZUHMOD750=	/ /logs/ossec /bin /lib /queue /queue/diff /ruleset /ruleset/sca /wodles \
>+WAZUHMOD750=	/ /logs/ossec /logs/wazuh /bin /lib /queue /queue/diff /ruleset /ruleset/sca /wodles \
> 		/active-response /active-response/bin /agentless /var /backup /queue/rids \
>-		/wodles/oscap /wodles/oscap/content
>+		/queue/logcollector /wodles/oscap /wodles/oscap/content
> 
> WAZUHMOD770=	/logs /queue/alerts /queue/fim /queue/fim/db /queue/ossec /etc /etc/shared \
> 		/.ssh /var/run /var/upgrade /var/wodles /var/incoming /queue/ossec/fim \
>-		/queue/ossec/fim/db
>+		/queue/ossec/fim/db /queue/sockets /queue/syscollector /queue/syscollector/db
> 
> WAZUHPREFIX=	/var/ossec
> 
>@@ -57,7 +57,7 @@ post-extract:
> 	done
> 
> do-build:
>-	@cd ${WRKSRC}/src && ${GMAKE} TARGET=agent
>+	@cd ${WRKSRC}/src && ${GMAKE} -j deps && ${GMAKE} TARGET=agent -j
> 
> do-install:
> 	@for mod750 in ${WAZUHMOD750}; do \
>@@ -69,16 +69,14 @@ do-install:
> 	done
> 
> 	${MKDIR} -m 1770 ${STAGEDIR}${WAZUHPREFIX}/tmp
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-logcollector ${STAGEDIR}${WAZUHPREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-syscheckd ${STAGEDIR}${WAZUHPREFIX}/bin
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-execd ${STAGEDIR}${WAZUHPREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-logcollector ${STAGEDIR}${WAZUHPREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-syscheckd ${STAGEDIR}${WAZUHPREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-execd ${STAGEDIR}${WAZUHPREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/manage_agents ${STAGEDIR}${WAZUHPREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-modulesd ${STAGEDIR}${WAZUHPREFIX}/bin/
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/ossec-agentd ${STAGEDIR}${WAZUHPREFIX}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/wazuh-agentd ${STAGEDIR}${WAZUHPREFIX}/bin
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/libwazuhext.so ${STAGEDIR}${WAZUHPREFIX}/lib
> 	${INSTALL_PROGRAM} ${WRKSRC}/src/agent-auth ${STAGEDIR}${WAZUHPREFIX}/bin
>-	${CP} ${WRKSRC}/active-response/*.sh ${STAGEDIR}${WAZUHPREFIX}/active-response/bin/
>-	${CP} ${WRKSRC}/active-response/firewalls/*.sh ${STAGEDIR}${WAZUHPREFIX}/active-response/bin/
> 	${CP} ${WRKSRC}/etc/internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc/
> 	${CP} ${WRKSRC}/etc/local_internal_options.conf ${STAGEDIR}${WAZUHPREFIX}/etc/local_internal_options.conf
> 	${CP} ${WRKSRC}/etc/ossec-agent.conf ${STAGEDIR}${WAZUHPREFIX}/etc/ossec.conf
>@@ -87,10 +85,8 @@ do-install:
> 	${INSTALL_SCRIPT} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/ossec.log
> 	${INSTALL_SCRIPT} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/ossec.json
> 	${INSTALL_SCRIPT} /dev/null ${STAGEDIR}${WAZUHPREFIX}/logs/active-responses.log
>-	${INSTALL_SCRIPT} ${WRKSRC}/contrib/util.sh ${STAGEDIR}${WAZUHPREFIX}/bin/
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/init/ossec-client.sh ${STAGEDIR}${WAZUHPREFIX}/bin/ossec-control
>+	${INSTALL_SCRIPT} ${WRKSRC}/src/init/wazuh-client.sh ${STAGEDIR}${WAZUHPREFIX}/bin/wazuh-control
> 	${INSTALL_SCRIPT} ${WRKSRC}/src/agentlessd/scripts/* ${STAGEDIR}${WAZUHPREFIX}/agentless/
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/rootcheck/db/*.txt ${STAGEDIR}${WAZUHPREFIX}/etc/shared/
> 	${INSTALL_SCRIPT} ${WRKSRC}/etc/wpk_root.pem ${STAGEDIR}${WAZUHPREFIX}/etc/
> 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/oscap/oscap.py ${STAGEDIR}${WAZUHPREFIX}/wodles/oscap
> 	${INSTALL_SCRIPT} ${WRKSRC}/wodles/oscap/template_*.xsl ${STAGEDIR}${WAZUHPREFIX}/wodles/oscap
>diff --git a/security/wazuh-agent/distinfo b/security/wazuh-agent/distinfo
>index 43ec668c2489..14f9894ad308 100644
>--- a/security/wazuh-agent/distinfo
>+++ b/security/wazuh-agent/distinfo
>@@ -1,31 +1,31 @@
>-TIMESTAMP = 1620770195
>-SHA256 (wazuh-4.1.5/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1
>-SIZE (wazuh-4.1.5/cJSON.tar.gz) = 27863
>-SHA256 (wazuh-4.1.5/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c
>-SIZE (wazuh-4.1.5/libplist.tar.gz) = 1520623
>-SHA256 (wazuh-4.1.5/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66
>-SIZE (wazuh-4.1.5/curl.tar.gz) = 3692998
>-SHA256 (wazuh-4.1.5/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b
>-SIZE (wazuh-4.1.5/libdb.tar.gz) = 4283467
>-SHA256 (wazuh-4.1.5/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69
>-SIZE (wazuh-4.1.5/libffi.tar.gz) = 964576
>-SHA256 (wazuh-4.1.5/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a
>-SIZE (wazuh-4.1.5/libyaml.tar.gz) = 424656
>-SHA256 (wazuh-4.1.5/openssl.tar.gz) = a88f46d7dd7b1a88db1faa94943911bf24a0081f90fd1a28bbf06ad54eeab013
>-SIZE (wazuh-4.1.5/openssl.tar.gz) = 12936469
>-SHA256 (wazuh-4.1.5/procps.tar.gz) = 87336a7860f5116ac5c5222b6b0d5c892e202ce136947e4776037bb7670ce6e2
>-SIZE (wazuh-4.1.5/procps.tar.gz) = 55692
>-SHA256 (wazuh-4.1.5/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2
>-SIZE (wazuh-4.1.5/sqlite.tar.gz) = 1980218
>-SHA256 (wazuh-4.1.5/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01
>-SIZE (wazuh-4.1.5/zlib.tar.gz) = 643568
>-SHA256 (wazuh-4.1.5/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434
>-SIZE (wazuh-4.1.5/audit-userspace.tar.gz) = 1682820
>-SHA256 (wazuh-4.1.5/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2
>-SIZE (wazuh-4.1.5/msgpack.tar.gz) = 591294
>-SHA256 (wazuh-4.1.5/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd
>-SIZE (wazuh-4.1.5/bzip2.tar.gz) = 71277
>-SHA256 (wazuh-4.1.5/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa
>-SIZE (wazuh-4.1.5/libpcre2.tar.gz) = 1252173
>-SHA256 (wazuh-4.1.5/wazuh-wazuh-v4.1.5_GH0.tar.gz) = 506161168fc4fdf45988c2e88f9938ac829bb79a441035c9061bf84173c6a179
>-SIZE (wazuh-4.1.5/wazuh-wazuh-v4.1.5_GH0.tar.gz) = 18380705
>+TIMESTAMP = 1634050994
>+SHA256 (wazuh-4.2.3/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1
>+SIZE (wazuh-4.2.3/cJSON.tar.gz) = 27863
>+SHA256 (wazuh-4.2.3/libplist.tar.gz) = 88278d4bdfc1bd6a3a1a55a4f3d933683d2732ba09cf7a749fe8ec8eec406e3c
>+SIZE (wazuh-4.2.3/libplist.tar.gz) = 1520623
>+SHA256 (wazuh-4.2.3/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66
>+SIZE (wazuh-4.2.3/curl.tar.gz) = 3692998
>+SHA256 (wazuh-4.2.3/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b
>+SIZE (wazuh-4.2.3/libdb.tar.gz) = 4283467
>+SHA256 (wazuh-4.2.3/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69
>+SIZE (wazuh-4.2.3/libffi.tar.gz) = 964576
>+SHA256 (wazuh-4.2.3/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a
>+SIZE (wazuh-4.2.3/libyaml.tar.gz) = 424656
>+SHA256 (wazuh-4.2.3/openssl.tar.gz) = a88f46d7dd7b1a88db1faa94943911bf24a0081f90fd1a28bbf06ad54eeab013
>+SIZE (wazuh-4.2.3/openssl.tar.gz) = 12936469
>+SHA256 (wazuh-4.2.3/procps.tar.gz) = 221f395e29d1bdbe4bacc9db39602eee0bae685a935437be0d7feb42e3192d07
>+SIZE (wazuh-4.2.3/procps.tar.gz) = 55897
>+SHA256 (wazuh-4.2.3/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2
>+SIZE (wazuh-4.2.3/sqlite.tar.gz) = 1980218
>+SHA256 (wazuh-4.2.3/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01
>+SIZE (wazuh-4.2.3/zlib.tar.gz) = 643568
>+SHA256 (wazuh-4.2.3/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434
>+SIZE (wazuh-4.2.3/audit-userspace.tar.gz) = 1682820
>+SHA256 (wazuh-4.2.3/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2
>+SIZE (wazuh-4.2.3/msgpack.tar.gz) = 591294
>+SHA256 (wazuh-4.2.3/bzip2.tar.gz) = 27688ee0316a64b39e511b2c224070cad97c394a5f711f9d055fc1809d895bcd
>+SIZE (wazuh-4.2.3/bzip2.tar.gz) = 71277
>+SHA256 (wazuh-4.2.3/libpcre2.tar.gz) = d0bafc3579fa0af0a39951586edfa349e1f4be83d28bed86abe0a3fc4b34fcfa
>+SIZE (wazuh-4.2.3/libpcre2.tar.gz) = 1252173
>+SHA256 (wazuh-4.2.3/wazuh-wazuh-v4.2.3_GH0.tar.gz) = 8d0accb8d5ec61fc4a43e5a7e31df6234932977d8dee4ffaee8284da32ea34b1
>+SIZE (wazuh-4.2.3/wazuh-wazuh-v4.2.3_GH0.tar.gz) = 6281351
>diff --git a/security/wazuh-agent/pkg-plist b/security/wazuh-agent/pkg-plist
>index 1a070d817003..74c951f915e8 100644
>--- a/security/wazuh-agent/pkg-plist
>+++ b/security/wazuh-agent/pkg-plist
>@@ -1,18 +1,3 @@
>-@info(root,ossec,0750) /var/ossec/active-response/bin/default-firewall-drop.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/disable-account.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/firewalld-drop.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/host-deny.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/ip-customblock.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/ipfw.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/ipfw_mac.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/kaspersky.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/npf.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/ossec-slack.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/ossec-tweeter.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/pf.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/restart-ossec.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/restart.sh
>-@info(root,ossec,0750) /var/ossec/active-response/bin/route-null.sh
> @info(root,ossec,0750) /var/ossec/agentless/main.exp
> @info(root,ossec,0750) /var/ossec/agentless/register_host.sh
> @info(root,ossec,0750) /var/ossec/agentless/ssh.exp
>@@ -27,39 +12,17 @@
> @info(root,ossec,0750) /var/ossec/agentless/su.exp
> @info(root,root,0750) /var/ossec/bin/agent-auth
> @info(root,root,0750) /var/ossec/bin/manage_agents
>-@info(root,root,0750) /var/ossec/bin/ossec-agentd
>-@info(root,root,0750) /var/ossec/bin/ossec-control
>-@info(root,root,0750) /var/ossec/bin/ossec-execd
>-@info(root,root,0750) /var/ossec/bin/ossec-logcollector
>-@info(root,root,0750) /var/ossec/bin/ossec-syscheckd
>-@info(root,root,0750) /var/ossec/bin/util.sh
>+@info(root,root,0750) /var/ossec/bin/wazuh-agentd
>+@info(root,root,0750) /var/ossec/bin/wazuh-control
>+@info(root,root,0750) /var/ossec/bin/wazuh-execd
>+@info(root,root,0750) /var/ossec/bin/wazuh-logcollector
> @info(root,root,0750) /var/ossec/bin/wazuh-modulesd
>+@info(root,root,0750) /var/ossec/bin/wazuh-syscheckd
> @info(root,ossec,0640) /var/ossec/etc/client.keys
> @info(root,ossec,0640) /var/ossec/etc/internal_options.conf
> @info(root,ossec,0640) /var/ossec/etc/local_internal_options.conf
> @info(root,ossec,0640) /var/ossec/etc/ossec.conf.sample
> @info(root,ossec,0640) /var/ossec/etc/ossec.conf
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_apache2224_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_debian_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_mysql5-6_community_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_mysql5-6_enterprise_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel5_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel6_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel7_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_rhel_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_sles11_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_sles12_linux_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_domainL1_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_domainL2_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_memberL1_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/cis_win2012r2_memberL2_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/rootkit_files.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/rootkit_trojans.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/system_audit_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/system_audit_ssh.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/win_applications_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/win_audit_rcl.txt
>-@info(root,ossec,0660) /var/ossec/etc/shared/win_malware_rcl.txt
> @info(root,ossec,0640) /var/ossec/etc/wpk_root.pem
> @info(root,ossec,0750) /var/ossec/lib/libwazuhext.so
> @info(ossec,ossec,0666) /var/ossec/logs/active-responses.log
>@@ -78,15 +41,20 @@
> @dir(ossec,ossec,0770) /var/ossec/etc
> @dir(root,ossec,0750) /var/ossec/lib
> @dir(ossec,ossec,0750) /var/ossec/logs/ossec
>+@dir(ossec,ossec,0750) /var/ossec/logs/wazuh
> @dir(ossec,ossec,0770) /var/ossec/logs
> @dir(ossec,ossec,0770) /var/ossec/queue/alerts
> @dir(ossec,ossec,0750) /var/ossec/queue/diff
> @dir(ossec,ossec,0770) /var/ossec/queue/fim/db
> @dir(ossec,ossec,0770) /var/ossec/queue/fim
>+@dir(ossec,ossec,0750) /var/ossec/queue/logcollector
> @dir(ossec,ossec,0770) /var/ossec/queue/ossec/fim/db
> @dir(ossec,ossec,0770) /var/ossec/queue/ossec/fim
> @dir(ossec,ossec,0770) /var/ossec/queue/ossec
> @dir(ossec,ossec,0750) /var/ossec/queue/rids
>+@dir(ossec,ossec,0770) /var/ossec/queue/sockets
>+@dir(ossec,ossec,0770) /var/ossec/queue/syscollector/db
>+@dir(ossec,ossec,0770) /var/ossec/queue/syscollector
> @dir(root,ossec,0750) /var/ossec/queue
> @dir(root,ossec,0750) /var/ossec/ruleset/sca
> @dir(root,ossec,0750) /var/ossec/ruleset

Actions: View | Diff

Attachments on bug 258983: 228498 | 228652