Skip to content

Commit

Permalink
security/sudo: re-add sssd-devel option
Browse files Browse the repository at this point in the history
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
  • Loading branch information
dlangille committed Jan 24, 2024
1 parent 3fa3343 commit 2f448a8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
3 changes: 1 addition & 2 deletions security/sssd-devel/Makefile
@@ -1,5 +1,6 @@
PORTNAME= sssd
PORTVERSION= 2.9.2
PORTREVISION= 1
CATEGORIES= security
PKGNAMESUFFIX= -devel

Expand Down Expand Up @@ -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 \
Expand Down
11 changes: 8 additions & 3 deletions security/sudo/Makefile
@@ -1,6 +1,6 @@
PORTNAME= sudo
PORTVERSION= 1.9.15p5
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= SUDO

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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

Expand Down

0 comments on commit 2f448a8

Please sign in to comment.