diff options
Diffstat (limited to 'security/caldera')
-rw-r--r-- | security/caldera/Makefile | 36 | ||||
-rw-r--r-- | security/caldera/distinfo | 40 | ||||
-rw-r--r-- | security/caldera/pkg-plist | 39 |
3 files changed, 59 insertions, 56 deletions
diff --git a/security/caldera/Makefile b/security/caldera/Makefile index aa08e3315ba4..6d2f9d8a7e03 100644 --- a/security/caldera/Makefile +++ b/security/caldera/Makefile @@ -1,6 +1,6 @@ PORTNAME= caldera -DISTVERSION= 5.2.0 -PORTREVISION= 3 +DISTVERSION= 5.3.0 +PORTREVISION= 1 CATEGORIES= security python MAINTAINER= acm@FreeBSD.org @@ -12,7 +12,9 @@ CONFLICTS= caldera4 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= npm-node18>0:www/npm-node18 +ONLY_FOR_ARCHS= aarch64 amd64 + +BUILD_DEPENDS= npm-node20>0:www/npm-node20 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}aiohttp-jinja2>0:www/py-aiohttp-jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}aiohttp-session>0:www/py-aiohttp-session@${PY_FLAVOR} \ @@ -55,23 +57,23 @@ USE_GITHUB= yes GH_ACCOUNT= mitre GH_PROJECT= ${PORTNAME} GH_TUPLE= mitre:access:775181b:access/plugins/access \ - mitre:atomic:4f489bb:atomic/plugins/atomic \ + mitre:atomic:b909588:atomic/plugins/atomic \ mitre:builder:2991945:builder/plugins/builder \ mitre:compass:85e2ebf:compass/plugins/compass \ mitre:debrief:eba44d5:debrief/plugins/debrief \ - mitre:emu:4d442bc:emu/plugins/emu \ - mitre:fieldmanual:2eb2e93:fieldmanual/plugins/fieldmanual \ + mitre:emu:fdb0bab:emu/plugins/emu \ + mitre:fieldmanual:83da7cb:fieldmanual/plugins/fieldmanual \ mitre:gameboard:dacb6ce:gameboard/plugins/gameboard \ mitre:human:fd242d7:human/plugins/human \ - mitre:magma:32b5594:magma/plugins/magma \ - mitre:manx:8adc3c8:manx/plugins/manx \ + mitre:magma:66ebf0d:magma/plugins/magma \ + mitre:manx:261f10b:manx/plugins/manx \ mitre:response:8ea6ab5:response/plugins/response \ mitre:sandcat:0a35cd5:sandcat/plugins/sandcat \ mitre:ssl:1ae8431:ssl/plugins/ssl \ - mitre:stockpile:fcd1eea:stockpile/plugins/stockpile \ - mitre:training:37f998f:training/plugins/training + mitre:stockpile:08f37d8:stockpile/plugins/stockpile \ + mitre:training:d4d19a2:training/plugins/training -USES= dos2unix go:run nodejs:18,build python +USES= dos2unix go:run nodejs:20,build python USE_PYTHON= cryptography NO_ARCH= yes @@ -107,11 +109,11 @@ DEPS_CACHE_DIR= ${WRKSRC}/plugins/magma .if (${DEV_UPDATE_MODE} == "yes") NPM_ARGS= install post-build: - @cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX} node_modules - @${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}" + @cd ${DEPS_CACHE_DIR} && ${TAR} czf ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${ARCH}-${DISTVERSION}${EXTRACT_SUFX} node_modules + @${ECHO} "(!!!) Please upload the cache archive: ${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-cache-${ARCH}-${DISTVERSION}${EXTRACT_SUFX}" .else MASTER_SITES+= LOCAL/acm/caldera/:npm_cache -DISTFILES+= ${PORTNAME}-cache-${DISTVERSION}${EXTRACT_SUFX}:npm_cache \ +DISTFILES+= ${PORTNAME}-cache-${ARCH}-${DISTVERSION}${EXTRACT_SUFX}:npm_cache \ ${PORTNAME}-freebsd-logos.tar.gz:npm_cache NPM_ARGS= run build @@ -122,6 +124,9 @@ post-extract: ${RM} -R ${WRKSRC}/.github cd ${WRKSRC} && ${RM} .coveragerc .dockerignore .eslintrc.js .flake8 \ .git* .pre* .stylelintrc.json Dockerfile + +post-build: + ${RM} -r ${WRKSRC}/plugins/magma/node_modules .endif post-patch: @@ -133,9 +138,6 @@ do-build: @cd ${WRKSRC}/plugins/magma && \ ${NPM_BIN} ${NPM_ARGS} -post-build: - ${RM} -r ${WRKSRC}/plugins/magma/node_modules - do-install: @${MKDIR} ${STAGEDIR}/${WWWDIR}/ftp_dir @cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR} diff --git a/security/caldera/distinfo b/security/caldera/distinfo index a43021071a30..aa49d5e7b3ac 100644 --- a/security/caldera/distinfo +++ b/security/caldera/distinfo @@ -1,39 +1,41 @@ -TIMESTAMP = 1741204620 -SHA256 (caldera-cache-5.2.0.tar.gz) = ee654e3efdc95cae9057e5cc81590f503c6a7dca8708102e7e3f416a069d69cf -SIZE (caldera-cache-5.2.0.tar.gz) = 41954338 +TIMESTAMP = 1750745433 +SHA256 (caldera-cache-aarch64-5.3.0.tar.gz) = f43786f5e16ec842f7403033e4c94a423b54cd64add4863200a696030f965f69 +SIZE (caldera-cache-aarch64-5.3.0.tar.gz) = 41661039 +SHA256 (caldera-cache-amd64-5.3.0.tar.gz) = d4a5e26f240f7fde7a33cb9c7f42b025b2904258cb632eeb1a4e5adfb0206586 +SIZE (caldera-cache-amd64-5.3.0.tar.gz) = 41960621 SHA256 (caldera-freebsd-logos.tar.gz) = 66ad2558c34ef06875cfb479a34ca5053b25bad2c36ce06d532d6857b9dda4a2 SIZE (caldera-freebsd-logos.tar.gz) = 2516 -SHA256 (mitre-caldera-5.2.0_GH0.tar.gz) = 902af965960ecfb58b325926ddfafedef1a328ee512a663235a3376abc5a39d9 -SIZE (mitre-caldera-5.2.0_GH0.tar.gz) = 3826121 +SHA256 (mitre-caldera-5.3.0_GH0.tar.gz) = 23f79e83ccf6215bac627f96bed303f09b1759f524a151608279b08574c5eff1 +SIZE (mitre-caldera-5.3.0_GH0.tar.gz) = 3825454 SHA256 (mitre-access-775181b_GH0.tar.gz) = 2ae6e4cbd9e6c143cc76b65c0be3dd332228ab59161422291050eb6f4c4b1d17 SIZE (mitre-access-775181b_GH0.tar.gz) = 11646 -SHA256 (mitre-atomic-4f489bb_GH0.tar.gz) = 340c7931fbee16ce1bf788044018fcf75fe403bf641665bb4aec53d3b1479b2d -SIZE (mitre-atomic-4f489bb_GH0.tar.gz) = 15041 +SHA256 (mitre-atomic-b909588_GH0.tar.gz) = c73afeeac34c76119d7d60813bf06c2e4137675175b4ae25500d5d12f97d3ab5 +SIZE (mitre-atomic-b909588_GH0.tar.gz) = 15069 SHA256 (mitre-builder-2991945_GH0.tar.gz) = d3f78b4966cdbcdab08fdb4499a11a794158706d0178f36176cdbe4281d2bf76 SIZE (mitre-builder-2991945_GH0.tar.gz) = 8423 SHA256 (mitre-compass-85e2ebf_GH0.tar.gz) = 4760171cf05a7fccfd4300815f358d9d42affb2c741e6e555515f07eb50c9f34 SIZE (mitre-compass-85e2ebf_GH0.tar.gz) = 7055 SHA256 (mitre-debrief-eba44d5_GH0.tar.gz) = 62cbfd77cbf3573675bc79426171f136628f26a1ee3f931c02f36d53bda8012e SIZE (mitre-debrief-eba44d5_GH0.tar.gz) = 1006448 -SHA256 (mitre-emu-4d442bc_GH0.tar.gz) = fc61bf08abf1c6dc2f4c941ada317e1cb5592c5818b5918fb517241c2ff5051e -SIZE (mitre-emu-4d442bc_GH0.tar.gz) = 19508 -SHA256 (mitre-fieldmanual-2eb2e93_GH0.tar.gz) = d054558562a926b71ecf798ca8ed9a6cef8ce3010947617ce4a8f10b99f3743d -SIZE (mitre-fieldmanual-2eb2e93_GH0.tar.gz) = 9659767 +SHA256 (mitre-emu-fdb0bab_GH0.tar.gz) = e0d940971d066f9167cb98708758a0c0da4160c46d2cbb04e5a3a0b002f6899d +SIZE (mitre-emu-fdb0bab_GH0.tar.gz) = 19555 +SHA256 (mitre-fieldmanual-83da7cb_GH0.tar.gz) = cf0bab17cd35e3fc8e897c49a4e2d4b3a7affbf24de1a7799c8c3a1cd09ca200 +SIZE (mitre-fieldmanual-83da7cb_GH0.tar.gz) = 9659699 SHA256 (mitre-gameboard-dacb6ce_GH0.tar.gz) = 55e521c4dfc6acc9b8ed37b7622d1c20248cd1fe43a9410e339b8c24729d22ac SIZE (mitre-gameboard-dacb6ce_GH0.tar.gz) = 20333 SHA256 (mitre-human-fd242d7_GH0.tar.gz) = cb838f41377ca51aa1c6a9ea50acbe5781a2e112dc20d4dac6c796f950ec199f SIZE (mitre-human-fd242d7_GH0.tar.gz) = 25971 -SHA256 (mitre-magma-32b5594_GH0.tar.gz) = 1de0ee09378cf6e21ebe95fb564bb0d4ed80f58854d2b0de7683c9d109b7cd15 -SIZE (mitre-magma-32b5594_GH0.tar.gz) = 331823 -SHA256 (mitre-manx-8adc3c8_GH0.tar.gz) = 492f91ed63b353b0b655257ec78eebe8a62479416be0a5e76600935b51775b95 -SIZE (mitre-manx-8adc3c8_GH0.tar.gz) = 7359484 +SHA256 (mitre-magma-66ebf0d_GH0.tar.gz) = 77c9d0775dc09d5d3ac299fc2f5772d4bd5c89776d5fe64ca7ee5a6fe1b2763f +SIZE (mitre-magma-66ebf0d_GH0.tar.gz) = 331927 +SHA256 (mitre-manx-261f10b_GH0.tar.gz) = 058b620fb53b18b38ea43f356feab4b7694f6d8f53f665cd539cf44b7797be89 +SIZE (mitre-manx-261f10b_GH0.tar.gz) = 7358591 SHA256 (mitre-response-8ea6ab5_GH0.tar.gz) = f2275a11ebb631b84da2921e370bf5e5957c304265621c78d27f212269fdc9b5 SIZE (mitre-response-8ea6ab5_GH0.tar.gz) = 25334 SHA256 (mitre-sandcat-0a35cd5_GH0.tar.gz) = 55c29ba5efb811c7a6b068871920f10deadc4f3e887b51dcc2e823ff62044387 SIZE (mitre-sandcat-0a35cd5_GH0.tar.gz) = 8294150 SHA256 (mitre-ssl-1ae8431_GH0.tar.gz) = 608596a05a3c833ac10c230cf4bf0863f0e31540414a66b382ff159f97d7629f SIZE (mitre-ssl-1ae8431_GH0.tar.gz) = 6806 -SHA256 (mitre-stockpile-fcd1eea_GH0.tar.gz) = 79c093060d811c8f72875f04d8a9f0dfa351a18f3344ba0335db6618900adb9c -SIZE (mitre-stockpile-fcd1eea_GH0.tar.gz) = 4787316 -SHA256 (mitre-training-37f998f_GH0.tar.gz) = 41fe37233c02d77435e747e6d34017eeba6c592805382176afaf6f2d1f8f6a46 -SIZE (mitre-training-37f998f_GH0.tar.gz) = 496302 +SHA256 (mitre-stockpile-08f37d8_GH0.tar.gz) = 193cc7c8b2238d70207202798658aeb84460f6488736ce12305689d34463b1a0 +SIZE (mitre-stockpile-08f37d8_GH0.tar.gz) = 4787336 +SHA256 (mitre-training-d4d19a2_GH0.tar.gz) = 896dd32edae10829fc81812183c31a6fdae3aeac9d0e2be40228a7ec03a2ca39 +SIZE (mitre-training-d4d19a2_GH0.tar.gz) = 496309 diff --git a/security/caldera/pkg-plist b/security/caldera/pkg-plist index 002e2663d50b..b16f613464fb 100644 --- a/security/caldera/pkg-plist +++ b/security/caldera/pkg-plist @@ -328,7 +328,6 @@ %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Installing-Caldera.md %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Lateral-Movement-Guide.md %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Learning-the-terminology.md -%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Makefile %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Objectives.md %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Operation-Results.md %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/Parsers.md @@ -349,12 +348,12 @@ %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/debrief_attack_path.png %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/fact_relationships.png %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/img/privileged_persistence_state_machine.png -%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/index.rst.j2 -%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/make.bat +%%WWWDIR%%/plugins/fieldmanual/sphinx-docs/index.rst %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/plugins/.gitkeep %%WWWDIR%%/plugins/fieldmanual/sphinx-docs/resources.rst %%WWWDIR%%/plugins/fieldmanual/static/opener.html %%WWWDIR%%/plugins/fieldmanual/utils/ability_csv.py +%%WWWDIR%%/plugins/fieldmanual/utils/command_lexer.py %%WWWDIR%%/plugins/fieldmanual/utils/plugin_docs.py %%WWWDIR%%/plugins/gameboard/.github/ISSUE_TEMPLATE/bug_report.md %%WWWDIR%%/plugins/gameboard/.github/ISSUE_TEMPLATE/config.yml @@ -413,6 +412,7 @@ %%WWWDIR%%/plugins/magma/.dockerignore %%WWWDIR%%/plugins/magma/.eslintignore %%WWWDIR%%/plugins/magma/.eslintrc.js +%%WWWDIR%%/plugins/magma/.github/pull_request_template.md %%WWWDIR%%/plugins/magma/.github/workflows/update-dist.yml %%WWWDIR%%/plugins/magma/.gitignore %%WWWDIR%%/plugins/magma/LICENSE @@ -420,43 +420,42 @@ %%WWWDIR%%/plugins/magma/app/magma_api.py %%WWWDIR%%/plugins/magma/app/magma_svc.py %%WWWDIR%%/plugins/magma/babel.config.json -%%WWWDIR%%/plugins/magma/dist/assets/access.079d47c0.js +%%WWWDIR%%/plugins/magma/dist/assets/access.56c2edc3.js %%WWWDIR%%/plugins/magma/dist/assets/access.b689ce59.css -%%WWWDIR%%/plugins/magma/dist/assets/atomic.f67fa0a8.js -%%WWWDIR%%/plugins/magma/dist/assets/builder.0c4f3fa8.js +%%WWWDIR%%/plugins/magma/dist/assets/atomic.7c26844c.js +%%WWWDIR%%/plugins/magma/dist/assets/builder.5c58cea4.js %%WWWDIR%%/plugins/magma/dist/assets/caldera-logo-mtn.88f0ff8a.png %%WWWDIR%%/plugins/magma/dist/assets/caldera-logo.6a24b35b.png %%WWWDIR%%/plugins/magma/dist/assets/compass.4b402f52.css -%%WWWDIR%%/plugins/magma/dist/assets/compass.5878a293.js +%%WWWDIR%%/plugins/magma/dist/assets/compass.a370a3c9.js %%WWWDIR%%/plugins/magma/dist/assets/darwin-icon-privileged.ffa7a1c2.svg %%WWWDIR%%/plugins/magma/dist/assets/darwin-icon.95280721.svg %%WWWDIR%%/plugins/magma/dist/assets/debrief.854158fe.css -%%WWWDIR%%/plugins/magma/dist/assets/debrief.c2db373b.js -%%WWWDIR%%/plugins/magma/dist/assets/emu.1a92ff12.js +%%WWWDIR%%/plugins/magma/dist/assets/debrief.a4db073c.js +%%WWWDIR%%/plugins/magma/dist/assets/emu.6b04f78a.js %%WWWDIR%%/plugins/magma/dist/assets/favicon.cc1c341b.ico %%WWWDIR%%/plugins/magma/dist/assets/freebsd-icon-privileged.87e9182a.svg %%WWWDIR%%/plugins/magma/dist/assets/freebsd-icon.9725a3f7.svg %%WWWDIR%%/plugins/magma/dist/assets/gameboard.430857df.css -%%WWWDIR%%/plugins/magma/dist/assets/gameboard.c46dcbd6.js +%%WWWDIR%%/plugins/magma/dist/assets/gameboard.5f972a53.js %%WWWDIR%%/plugins/magma/dist/assets/human.39176c66.css -%%WWWDIR%%/plugins/magma/dist/assets/human.df60521f.js -%%WWWDIR%%/plugins/magma/dist/assets/index.3ad8d0fb.css -%%WWWDIR%%/plugins/magma/dist/assets/index.ba6d4186.js +%%WWWDIR%%/plugins/magma/dist/assets/human.8da2e0a5.js +%%WWWDIR%%/plugins/magma/dist/assets/index.19697514.css +%%WWWDIR%%/plugins/magma/dist/assets/index.cf85ff42.js %%WWWDIR%%/plugins/magma/dist/assets/linux-icon-privileged.d1ede01c.svg %%WWWDIR%%/plugins/magma/dist/assets/linux-icon.df96f069.svg -%%WWWDIR%%/plugins/magma/dist/assets/manx.e79a4b68.js +%%WWWDIR%%/plugins/magma/dist/assets/manx.8218e914.js %%WWWDIR%%/plugins/magma/dist/assets/manx.fdacbfd3.css -%%WWWDIR%%/plugins/magma/dist/assets/response.66965aa6.js +%%WWWDIR%%/plugins/magma/dist/assets/response.731c3c6c.js %%WWWDIR%%/plugins/magma/dist/assets/response.9692d0ec.css -%%WWWDIR%%/plugins/magma/dist/assets/sandcat.94c67fa1.js -%%WWWDIR%%/plugins/magma/dist/assets/ssl.96d67304.js -%%WWWDIR%%/plugins/magma/dist/assets/stockpile.3d299d81.js +%%WWWDIR%%/plugins/magma/dist/assets/sandcat.f4fdbe1f.js +%%WWWDIR%%/plugins/magma/dist/assets/ssl.732e93f0.js +%%WWWDIR%%/plugins/magma/dist/assets/stockpile.6322a205.js +%%WWWDIR%%/plugins/magma/dist/assets/training.5150e70c.js %%WWWDIR%%/plugins/magma/dist/assets/training.9d43ffbb.css -%%WWWDIR%%/plugins/magma/dist/assets/training.f623eb55.js %%WWWDIR%%/plugins/magma/dist/assets/windows-icon-privileged.e4e076e8.svg %%WWWDIR%%/plugins/magma/dist/assets/windows-icon.2e7338a5.svg %%WWWDIR%%/plugins/magma/dist/index.html -%%WWWDIR%%/plugins/magma/docs/skeleton.md %%WWWDIR%%/plugins/magma/hook.py %%WWWDIR%%/plugins/magma/index.html %%WWWDIR%%/plugins/magma/jest.config.js |