git: 6a6678eefe42 - main - sysutils/libsunacl: Add missing ACEs definition needed by samba

From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Wed, 28 Feb 2024 14:34:20 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6a6678eefe429ff40c7521ccdb93b5c4196f570f

commit 6a6678eefe429ff40c7521ccdb93b5c4196f570f
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-02-07 13:52:34 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-02-28 14:34:13 +0000

    sysutils/libsunacl: Add missing ACEs definition needed by samba
    
    These are needed provision a domain controller on top of ZFS.
    
    PR:             276940
    Approved by:    maintainer timeout
---
 sysutils/libsunacl/Makefile                       |  1 +
 sysutils/libsunacl/files/patch-opensolaris__acl.c | 22 ++++++++++++++++++++++
 sysutils/libsunacl/files/patch-sunacl.h           | 16 ++++++++++++++++
 3 files changed, 39 insertions(+)

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..a9bd766bce95
--- /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_ALLOWED_COMPOUND_ACE_TYPE		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| \