From nobody Sat Dec 21 09:48:53 2024 X-Original-To: dev-commits-ports-all@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 4YFfcj62Vlz5YsJR; Sat, 21 Dec 2024 09:48:53 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YFfcj4j8zz4mW9; Sat, 21 Dec 2024 09:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734774533; 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=O8vOqi4437Q+HDFWuicP4cpB9PitpoNQwZGwqOO7zHk=; b=GWLd1U7tlFsMzgRcdpufHfFW+EgOzRQmcsBLUjuXszDzBLCJmL1oh4eBAwEUsj+zcLzEN9 SZsIHMK6IAjHU1fOrr99XhN4a4ZytTBAdgKL9XyZ/K0vQbooNOjAp88Fs5+MdeUVdKK4EU xrQDQgOlyad31mZa4LGW7aGXfPfQgft3hMnKZoGkqsfPStYmdI+ssaPnlzJY/5CgjhtOQO +XTrU91IYsE5H9MXE+8yDAACtHteFrn/euiHYYjNN2DyX8smMm1neYfixNPl2TuHz4YX4x AE6D+JAU43iBkJUrVmnaiYDOoenXeG6Raa9kNDQmaQ/8DsaqSetozZS3taCvYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734774533; 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=O8vOqi4437Q+HDFWuicP4cpB9PitpoNQwZGwqOO7zHk=; b=WwWEIZ5VFabmWfUweUM6JRU05udN1DX4N+kotwO57xSzogubIfk4X2SlrLqudQ/7z/DJ5h MuQGR2k9B0DmnA9w4ZuWVeUGEgSt/GX/KGLTiXmqqRX1Erjj6z/BRSxj05lb2PcgfCdrC6 NkcuV/mM2XMuKxaJ/DOdYbD2C5zU/ZKDDNPwJfGSEhGDq7uhdONbNdvezwV+uWUfHy4mzv FMXpjRBHf0gSqc6peh7OXKqNbm1Net/IMo+HCyO1Pj8tIcV+tHyOlykcwT+8cLowQHmg52 dQ0lxi0GiMW9P3U54H/Ydv9n5Ik86Re0wVfs3vyn6WTZatw01GJG6AKOKI4sxg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734774533; a=rsa-sha256; cv=none; b=xcbcRpTCNf16RyI3D68K7uZ8CVm3GdckdNsJ5S94OLNUyVIL/mTMo0Z7pcq0wk7BjWBLur /+CElBGVmCryBiSnhRTUBVxEk9V2mRQn/wb6q+MFSjb/FmaqpObXV17kHV9u38YzRJT/KJ QiKLMd7GfMHed16IeWlo+mDRmdkgm3RqKv3HaC/jqGUAYFHxp7UePKDU4ly/wZso3bQy9X /isgF7wDf2azzzjEDl2j8jP0RJIAG2SVa4bL14QAqWfcqeBcCOHTY6HRwfIpEKMnudnivK TgciH37QU59cuDP5tYepzT8TW+tUIjKgAoA04bncTa3P2MUjz0oIRYoBnxKhuw== 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 4YFfcj2KwJzJ9Z; Sat, 21 Dec 2024 09:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BL9mrXI049915; Sat, 21 Dec 2024 09:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BL9mrCC049912; Sat, 21 Dec 2024 09:48:53 GMT (envelope-from git) Date: Sat, 21 Dec 2024 09:48:53 GMT Message-Id: <202412210948.4BL9mrCC049912@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: fcbb4fc76b08 - main - security/caldera-ot: Update to 5.0.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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/main X-Git-Reftype: branch X-Git-Commit: fcbb4fc76b08c025dc5e8a5846f9ca4b5e9e7f95 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcbb4fc76b08c025dc5e8a5846f9ca4b5e9e7f95 commit fcbb4fc76b08c025dc5e8a5846f9ca4b5e9e7f95 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-12-21 09:41:50 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-12-21 09:48:27 +0000 security/caldera-ot: Update to 5.0.0 --- security/caldera-ot/Makefile | 29 ++++++------ security/caldera-ot/distinfo | 28 ++++++------ ...ection_485e97e7-c352-432d-b8d3-fa8460e4fe49.yml | 21 +++++++++ ...ection_51fcfe67-1987-4271-ab2c-70f107328673.yml | 21 +++++++++ ...ection_a5ff2998-1b03-4782-acca-5475af0f7954.yml | 21 +++++++++ ...ection_bd13ac81-b932-463d-95aa-a22aeefbc9ac.yml | 22 +++++++++ ...ection_d6aca3d5-3a10-4e28-9f88-43cc0c8f2b40.yml | 21 +++++++++ ...covery_b93bd80e-3a70-11eb-adc1-0242ac120002.yml | 13 ++---- ...covery_dc103456-4708-4760-acdb-a3882946fbbb.yml | 21 +++++++++ ...nction_1c11848e-205a-42d6-8ca0-203484756435.yml | 21 +++++++++ ...nction_bdbeabd1-0f55-4974-a720-42c15fcb75d9.yml | 21 +++++++++ ...yloads_17f06fa2-44e1-11eb-b378-0242ac130002.yml | 40 ++++++++-------- ...s.txt => patch-iec61850payloads_CMakeLists.txt} | 4 +- ...t => patch-iec61850payloads_app_CMakeLists.txt} | 4 +- ...t => patch-iec61850payloads_lib_CMakeLists.txt} | 4 +- security/caldera-ot/files/pkg-message.in | 2 +- security/caldera-ot/pkg-plist | 53 ++++++++++++---------- 17 files changed, 258 insertions(+), 88 deletions(-) diff --git a/security/caldera-ot/Makefile b/security/caldera-ot/Makefile index fe9ba6f42b7f..e5d5b084d582 100644 --- a/security/caldera-ot/Makefile +++ b/security/caldera-ot/Makefile @@ -1,6 +1,5 @@ PORTNAME= caldera-ot -DISTVERSION= 4.2.0 -PORTREVISION= 13 +DISTVERSION= 5.0.0 CATEGORIES= security python MAINTAINER= acm@FreeBSD.org @@ -12,7 +11,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= bacnet-stack>0:devel/bacnet-stack \ cmake:devel/cmake-core \ - nuitka3:devel/nuitka \ + nuitka:devel/nuitka \ argtable3>0:devel/argtable3 \ libiec61850>0:devel/libiec61850 \ ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ @@ -25,17 +24,18 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyserial>0:comms/py-pyserial@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pnio-dcp>0:devel/py-pnio-dcp@${PY_FLAVOR} \ - caldera4>=4.2.0:security/caldera4 + caldera>=4.2.0:security/caldera USE_GITHUB= yes GH_ACCOUNT= mitre GH_PROJECT= ${PORTNAME} -GH_TAGNAME= 6c6b971d96de121da33f27aa6f80806835346b23 -GH_TUPLE= mitre:bacnet:745432c:bacnet/bacnet \ - mitre:dnp3:01e3748:dnp3/dnp3 \ - mitre:modbus:e47e259:modbus/modbus \ - mitre:iec61850:a72e2c1:iec61850/iec61850 \ - mitre:profinet:7e62daa:profinet/profinet +GH_TAGNAME= 4e8079f9d1764becc9f80edd900fb761d446168f +GH_TUPLE= mitre:bacnet:f01044e:bacnet/bacnet \ + mitre:dnp3:50c5144:dnp3/dnp3 \ + mitre:modbus:51cab77:modbus/modbus \ + mitre:iec61850:0838d8a:iec61850/iec61850 \ + mitre:iec61850-payloads:e5446db:iec61850payloads/iec61850payloads \ + mitre:profinet:b85902a:profinet/profinet USES= compiler:c++11-lang dos2unix python @@ -72,25 +72,26 @@ do-build: ${CC} readprop/main.c -I${LOCALBASE}/include -L${LOCALBASE}/lib \ -lbacnet-stack -o ${WRKSRC}/bacnet/payloads/bacwp-freebsd cd ${WRKDIR}/iec61850-build && \ - cmake ${WRKSRC}/iec61850/src/ -DLOCALBASE=${LOCALBASE} -DBUILD_SYSTEM=ON && \ + cmake ${WRKSRC}/iec61850payloads/ -DLOCALBASE=${LOCALBASE} -DBUILD_SYSTEM=ON && \ cmake --build . cd ${WRKSRC}/modbus/src/src && \ - ${LOCALBASE}/bin/nuitka3 --standalone --onefile \ + ${LOCALBASE}/bin/nuitka --standalone --onefile \ --output-filename=modbus_cli_freebsd --output-dir=${WRKDIR}/modbus_cli-build modbus_cli.py cd ${WRKDIR}/profinet-build && \ - ${LOCALBASE}/bin/nuitka3 --standalone --onefile \ + ${LOCALBASE}/bin/nuitka --standalone --onefile \ --output-filename=dcp_utility_freebsd --output-dir=${WRKDIR}/profinet-build dcp_utility.py do-install: @${MKDIR} ${STAGEDIR}${WWWDIR}/plugins/bacnet @${MKDIR} ${STAGEDIR}${WWWDIR}/plugins/dnp3 @${MKDIR} ${STAGEDIR}${WWWDIR}/plugins/modbus - @${MKDIR} ${STAGEDIR}${WWWDIR}/plugins/iec61850 + @${MKDIR} ${STAGEDIR}${WWWDIR}/plugins/iec61850/src @${MKDIR} ${STAGEDIR}${WWWDIR}/plugins/profinet @cd ${WRKSRC}/bacnet && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/bacnet @cd ${WRKSRC}/dnp3 && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/dnp3 @cd ${WRKSRC}/modbus && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/modbus @cd ${WRKSRC}/iec61850 && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/iec61850 + @cd ${WRKSRC}/iec61850payloads && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/iec61850/src @cd ${WRKSRC}/profinet && ${COPYTREE_SHARE} . ${STAGEDIR}/${WWWDIR}/plugins/profinet ${INSTALL_PROGRAM} ${WRKDIR}/modbus_cli-build/modbus_cli_freebsd \ ${STAGEDIR}/${WWWDIR}/plugins/modbus/payloads/modbus_cli_freebsd diff --git a/security/caldera-ot/distinfo b/security/caldera-ot/distinfo index 376173ddbb79..ed6fe2625436 100644 --- a/security/caldera-ot/distinfo +++ b/security/caldera-ot/distinfo @@ -1,13 +1,15 @@ -TIMESTAMP = 1708238060 -SHA256 (mitre-caldera-ot-4.2.0-6c6b971d96de121da33f27aa6f80806835346b23_GH0.tar.gz) = a4568765b1a373870ae00b781aa251ac94af089b46a3239bf743b0430405844e -SIZE (mitre-caldera-ot-4.2.0-6c6b971d96de121da33f27aa6f80806835346b23_GH0.tar.gz) = 5887 -SHA256 (mitre-bacnet-745432c_GH0.tar.gz) = 60763dc1f3670124f3ec0caf11dd2a3c71def7689c6e90af66864e9924853ad7 -SIZE (mitre-bacnet-745432c_GH0.tar.gz) = 2493167 -SHA256 (mitre-dnp3-01e3748_GH0.tar.gz) = 5324a9910b22dd101ef52b2b48334f67d4e9d1f05a1abaa02b7b097a96dbee64 -SIZE (mitre-dnp3-01e3748_GH0.tar.gz) = 97589582 -SHA256 (mitre-modbus-e47e259_GH0.tar.gz) = 2094210dbf96c0f60d7d5146e4ec7855e19b4bc23b47d51b906aa5961222c14d -SIZE (mitre-modbus-e47e259_GH0.tar.gz) = 38272647 -SHA256 (mitre-iec61850-a72e2c1_GH0.tar.gz) = a75623efb6bdb686ba63615a5861b1e5de8704fe4ba5339bacb54b1e162918be -SIZE (mitre-iec61850-a72e2c1_GH0.tar.gz) = 1140484 -SHA256 (mitre-profinet-7e62daa_GH0.tar.gz) = a7e747ac604dae44d2c5a64e35b9220af0ff42d8b043c818e25e5f3f0f9a34f9 -SIZE (mitre-profinet-7e62daa_GH0.tar.gz) = 24278633 +TIMESTAMP = 1734769609 +SHA256 (mitre-caldera-ot-5.0.0-4e8079f9d1764becc9f80edd900fb761d446168f_GH0.tar.gz) = 35e82a1cb08c1f88724f9c80836ecf5498c065ecce35533f0e85f9ee56d6ddcb +SIZE (mitre-caldera-ot-5.0.0-4e8079f9d1764becc9f80edd900fb761d446168f_GH0.tar.gz) = 539795 +SHA256 (mitre-bacnet-f01044e_GH0.tar.gz) = 72cab1031cfe8788dc735945b18f295b27136e27622eefa0f7ae28e27643eaf9 +SIZE (mitre-bacnet-f01044e_GH0.tar.gz) = 3674254 +SHA256 (mitre-dnp3-50c5144_GH0.tar.gz) = 7d087ecd6ad1d84b35ad0cddf3ce7a92a5b6be27693f9e198571dd547494dd0e +SIZE (mitre-dnp3-50c5144_GH0.tar.gz) = 97590733 +SHA256 (mitre-modbus-51cab77_GH0.tar.gz) = 77f20876ae5a53c3fb33fef79b76e3851daa9a0bb6e8257a1bcaca54b7d8ae36 +SIZE (mitre-modbus-51cab77_GH0.tar.gz) = 38273335 +SHA256 (mitre-iec61850-0838d8a_GH0.tar.gz) = 3da67e8c1797432dc72b5ae10458a5322d84a02e71207f02e4b34ea32870c04b +SIZE (mitre-iec61850-0838d8a_GH0.tar.gz) = 269038 +SHA256 (mitre-iec61850-payloads-e5446db_GH0.tar.gz) = 2dec0029fba79a1fbffdba6da8cbb8b133a7245e8a8e3dcfeac170e066c18915 +SIZE (mitre-iec61850-payloads-e5446db_GH0.tar.gz) = 38886 +SHA256 (mitre-profinet-b85902a_GH0.tar.gz) = 698da698764c4b9a354d7c9a818c6ef566234189ffc3f64e38cdd8498c4e6052 +SIZE (mitre-profinet-b85902a_GH0.tar.gz) = 24279045 diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-collection_485e97e7-c352-432d-b8d3-fa8460e4fe49.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_485e97e7-c352-432d-b8d3-fa8460e4fe49.yml new file mode 100644 index 000000000000..9696199aed70 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_485e97e7-c352-432d-b8d3-fa8460e4fe49.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/collection/485e97e7-c352-432d-b8d3-fa8460e4fe49.yml 2024-12-21 00:57:08.538685000 -0800 ++++ bacnet/data/abilities/collection/485e97e7-c352-432d-b8d3-fa8460e4fe49.yml 2024-12-21 01:02:20.136256000 -0800 +@@ -20,6 +20,11 @@ + name: Point & Tag Identification + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacrpm #{bacnet.device.instance} device #{bacnet.device.instance} 77,121,70,28,76 + linux: + sh: + timeout: 360 +@@ -33,4 +38,4 @@ + command: | + .\bacrpm.exe #{bacnet.device.instance} device #{bacnet.device.instance} 77,121,70,28,76 + payloads: +- - bacrpm.exe +\ No newline at end of file ++ - bacrpm.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-collection_51fcfe67-1987-4271-ab2c-70f107328673.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_51fcfe67-1987-4271-ab2c-70f107328673.yml new file mode 100644 index 000000000000..b28a2ab94199 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_51fcfe67-1987-4271-ab2c-70f107328673.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/collection/51fcfe67-1987-4271-ab2c-70f107328673.yml 2024-12-21 01:00:57.519482000 -0800 ++++ bacnet/data/abilities/collection/51fcfe67-1987-4271-ab2c-70f107328673.yml 2024-12-21 01:02:09.639502000 -0800 +@@ -14,6 +14,11 @@ + name: Automated Collection + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacscov #{bacnet.device.instance} #{bacnet.obj.type} #{bacnet.obj.instance} #{bacnet.scov.process_id} #{bacnet.scov.confirm_status} + linux: + sh: + timeout: 360 +@@ -27,4 +32,4 @@ + command: | + .\bacscov.exe #{bacnet.device.instance} #{bacnet.obj.type} #{bacnet.obj.instance} #{bacnet.scov.process_id} #{bacnet.scov.confirm_status} + payloads: +- - bacscov.exe +\ No newline at end of file ++ - bacscov.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-collection_a5ff2998-1b03-4782-acca-5475af0f7954.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_a5ff2998-1b03-4782-acca-5475af0f7954.yml new file mode 100644 index 000000000000..877ed3c5d5a6 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_a5ff2998-1b03-4782-acca-5475af0f7954.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/collection/a5ff2998-1b03-4782-acca-5475af0f7954.yml 2024-12-21 01:03:05.717078000 -0800 ++++ bacnet/data/abilities/collection/a5ff2998-1b03-4782-acca-5475af0f7954.yml 2024-12-21 01:04:23.529844000 -0800 +@@ -17,6 +17,11 @@ + name: Point & Tag Identification + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacrpm #{bacnet.device.instance} #{bacnet.obj.type} #{bacnet.obj.instance} #{bacnet.obj.property} + linux: + sh: + timeout: 360 +@@ -30,4 +35,4 @@ + command: | + .\bacrpm.exe #{bacnet.device.instance} #{bacnet.obj.type} #{bacnet.obj.instance} #{bacnet.obj.property} + payloads: +- - bacrpm.exe +\ No newline at end of file ++ - bacrpm.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-collection_bd13ac81-b932-463d-95aa-a22aeefbc9ac.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_bd13ac81-b932-463d-95aa-a22aeefbc9ac.yml new file mode 100644 index 000000000000..46ea4dd7e1a7 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_bd13ac81-b932-463d-95aa-a22aeefbc9ac.yml @@ -0,0 +1,22 @@ +--- bacnet/data/abilities/collection/bd13ac81-b932-463d-95aa-a22aeefbc9ac.yml 2024-12-21 01:05:30.887101000 -0800 ++++ bacnet/data/abilities/collection/bd13ac81-b932-463d-95aa-a22aeefbc9ac.yml 2024-12-21 01:05:57.933635000 -0800 +@@ -20,6 +20,12 @@ + name: Point & Tag Identification + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacrpm #{bacnet.device.instance} #{bacnet.object.type} #{bacnet.object.instance} 77,28,85,117 ++ + linux: + sh: + timeout: 360 +@@ -34,4 +40,4 @@ + command: | + .\bacrpm.exe #{bacnet.device.instance} #{bacnet.object.type} #{bacnet.object.instance} 77,28,85,117 + payloads: +- - bacrpm.exe +\ No newline at end of file ++ - bacrpm.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-collection_d6aca3d5-3a10-4e28-9f88-43cc0c8f2b40.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_d6aca3d5-3a10-4e28-9f88-43cc0c8f2b40.yml new file mode 100644 index 000000000000..ff1110f50b7d --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-collection_d6aca3d5-3a10-4e28-9f88-43cc0c8f2b40.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/collection/d6aca3d5-3a10-4e28-9f88-43cc0c8f2b40.yml 2024-12-21 01:06:38.700686000 -0800 ++++ bacnet/data/abilities/collection/d6aca3d5-3a10-4e28-9f88-43cc0c8f2b40.yml 2024-12-21 01:07:00.573524000 -0800 +@@ -14,6 +14,11 @@ + name: Monitor Process State + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacge #{bacnet.device.instance} + linux: + sh: + timeout: 360 +@@ -27,4 +32,4 @@ + command: | + .\bacge.exe #{bacnet.device.instance} + payloads: +- - bacge.exe +\ No newline at end of file ++ - bacge.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_b93bd80e-3a70-11eb-adc1-0242ac120002.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_b93bd80e-3a70-11eb-adc1-0242ac120002.yml index 5cf9f6a5e6eb..97d66765659f 100644 --- a/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_b93bd80e-3a70-11eb-adc1-0242ac120002.yml +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_b93bd80e-3a70-11eb-adc1-0242ac120002.yml @@ -1,6 +1,6 @@ ---- bacnet/data/abilities/discovery/b93bd80e-3a70-11eb-adc1-0242ac120002.yml 2023-10-25 16:36:50.057204000 -0500 -+++ bacnet/data/abilities/discovery/b93bd80e-3a70-11eb-adc1-0242ac120002.yml 2023-10-25 16:38:29.989935000 -0500 -@@ -10,6 +10,11 @@ +--- bacnet/data/abilities/discovery/b93bd80e-3a70-11eb-adc1-0242ac120002.yml 2024-12-21 01:17:29.630383000 -0800 ++++ bacnet/data/abilities/discovery/b93bd80e-3a70-11eb-adc1-0242ac120002.yml 2024-12-21 01:17:51.308327000 -0800 +@@ -14,6 +14,11 @@ name: Remote System Discovery repeatable: True platforms: @@ -12,10 +12,3 @@ linux: sh: timeout: 360 -@@ -23,4 +28,4 @@ - command: | - .\bacwi.exe - payloads: -- - bacwi.exe -\ No newline at end of file -+ - bacwi.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_dc103456-4708-4760-acdb-a3882946fbbb.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_dc103456-4708-4760-acdb-a3882946fbbb.yml new file mode 100644 index 000000000000..dc925a459452 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-discovery_dc103456-4708-4760-acdb-a3882946fbbb.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/discovery/dc103456-4708-4760-acdb-a3882946fbbb.yml 2024-12-21 01:45:18.817141000 -0800 ++++ bacnet/data/abilities/discovery/dc103456-4708-4760-acdb-a3882946fbbb.yml 2024-12-21 01:45:41.938645000 -0800 +@@ -15,6 +15,11 @@ + name: Remote System Information Discovery + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacwh #{bacnet.device.min_instance} #{bacnet.device.max_instance} #{bacnet.obj.name} + linux: + sh: + timeout: 360 +@@ -28,4 +33,4 @@ + command: | + .\bacwh.exe #{bacnet.device.min_instance} #{bacnet.device.max_instance} #{bacnet.obj.name} + payloads: +- - bacwh.exe +\ No newline at end of file ++ - bacwh.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-inhibit-response-function_1c11848e-205a-42d6-8ca0-203484756435.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-inhibit-response-function_1c11848e-205a-42d6-8ca0-203484756435.yml new file mode 100644 index 000000000000..c6b8c877a9f9 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-inhibit-response-function_1c11848e-205a-42d6-8ca0-203484756435.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/inhibit-response-function/1c11848e-205a-42d6-8ca0-203484756435.yml 2024-12-21 01:09:16.664941000 -0800 ++++ bacnet/data/abilities/inhibit-response-function/1c11848e-205a-42d6-8ca0-203484756435.yml 2024-12-21 01:10:09.777612000 -0800 +@@ -21,6 +21,11 @@ + name: Device Restart/Shutdown + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacrd #{bacnet.device.instance} 1 + linux: + sh: + timeout: 360 +@@ -34,4 +39,4 @@ + command: | + .\bacrd.exe #{bacnet.device.instance} 1 + payloads: +- - bacrd.exe +\ No newline at end of file ++ - bacrd.exe diff --git a/security/caldera-ot/files/patch-bacnet-data-abilities-inhibit-response-function_bdbeabd1-0f55-4974-a720-42c15fcb75d9.yml b/security/caldera-ot/files/patch-bacnet-data-abilities-inhibit-response-function_bdbeabd1-0f55-4974-a720-42c15fcb75d9.yml new file mode 100644 index 000000000000..7b5ab314e190 --- /dev/null +++ b/security/caldera-ot/files/patch-bacnet-data-abilities-inhibit-response-function_bdbeabd1-0f55-4974-a720-42c15fcb75d9.yml @@ -0,0 +1,21 @@ +--- bacnet/data/abilities/inhibit-response-function/bdbeabd1-0f55-4974-a720-42c15fcb75d9.yml 2024-12-21 01:09:21.529508000 -0800 ++++ bacnet/data/abilities/inhibit-response-function/bdbeabd1-0f55-4974-a720-42c15fcb75d9.yml 2024-12-21 01:10:28.780129000 -0800 +@@ -21,6 +21,11 @@ + name: Device Restart/Shutdown + repeatable: True + platforms: ++ freebsd: ++ sh: ++ timeout: 360 ++ command: | ++ bacrd #{bacnet.device.instance} 0 + linux: + sh: + timeout: 360 +@@ -34,4 +39,4 @@ + command: | + .\bacrd.exe #{bacnet.device.instance} 0 + payloads: +- - bacrd.exe +\ No newline at end of file ++ - bacrd.exe diff --git a/security/caldera-ot/files/patch-bacnet-payloads_17f06fa2-44e1-11eb-b378-0242ac130002.yml b/security/caldera-ot/files/patch-bacnet-payloads_17f06fa2-44e1-11eb-b378-0242ac130002.yml index 8856a69d707c..7b3bcb9767b0 100644 --- a/security/caldera-ot/files/patch-bacnet-payloads_17f06fa2-44e1-11eb-b378-0242ac130002.yml +++ b/security/caldera-ot/files/patch-bacnet-payloads_17f06fa2-44e1-11eb-b378-0242ac130002.yml @@ -1,29 +1,27 @@ ---- bacnet/payloads/17f06fa2-44e1-11eb-b378-0242ac130002.yml 2023-10-25 18:28:04.475705000 -0500 -+++ bacnet/payloads/17f06fa2-44e1-11eb-b378-0242ac130002.yml 2023-10-25 18:29:24.972817000 -0500 -@@ -21,6 +21,9 @@ - id: 6ecaedd8-656c-11eb-ae93-0242ac130002 +--- bacnet/payloads/17f06fa2-44e1-11eb-b378-0242ac130002.yml 2024-11-19 07:46:05.000000000 -0800 ++++ bacnet/payloads/17f06fa2-44e1-11eb-b378-0242ac130002.yml 2024-12-21 00:19:52.927470000 -0800 +@@ -37,6 +37,9 @@ + id: 2fb72b32-ca32-4397-a706-33ea8f0b5425 - # WriteProp -+ bacwp-freebsd: -+ description: BACnet WriteProperty Service - FreeBSD -+ id: 3781c3ee-738e-11ee-9734-8851fb56e3b2 - bacwp: - description: BACnet WriteProperty Service - Linux - id: 1a2faf5a-4601-11eb-b378-0242ac130002 -@@ -29,6 +32,9 @@ - id: 82b101d4-656c-11eb-ae93-0242ac130002 - - # ReadProp + # ReadProperty + bacrp-freebsd: + description: BACnet ReadProperty Service - FreeBSD + id: 4b6ce399-738e-11ee-9734-8851fb56e3b2 bacrp: description: BACnet ReadProperty Service - Linux id: 748d5c80-5679-11eb-ae93-0242ac130002 -@@ -50,4 +56,4 @@ - id: e2e4d612-656b-11eb-ae93-0242ac130002 - bacarf.exe: - description: BACnet AtomicReadFile - Windows -- id: 938f09a6-656c-11eb-ae93-0242ac130002 +@@ -85,9 +88,12 @@ + id: 6292179e-656c-11eb-ae93-0242ac130002 + + # WriteProperty ++ bacwp-freebsd: ++ description: BACnet WriteProperty Service - FreeBSD ++ id: 3781c3ee-738e-11ee-9734-8851fb56e3b2 + bacwp: + description: BACnet WriteProperty Service - Linux + id: 1a2faf5a-4601-11eb-b378-0242ac130002 + bacwp.exe: + description: BACnet WriteProperty Service - Windows +- id: 82b101d4-656c-11eb-ae93-0242ac130002 \ No newline at end of file -+ id: 938f09a6-656c-11eb-ae93-0242ac130002 ++ id: 82b101d4-656c-11eb-ae93-0242ac130002 diff --git a/security/caldera-ot/files/patch-iec61850_src_CMakeLists.txt b/security/caldera-ot/files/patch-iec61850payloads_CMakeLists.txt similarity index 66% rename from security/caldera-ot/files/patch-iec61850_src_CMakeLists.txt rename to security/caldera-ot/files/patch-iec61850payloads_CMakeLists.txt index ef5f1798367f..66de681158b8 100644 --- a/security/caldera-ot/files/patch-iec61850_src_CMakeLists.txt +++ b/security/caldera-ot/files/patch-iec61850payloads_CMakeLists.txt @@ -1,5 +1,5 @@ ---- iec61850/src/CMakeLists.txt 2024-02-18 01:00:33.415323000 -0500 -+++ iec61850/src/CMakeLists.txt 2024-02-18 01:01:07.721231000 -0500 +--- iec61850payloads/CMakeLists.txt 2024-02-18 01:00:33.415323000 -0500 ++++ iec61850payloads/CMakeLists.txt 2024-02-18 01:01:07.721231000 -0500 @@ -40,6 +40,7 @@ # add build options option(BUILD_TESTS "Build tests" OFF) diff --git a/security/caldera-ot/files/patch-iec61850_src_app_CMakeLists.txt b/security/caldera-ot/files/patch-iec61850payloads_app_CMakeLists.txt similarity index 88% rename from security/caldera-ot/files/patch-iec61850_src_app_CMakeLists.txt rename to security/caldera-ot/files/patch-iec61850payloads_app_CMakeLists.txt index 3ead9f0ebb76..5ce91eb3e517 100644 --- a/security/caldera-ot/files/patch-iec61850_src_app_CMakeLists.txt +++ b/security/caldera-ot/files/patch-iec61850payloads_app_CMakeLists.txt @@ -1,5 +1,5 @@ ---- iec61850/src/app/CMakeLists.txt 2024-02-18 01:01:15.171907000 -0500 -+++ iec61850/src/app/CMakeLists.txt 2024-02-18 01:24:45.179116000 -0500 +--- iec61850payloads/app/CMakeLists.txt 2024-02-18 01:01:15.171907000 -0500 ++++ iec61850payloads/app/CMakeLists.txt 2024-02-18 01:24:45.179116000 -0500 @@ -5,15 +5,16 @@ "${CMAKE_CURRENT_BINARY_DIR}/version.h") diff --git a/security/caldera-ot/files/patch-iec61850_src_lib_CMakeLists.txt b/security/caldera-ot/files/patch-iec61850payloads_lib_CMakeLists.txt similarity index 88% rename from security/caldera-ot/files/patch-iec61850_src_lib_CMakeLists.txt rename to security/caldera-ot/files/patch-iec61850payloads_lib_CMakeLists.txt index c3c1c26d20a7..96a8a2830c90 100644 --- a/security/caldera-ot/files/patch-iec61850_src_lib_CMakeLists.txt +++ b/security/caldera-ot/files/patch-iec61850payloads_lib_CMakeLists.txt @@ -1,5 +1,5 @@ ---- iec61850/src/lib/CMakeLists.txt 2024-02-18 01:24:59.343348000 -0500 -+++ iec61850/src/lib/CMakeLists.txt 2024-02-18 01:28:38.333758000 -0500 +--- iec61850payloads/lib/CMakeLists.txt 2024-02-18 01:24:59.343348000 -0500 ++++ iec61850payloads/lib/CMakeLists.txt 2024-02-18 01:28:38.333758000 -0500 @@ -14,15 +14,16 @@ "${CMAKE_CURRENT_BINARY_DIR}/version.h") diff --git a/security/caldera-ot/files/pkg-message.in b/security/caldera-ot/files/pkg-message.in index 53f6519d89b3..c73a2fe3acc4 100644 --- a/security/caldera-ot/files/pkg-message.in +++ b/security/caldera-ot/files/pkg-message.in @@ -3,7 +3,7 @@ message: <