Date: Sun, 01 Feb 2026 21:21:26 +0000 From: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: eb8074a3ca7e - main - security/caldera: Remove BROKEN. it doesn't depend on marshmallow-emu anymore Message-ID: <697fc3d6.3ba83.7f3c07b9@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=eb8074a3ca7edcdaac1eea45b2d64a9e5a0fd24d commit eb8074a3ca7edcdaac1eea45b2d64a9e5a0fd24d Author: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> AuthorDate: 2026-02-01 20:49:08 +0000 Commit: Jose Alonso Cardenas Marquez <acm@FreeBSD.org> CommitDate: 2026-02-01 21:21:18 +0000 security/caldera: Remove BROKEN. it doesn't depend on marshmallow-emu anymore - Remove marshmallow-emu dependency - Bump PORTREVISION --- security/caldera/Makefile | 6 +----- .../files/patch-app_objects_secondclass-c_fact.py | 19 ++++++++++++++++++ .../files/patch-app_objects_secondclass-c_rule.py | 17 ++++++++++++++++ .../caldera/files/patch-app_utility-base_world.py | 23 ++++++++++++++++++++++ 4 files changed, 60 insertions(+), 5 deletions(-) diff --git a/security/caldera/Makefile b/security/caldera/Makefile index 7ae69ddfa12e..559737e46eac 100644 --- a/security/caldera/Makefile +++ b/security/caldera/Makefile @@ -1,6 +1,6 @@ PORTNAME= caldera DISTVERSION= 5.3.0 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= security python MAINTAINER= acm@FreeBSD.org @@ -12,9 +12,6 @@ CONFLICTS= caldera4 LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -DEPRECATED= Depends on expired devel/py-marshmallow-enum -EXPIRATION_DATE=2026-05-01 - ONLY_FOR_ARCHS= aarch64 amd64 BUILD_DEPENDS= npm-node20>0:www/npm-node20 @@ -34,7 +31,6 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}aiohttp>0:www/py-aiohttp@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}dirhash>0:security/py-dirhash@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}docker>0:sysutils/py-docker@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}donut-shellcode>0:devel/py-donut-shellcode@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}marshmallow-enum>0:devel/py-marshmallow-enum@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ldap3>0:net/py-ldap3@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \ diff --git a/security/caldera/files/patch-app_objects_secondclass-c_fact.py b/security/caldera/files/patch-app_objects_secondclass-c_fact.py new file mode 100644 index 000000000000..c192c8e536f5 --- /dev/null +++ b/security/caldera/files/patch-app_objects_secondclass-c_fact.py @@ -0,0 +1,19 @@ +--- app/objects/secondclass/c_fact.py 2026-02-01 12:32:46.225935000 -0800 ++++ app/objects/secondclass/c_fact.py 2026-02-01 12:33:53.068614000 -0800 +@@ -2,7 +2,6 @@ + from enum import Enum + + import marshmallow as ma +-import marshmallow_enum as ma_enum + + from app.utility.base_object import BaseObject + +@@ -47,7 +46,7 @@ + created = ma.fields.DateTime(format=BaseObject.TIME_FORMAT, dump_only=True) + score = ma.fields.Integer() + source = ma.fields.String(allow_none=True) +- origin_type = ma_enum.EnumField(OriginType, allow_none=True) ++ origin_type = ma.fields.Enum(OriginType, allow_none=True) + links = ma.fields.List(ma.fields.String()) + relationships = ma.fields.List(ma.fields.String()) + limit_count = ma.fields.Integer() diff --git a/security/caldera/files/patch-app_objects_secondclass-c_rule.py b/security/caldera/files/patch-app_objects_secondclass-c_rule.py new file mode 100644 index 000000000000..acea37142418 --- /dev/null +++ b/security/caldera/files/patch-app_objects_secondclass-c_rule.py @@ -0,0 +1,17 @@ +--- app/objects/secondclass/c_rule.py 2026-02-01 12:29:45.348469000 -0800 ++++ app/objects/secondclass/c_rule.py 2026-02-01 12:31:22.350284000 -0800 +@@ -1,5 +1,4 @@ + import marshmallow as ma +-import marshmallow_enum as ma_enum + + from app.utility.base_object import BaseObject + from app.utility.rule_set import RuleAction +@@ -7,7 +6,7 @@ + + class RuleSchema(ma.Schema): + +- action = ma_enum.EnumField(RuleAction, required=True) ++ action = ma.fields.Enum(RuleAction, required=True) + trait = ma.fields.String(required=True) + match = ma.fields.String() + diff --git a/security/caldera/files/patch-app_utility-base_world.py b/security/caldera/files/patch-app_utility-base_world.py new file mode 100644 index 000000000000..51674645b96e --- /dev/null +++ b/security/caldera/files/patch-app_utility-base_world.py @@ -0,0 +1,23 @@ +--- app/utility/base_world.py 2026-02-01 12:36:00.906543000 -0800 ++++ app/utility/base_world.py 2026-02-01 12:36:44.181765000 -0800 +@@ -12,9 +12,7 @@ + from enum import Enum + + import marshmallow as ma +-import marshmallow_enum as ma_enum + +- + class BaseWorld: + """ + A collection of base static functions for service & object module usage +@@ -164,8 +162,8 @@ + + + class AccessSchema(ma.Schema): +- access = ma_enum.EnumField(BaseWorld.Access) ++ access = ma.fields.Enum(BaseWorld.Access) + + + class PrivilegesSchema(ma.Schema): +- privilege = ma_enum.EnumField(BaseWorld.Privileges) ++ privilege = ma.fields.Enum(BaseWorld.Privileges)home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697fc3d6.3ba83.7f3c07b9>