From 9c0cdbb7a1ead8790059bdc4102902cdbb894961 Mon Sep 17 00:00:00 2001 From: Mikael Urankar Date: Wed, 7 Feb 2024 14:52:34 +0100 Subject: [PATCH] sysutils/libsunacl: Add missing ACEs definition needed by samba --- sysutils/libsunacl/Makefile | 1 + .../libsunacl/files/patch-opensolaris__acl.c | 22 +++++++++++++++++++ sysutils/libsunacl/files/patch-sunacl.h | 16 ++++++++++++++ 3 files changed, 39 insertions(+) create mode 100644 sysutils/libsunacl/files/patch-opensolaris__acl.c create mode 100644 sysutils/libsunacl/files/patch-sunacl.h diff --git a/sysutils/libsunacl/Makefile b/sysutils/libsunacl/Makefile index 6117a1e57ee0..e27e0235a244 100644 --- a/sysutils/libsunacl/Makefile +++ b/sysutils/libsunacl/Makefile @@ -1,5 +1,6 @@ PORTNAME= libsunacl PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://github.com/freenas/libsunacl/releases/download/v${PORTVERSION}/ diff --git a/sysutils/libsunacl/files/patch-opensolaris__acl.c b/sysutils/libsunacl/files/patch-opensolaris__acl.c new file mode 100644 index 000000000000..8c8abecc9cbf --- /dev/null +++ b/sysutils/libsunacl/files/patch-opensolaris__acl.c @@ -0,0 +1,22 @@ +--- opensolaris_acl.c 2018-01-12 08:00:20 UTC ++++ opensolaris_acl.c +@@ -154,15 +154,19 @@ acl_from_aces(struct acl *aclp, const ace_t *aces, int + + switch (ace->a_type) { + case ACE_ACCESS_ALLOWED_ACE_TYPE: ++ case ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE: + entry->ae_entry_type = ACL_ENTRY_TYPE_ALLOW; + break; + case ACE_ACCESS_DENIED_ACE_TYPE: ++ case ACE_ACCESS_DENIED_OBJECT_ACE_TYPE: + entry->ae_entry_type = ACL_ENTRY_TYPE_DENY; + break; + case ACE_SYSTEM_AUDIT_ACE_TYPE: ++ case ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE: + entry->ae_entry_type = ACL_ENTRY_TYPE_AUDIT; + break; + case ACE_SYSTEM_ALARM_ACE_TYPE: ++ case ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE: + entry->ae_entry_type = ACL_ENTRY_TYPE_ALARM; + break; + default: diff --git a/sysutils/libsunacl/files/patch-sunacl.h b/sysutils/libsunacl/files/patch-sunacl.h new file mode 100644 index 000000000000..4dd195ce81ae --- /dev/null +++ b/sysutils/libsunacl/files/patch-sunacl.h @@ -0,0 +1,16 @@ +--- sunacl.h.orig 2024-02-07 14:49:41 UTC ++++ sunacl.h +@@ -85,6 +85,13 @@ typedef struct ace { + #define ACE_ACCESS_DENIED_ACE_TYPE 0x0001 + #define ACE_SYSTEM_AUDIT_ACE_TYPE 0x0002 + #define ACE_SYSTEM_ALARM_ACE_TYPE 0x0003 ++#define ACE_TYPE_ALLOWED_COMPOUND 0x0004 ++#define ACE_ACCESS_ALLOWED_OBJECT_ACE_TYPE 0x0005 ++#define ACE_ACCESS_DENIED_OBJECT_ACE_TYPE 0x0006 ++#define ACE_SYSTEM_AUDIT_OBJECT_ACE_TYPE 0x0007 ++#define ACE_SYSTEM_ALARM_OBJECT_ACE_TYPE 0x0008 ++ ++ + + #define ACE_ALL_PERMS (ACE_READ_DATA|ACE_LIST_DIRECTORY|ACE_WRITE_DATA| \ + ACE_ADD_FILE|ACE_APPEND_DATA|ACE_ADD_SUBDIRECTORY|ACE_READ_NAMED_ATTRS| \ -- 2.43.0