diff -ruN wazuh-agent.orig/Makefile wazuh-agent/Makefile --- wazuh-agent.orig/Makefile 2020-07-30 18:16:02.000000000 +0200 +++ wazuh-agent/Makefile 2020-10-28 14:30:03.598720000 +0100 @@ -2,10 +2,9 @@ PORTNAME= wazuh DISTVERSIONPREFIX= v -DISTVERSION= 3.13.1 -PORTREVISION= 1 +DISTVERSION= 4.0.0 CATEGORIES= security -MASTER_SITES= https://packages.wazuh.com/deps/3.13/ +MASTER_SITES= https://packages.wazuh.com/deps/4.0/ PKGNAMESUFFIX= -agent DISTFILES= cJSON.tar.gz src_cpython.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 \ @@ -22,18 +21,16 @@ BROKEN_i386= Fails to build external OpenSSL dependency USES= gmake perl5 readline shebangfix uidfix - USE_GITHUB= yes +USE_RC_SUBR= ${PORTNAME}-agent -CONFLICTS_INSTALL= ossec-* - SHEBANG_FILES= ${WRKSRC}/contrib/util.sh \ ${WRKSRC}/src/external/openssl/Configurations/unix-checker.pm \ ${WRKSRC}/src/init/ossec-client.sh \ ${WRKSRC}/wodles/oscap/oscap.py \ ${WRKSRC}/active-response/*.sh -USE_RC_SUBR= ${PORTNAME}-agent +CONFLICTS_INSTALL= ossec-* USERS= ossec ossecm ossecr GROUPS= ossec @@ -47,8 +44,8 @@ /active-response /active-response/bin /agentless /var /backup /queue/rids \ /wodles/oscap /wodles/oscap/content -WAZUHMOD770= /logs /queue/alerts /queue/ossec /etc /etc/shared /.ssh /var/run /var/upgrade \ - /var/wodles /var/incoming +WAZUHMOD770= /logs /queue/alerts /queue/fim /queue/fim/db /queue/ossec /etc /etc/shared \ + /.ssh /var/run /var/upgrade /var/wodles /var/incoming # extract all extra distfiles in src/external post-extract: diff -ruN wazuh-agent.orig/distinfo wazuh-agent/distinfo --- wazuh-agent.orig/distinfo 2020-07-20 21:04:57.000000000 +0200 +++ wazuh-agent/distinfo 2020-10-24 15:45:49.672207000 +0200 @@ -1,27 +1,27 @@ -TIMESTAMP = 1595244587 -SHA256 (wazuh-3.13.1/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 -SIZE (wazuh-3.13.1/cJSON.tar.gz) = 27863 -SHA256 (wazuh-3.13.1/src_cpython.tar.gz) = f9c72504117058d5b22bedd52ac1d880893ceda62bdab4aa33df9134dfdf6a31 -SIZE (wazuh-3.13.1/src_cpython.tar.gz) = 169308246 -SHA256 (wazuh-3.13.1/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 -SIZE (wazuh-3.13.1/curl.tar.gz) = 3692998 -SHA256 (wazuh-3.13.1/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b -SIZE (wazuh-3.13.1/libdb.tar.gz) = 4283467 -SHA256 (wazuh-3.13.1/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 -SIZE (wazuh-3.13.1/libffi.tar.gz) = 964576 -SHA256 (wazuh-3.13.1/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a -SIZE (wazuh-3.13.1/libyaml.tar.gz) = 424656 -SHA256 (wazuh-3.13.1/openssl.tar.gz) = a88f46d7dd7b1a88db1faa94943911bf24a0081f90fd1a28bbf06ad54eeab013 -SIZE (wazuh-3.13.1/openssl.tar.gz) = 12936469 -SHA256 (wazuh-3.13.1/procps.tar.gz) = 87336a7860f5116ac5c5222b6b0d5c892e202ce136947e4776037bb7670ce6e2 -SIZE (wazuh-3.13.1/procps.tar.gz) = 55692 -SHA256 (wazuh-3.13.1/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2 -SIZE (wazuh-3.13.1/sqlite.tar.gz) = 1980218 -SHA256 (wazuh-3.13.1/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01 -SIZE (wazuh-3.13.1/zlib.tar.gz) = 643568 -SHA256 (wazuh-3.13.1/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 -SIZE (wazuh-3.13.1/audit-userspace.tar.gz) = 1682820 -SHA256 (wazuh-3.13.1/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 -SIZE (wazuh-3.13.1/msgpack.tar.gz) = 591294 -SHA256 (wazuh-3.13.1/wazuh-wazuh-v3.13.1_GH0.tar.gz) = 282b72162ae5b6c95c29ab596079b799c42434ecc7414a52374623bb8ba7bea5 -SIZE (wazuh-3.13.1/wazuh-wazuh-v3.13.1_GH0.tar.gz) = 17218374 +TIMESTAMP = 1603547149 +SHA256 (wazuh-4.0.0/cJSON.tar.gz) = 678d796318da57d5f38075e74bbb3b77375dc3f8bb49da341ad1b43c417e8cc1 +SIZE (wazuh-4.0.0/cJSON.tar.gz) = 27863 +SHA256 (wazuh-4.0.0/src_cpython.tar.gz) = f9c72504117058d5b22bedd52ac1d880893ceda62bdab4aa33df9134dfdf6a31 +SIZE (wazuh-4.0.0/src_cpython.tar.gz) = 169308246 +SHA256 (wazuh-4.0.0/curl.tar.gz) = 78ad4a75fec89dd83c75cf35203c1c757c21cb2a6ff574647b13bf86c8798d66 +SIZE (wazuh-4.0.0/curl.tar.gz) = 3692998 +SHA256 (wazuh-4.0.0/libdb.tar.gz) = 885f01aebcca995bcef48d8dc47acb8c4bd5eab06ec188e76cb5863e4f9b2d9b +SIZE (wazuh-4.0.0/libdb.tar.gz) = 4283467 +SHA256 (wazuh-4.0.0/libffi.tar.gz) = 0e971f64bacc22094e89f034bba075b40ecc2c2c2900eecd7ae85815fd6c9f69 +SIZE (wazuh-4.0.0/libffi.tar.gz) = 964576 +SHA256 (wazuh-4.0.0/libyaml.tar.gz) = 35daad608b372d5ce099f738c0f21bfcc03d6920d92f448386c584e664f1376a +SIZE (wazuh-4.0.0/libyaml.tar.gz) = 424656 +SHA256 (wazuh-4.0.0/openssl.tar.gz) = a88f46d7dd7b1a88db1faa94943911bf24a0081f90fd1a28bbf06ad54eeab013 +SIZE (wazuh-4.0.0/openssl.tar.gz) = 12936469 +SHA256 (wazuh-4.0.0/procps.tar.gz) = 87336a7860f5116ac5c5222b6b0d5c892e202ce136947e4776037bb7670ce6e2 +SIZE (wazuh-4.0.0/procps.tar.gz) = 55692 +SHA256 (wazuh-4.0.0/sqlite.tar.gz) = 23e109ee91ed16b4a95b2d361ecfd82820842fc337a80aa8032590b96eebddd2 +SIZE (wazuh-4.0.0/sqlite.tar.gz) = 1980218 +SHA256 (wazuh-4.0.0/zlib.tar.gz) = ddbeac924cc7fc3274ad0d5cfcf2a72792f0500e9607c65d02e8753f3a510a01 +SIZE (wazuh-4.0.0/zlib.tar.gz) = 643568 +SHA256 (wazuh-4.0.0/audit-userspace.tar.gz) = e82a32e5edf93b055160e14bc97f41dead39287925851dc80a7638e2d4d30434 +SIZE (wazuh-4.0.0/audit-userspace.tar.gz) = 1682820 +SHA256 (wazuh-4.0.0/msgpack.tar.gz) = 06d63bcf32896cd0af5480c401134b1ad1c166fd84ebe5b486e792101ee854e2 +SIZE (wazuh-4.0.0/msgpack.tar.gz) = 591294 +SHA256 (wazuh-4.0.0/wazuh-wazuh-v4.0.0_GH0.tar.gz) = 9cbcade40e194a04c557b4fc552483790eb8ed9882ad4675305f3c6b77c5e1d5 +SIZE (wazuh-4.0.0/wazuh-wazuh-v4.0.0_GH0.tar.gz) = 17652333 diff -ruN wazuh-agent.orig/pkg-plist wazuh-agent/pkg-plist --- wazuh-agent.orig/pkg-plist 2019-09-13 09:45:37.000000000 +0200 +++ wazuh-agent/pkg-plist 2020-10-26 18:27:08.597276000 +0100 @@ -81,6 +81,8 @@ @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,0770) /var/ossec/queue/ossec @dir(ossec,ossec,0750) /var/ossec/queue/rids @dir(root,ossec,0750) /var/ossec/queue