From nobody Wed Jan 24 21:38:25 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 4TKy4f1STyz58mLS; Wed, 24 Jan 2024 21:38:26 +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 4TKy4f0yqhz4X3c; Wed, 24 Jan 2024 21:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706132306; 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=JfMOhKUF05eL9yi9F4fINLL1HP5ZLK+S7vTgGWNuuLQ=; b=uclf/TO8/dovq/jjL7Rs5WIEAXwn/LLROR7Z0Lhyqfc6jFwRdtoI07NOk2J2Zopy9+UghD Lkkq0v99l7h0OlzOT12345h7F4XHjr+rlsAKIcy27nRgB3ZRY7PgzMRxegCsrspxtoPTTI nDLihWCzqsQI6Xcv/tYtCbmhlEeL+WPuewwIA9jLEO8xgnrGwZrPk5PVcx1Y07FvdL7rBY z4RIBZsnkdWErPiLRWay6yMlrIlEqisCKCreQ51na0wmkv+MM4nJFLwgKqwP1+oaHiiaXu Dvo7dYPXnGXqttXthz0Dd9dINBuornpYRImq/d5QQueKBsFE7rVlrAwwpQWxwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706132306; 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=JfMOhKUF05eL9yi9F4fINLL1HP5ZLK+S7vTgGWNuuLQ=; b=ry4B03YVF/T1aTnvbCYLJgUzKUciHLnQ1UF1pNVpZj6NC/wmdN7vRWLqRfl5hVRPn59KNo ko6PZAP0DOJYpHm+sW9kNJDq4XkRK32Q3ktP9elTdBWisDrQuI41+JdAtcDcJsSViUM0rg nbM1Op/AEVoHP0CIztGXGjams92aWZlRqcSuRo5W2W2GuwnQK2hjCsP9hvr7tulMN+2sGe PeO0JVDycKlOphnQ2ouiuprVu5dH73J/6cpw13q19fvbPN0UoUbol2M/SyOZqqp8L9xN7A Vks7cZLQyj0/j6QSPqVbAn6VzWmHuf3W+Bk552MEIqjuJKWh8clwjncHci5gHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706132306; a=rsa-sha256; cv=none; b=q9Ovm0+9a0zKwWuAnUBaCCMKG1CF/JLK7/I8cf4lGELFT1ElTGCokBOmVtCbnmiwtmsfNm Y3w5lKW/Sas7MnQqEuEb8Uy4VIVr8BDs7o/axi9SMd37WUpZgqnt0w3x9Tv4ceVDO6KYWW P7/JpzcLw79TFAlP28WMiTlGv9MtKasgkyeSIoYAIr469WvJlMtbAAGbff+Qo1+h+WVlRK UmkPKcrdq+3+k+A2my17AnBeQkq94Nr0TKpdkRxitoAjxxUhO8+rKYZg9JITWCO0JGTAqc XvMIF8POPeeyVsTQ6Jr7E5nrwxzDWb49xhhPUN6fTj0qpxSpyuAmBOhMW9DTTQ== 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 4TKy4f01n7zWwC; Wed, 24 Jan 2024 21:38:26 +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 40OLcPJb091643; Wed, 24 Jan 2024 21:38:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OLcPqR091640; Wed, 24 Jan 2024 21:38:25 GMT (envelope-from git) Date: Wed, 24 Jan 2024 21:38:25 GMT Message-Id: <202401242138.40OLcPqR091640@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dan Langille Subject: git: 2f448a87ed31 - main - security/sudo: re-add sssd-devel option 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: dvl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f448a87ed311d7e3bc506c6a42e23da6ad8bfee Auto-Submitted: auto-generated The branch main has been updated by dvl: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f448a87ed311d7e3bc506c6a42e23da6ad8bfee commit 2f448a87ed311d7e3bc506c6a42e23da6ad8bfee Author: Dan Langille AuthorDate: 2024-01-24 21:37:01 +0000 Commit: Dan Langille CommitDate: 2024-01-24 21:37:01 +0000 security/sudo: re-add sssd-devel option sudo already allows for the use of security/sssd (SSSD) This patch allows for selecting security/sssd-devel (SSSD_DEVEL) instead. Also updates security/sssd-devel, elminating a circular dependency. PR: 276598 272571 --- security/sssd-devel/Makefile | 3 +-- security/sudo/Makefile | 11 ++++++++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/security/sssd-devel/Makefile b/security/sssd-devel/Makefile index ab8c12d7dbc1..cda27caa71d9 100644 --- a/security/sssd-devel/Makefile +++ b/security/sssd-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= sssd PORTVERSION= 2.9.2 +PORTREVISION= 1 CATEGORIES= security PKGNAMESUFFIX= -devel @@ -100,8 +101,6 @@ CONFIGURE_ARGS= --disable-dependency-tracking \ --with-gpo-cache-path=/var/db/sss/gpo_cache \ --without-semanage \ --with-app-libs=${LOCALBASE}/lib/sssd/modules \ - --with-sudo \ - --with-sudo-lib-path=${LOCALBASE}/lib \ --without-autofs \ --with-files-provider \ --with-passkey \ diff --git a/security/sudo/Makefile b/security/sudo/Makefile index e4bc49005f18..b955a563575b 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,6 +1,6 @@ PORTNAME= sudo PORTVERSION= 1.9.15p5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= SUDO @@ -32,10 +32,11 @@ LDFLAGS+= -lgcc PORTSCOUT= ignore:1 OPTIONS_DEFINE= AUDIT DISABLE_AUTH DISABLE_ROOT_SUDO DOCS EXAMPLES \ - INSULTS LDAP NLS NOARGS_SHELL OPIE PAM PYTHON SSL SSSD + INSULTS LDAP NLS NOARGS_SHELL OPIE PAM PYTHON SSL OPTIONS_DEFAULT= AUDIT PAM SSL -OPTIONS_RADIO= KERBEROS +OPTIONS_RADIO= KERBEROS SSSD OPTIONS_RADIO_KERBEROS= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT +OPTIONS_RADIO_SSSD= SSSD SSSD_DEVEL OPTIONS_SUB= yes AUDIT_DESC= Enable BSM audit support @@ -48,6 +49,7 @@ OPIE_DESC= Enable one-time passwords (no PAM support) PYTHON_DESC= Enable python plugin support SSL_DESC= Use OpenSSL TLS and SHA2 functions SSSD_DESC= Enable SSSD backend support +SSSD_DEVEL_DESC= Enable SSSD-devel backend support AUDIT_CONFIGURE_WITH= bsm-audit @@ -91,6 +93,9 @@ SSSD_PREVENTS_MSG= sssd requires MIT kerberos and it conflicts with heimdal SSSD_RUN_DEPENDS= sssd:security/sssd SSSD_CONFIGURE_ON= --with-sssd +SSSD_DEVEL_RUN_DEPENDS= sssd:security/sssd-devel +SSSD_DEVEL_CONFIGURE_ON= --with-sssd + LOGFAC?= authpriv SUDO_LDAP_CONF?= ldap.conf