From nobody Thu Dec 12 20:40:15 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 4Y8PVR27tSz5gk63; Thu, 12 Dec 2024 20:40:15 +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 4Y8PVR1ddXz4H2n; Thu, 12 Dec 2024 20:40:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734036015; 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=I+MIQYwCMyRAxzI0/nFLQSvSycA9thTOu6JpQEK4ZcU=; b=ckq/9jnBslLojJ3LjdRCBylD8Y7GS0SaQCpG4rLPwUE6SOtMVNLGgkbrwwmke6ETEp8EQS A64T9or25I52l4JpWhbF9Uicgok6VspLtj0PtlJMSvabZTeve+sEvYEXjtS0BJvn1hYWPq qXS8lrbqKs8G6ODi54ti8fHZXre0c+NCQIpSDxd2J0AQdSBNCuwLrOM6v1nTboIccqabrs L/cyO/CNDgN1U/lEcQ1XTqSKtDrLu8r7ZY1YFWL0xX2EGSEl81s7NrT1MJfxsiVv5oVcyY zDi6nsjd1OaRv6E+Qadz17+r/6pPwS7AHAceXOycWeZ2JjExROiCajDfJiFSZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734036015; 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=I+MIQYwCMyRAxzI0/nFLQSvSycA9thTOu6JpQEK4ZcU=; b=kS138r5cPPDEb6QlZic5n84ExCBnX7S/7lCmPqRNcVlcveYCg13qMNnxkrAakq3F3u8sAm QSfuAilkoc7Cie78Gs18nsFmTXcO2vZrsWu4VSS3ymXG0TOBm3Jv+QUNvOqybkjZjLHgOL X2yXJw4lV+BtovBI6JRKJf4bBmQAA9LKxCWFT0F2aQBtWdbPRFSbf5hexUstVwY/78pxER FolM4FzDlX+b/oW8KZiZk5GqB4x7gXAq/uHiltBSFJhQ+wVcBDzdTxxMYRjGs69R7hpewB GYuGXANSn1g0PHO4AhW94XiFBlAdY+wQB1P/d32mwUdR2wWy16+FQtRlcTPMlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734036015; a=rsa-sha256; cv=none; b=XnSicZoFxcc+EOW4kX3zEoBX0xep8ESQE+jOwQtqde59xgZzuChRlKu35Si+FhT+bq7Nb5 wEFvvYnrLAPRMx/4G8qF/HCq0JZgFoLvqWhk+J/scZdj4LCswwA4G5TZW3GfFqjWKzZaZl 7PQAnoND5r+cwqTpjKx3n87gj8g2JNW76szN+Vlal7olxX/v0unSaYz8d18bcf6rI2gKOc suCorCDutcI6jnfj17sfKPjpKOTq2JmdwyakLVQ/uydb9UDiYl6/PpkgM7YQjvQweqpTjz QFz+NCq+1MH8ZlvShxLmSJxNJjjdpsMrO/q5/CQu2lZCUIJr/CDkdxfZvymJcA== 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 4Y8PVR1DCRz17Mm; Thu, 12 Dec 2024 20:40:15 +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 4BCKeFun065276; Thu, 12 Dec 2024 20:40:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCKeFHV065267; Thu, 12 Dec 2024 20:40:15 GMT (envelope-from git) Date: Thu, 12 Dec 2024 20:40:15 GMT Message-Id: <202412122040.4BCKeFHV065267@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Cy Schubert Subject: git: 7b20f87790b6 - main - security/aide: Flavorize and add a without ACL flavor 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: cy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7b20f87790b64c5e3c068c4ab055f5f9758db0b7 Auto-Submitted: auto-generated The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=7b20f87790b64c5e3c068c4ab055f5f9758db0b7 commit 7b20f87790b64c5e3c068c4ab055f5f9758db0b7 Author: Cy Schubert AuthorDate: 2024-12-05 00:31:21 +0000 Commit: Cy Schubert CommitDate: 2024-12-12 20:39:51 +0000 security/aide: Flavorize and add a without ACL flavor ZFS supports NFSv4 ACLs and UFS can optionally support them. UFS doesn't by default support ACLs unless specifically enabled. The default remains as before. PR: 283166 --- security/aide/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/security/aide/Makefile b/security/aide/Makefile index c0cf6224f99b..ec7acb4d0ada 100644 --- a/security/aide/Makefile +++ b/security/aide/Makefile @@ -18,8 +18,6 @@ GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS+=--with-mhash \ --with-zlib \ - --with-posix-acl \ - --with-e2fsattrs \ --with-config_file=${PREFIX}/etc/aide.conf CONFIGURE_ENV= YACC="bison -y" \ POSIX_ACL_CFLAGS="-I/usr/include/sys" \ @@ -31,6 +29,17 @@ LDFLAGS+= -lpthread SUB_FILES= pkg-message +FLAVORS= default without_acl +FLAVOR?= ${FLAVORS:[1]} + +.if ${FLAVOR:U} != without_acl +CONFIGURE_ARGS+=--with-posix-acl \ + --with-e2fsattrs +.endif + +default_PKGNAMESUFFIX= +without_acl_PKGNAMESUFFIX= -without_acl + post-install: ${INSTALL_DATA} ${FILESDIR}/aide.conf.freebsd ${STAGEDIR}${PREFIX}/etc/aide.conf.sample ${MKDIR} ${STAGEDIR}/var/db/aide/databases