From nobody Wed Feb 28 14:34:20 2024 X-Original-To: dev-commits-ports-main@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 4TlH184lz6z5BhL6; Wed, 28 Feb 2024 14:34:20 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TlH1846xTz4lS6; Wed, 28 Feb 2024 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709130860; 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=YwGP5HZMfprbet7/zJQ5VtEctr5ZWmWmsnq5ZYGc+gA=; b=IMRvollRS1xg5nUgzJWLp9T0tSv6AOsqkhCEgGEtSCPvKHYGqqSrXrvzp5X37q2Zdc3cI6 zUcGLN02Ac6wCAbDpKFjRMA/Ll11/bCq1Ikt9HovazIi17lHK81iNU8u0kjo6DtE6PN1Rw RSOtIifo9DoRuAcZHlFig7JYOIghROnpNUE5tgjgcjFqpxD9AsbCevfhawsGC/p6z7lg+u dOGMd6kxRmtum7H08uECm0Y7SkYg2Ww/WsgmUwNHTVXtj0FcWtyGce1ulaKD6JyzWYUv8C rBRsKz05ikW+pc7Ydr2YWMMMOvgXtBZ7IxchECCnhBbE0L2L9dfVTkm5Hnx2xA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709130860; a=rsa-sha256; cv=none; b=hZgZKC2UtkxJ2785fMUPQOKHHPSvaRUHvWU537qae8ECP5NZVPpTdxBHVFmgH68exe2McY 9byqzMF9IACkPrv0OITLFfDHYtUIfJVWMIbmlPTBPq+3ufK0nTO+pFaeYZojrfUomWfFhS FHpejDqCNihqdoIhwMVa9fMwmeKPrLkiWMqG8QtJVbbrlN5fnIQxemENRNZidC/Fu6la0C nT4YhcHpV9mMLJ18wj87VHnhkIh4Yck1Lf1o2u5XOpkuN50wHBbvCpossSy6uQ//ENsNm7 OJ7sR9vN7dWINxHua/85wRXQqvIf38hz1ymlNlUHL3At4Mxlg5niYOyw0s7qtQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709130860; 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=YwGP5HZMfprbet7/zJQ5VtEctr5ZWmWmsnq5ZYGc+gA=; b=n11vvLDQpRn1PhwhVboVEu/QDH2YDyjjSGrNp44T3JsFwmgnx4BKxAD7LDJO8mkgkhBd2D iXZy6XKK9g3nH4mT64L5aNDNOGU9YjKlahOkD44dqxyS1bRl900U4EfM4qpfOYAqyQKyPn yrDvj9bZ/4bOGWDnh3D4l4n4bfto1a7IP3ok11GoS/xtlDQwrjrBPTzMKH07lvSZgSRRFV +OJidzk+bsGsuht8pxf/e8x01s5hJ9txS3DqFDT5QCSTOsErhVYZQL4AvX1VzIqza/JKBA ud8OfPaVhoh1rOrgl/p1o3aPH48/dDXxuWCF+an8gSHWIpr6nGJtV0Sjn0QPFQ== 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 4TlH182tScz114s; Wed, 28 Feb 2024 14:34:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41SEYKUD099291; Wed, 28 Feb 2024 14:34:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41SEYKIp099289; Wed, 28 Feb 2024 14:34:20 GMT (envelope-from git) Date: Wed, 28 Feb 2024 14:34:20 GMT Message-Id: <202402281434.41SEYKIp099289@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: 6a6678eefe42 - main - sysutils/libsunacl: Add missing ACEs definition needed by samba List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6a6678eefe429ff40c7521ccdb93b5c4196f570f Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=6a6678eefe429ff40c7521ccdb93b5c4196f570f commit 6a6678eefe429ff40c7521ccdb93b5c4196f570f Author: Mikael Urankar AuthorDate: 2024-02-07 13:52:34 +0000 Commit: Mikael Urankar 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| \