Date: Mon, 1 Apr 2024 13:16:12 GMT From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 7afe28884b8d - main - security/sssd: remove OPTION for expired Samba 4.13 Message-ID: <202404011316.431DGCuJ016583@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=7afe28884b8dea01e20ddc51cbcc18c618532249 commit 7afe28884b8dea01e20ddc51cbcc18c618532249 Author: Rene Ladan <rene@FreeBSD.org> AuthorDate: 2024-04-01 13:14:53 +0000 Commit: Rene Ladan <rene@FreeBSD.org> CommitDate: 2024-04-01 13:14:53 +0000 security/sssd: remove OPTION for expired Samba 4.13 --- security/sssd/Makefile | 25 ++++--------------------- security/sssd/pkg-plist | 10 +--------- 2 files changed, 5 insertions(+), 30 deletions(-) diff --git a/security/sssd/Makefile b/security/sssd/Makefile index 9f36b2c90edf..4ba425fb1bbf 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -1,6 +1,6 @@ PORTNAME= sssd PORTVERSION= 1.16.5 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ @@ -35,10 +35,6 @@ BUILD_DEPENDS= xmlcatalog:textproc/libxml2 \ krb5>=1.10:security/krb5 \ nsupdate:dns/bind-tools -FLAVORS= default smb -FLAVOR?= ${FLAVORS:[1]} -smb_PKGNAMESUFFIX= -smb - GNU_CONFIGURE= yes GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share CONFIGURE_ARGS= ac_cv_prog_PO4A=no \ @@ -57,7 +53,8 @@ CONFIGURE_ARGS= ac_cv_prog_PO4A=no \ --with-gpo-cache-path=/var/db/sss/gpo_cache \ --with-pid-path=/var/run --with-pipe-path=/var/run/sss/pipes \ --with-krb5-conf=/etc/krb5.conf \ - --enable-pammoddir=${PREFIX}/lib + --enable-pammoddir=${PREFIX}/lib \ + --without-samba CFLAGS+= -fstack-protector-all PLIST_SUB= PYTHON_VER=${PYTHON_VER} #DEBUG_FLAGS= -g @@ -79,23 +76,9 @@ SHEBANG_FILES= src/tools/sss_obfuscate \ USE_RC_SUBR= ${PORTNAME} PORTDATA= * -OPTIONS_DEFINE= DOCS SMB +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes -SMB_DESC= Install IPA and AD providers (requires Samba4) -SMB_USES= samba:lib -SMB_CONFIGURE_WITH= samba smb-idmap-interface-version=6 -SMB_LIB_DEPENDS= libndr-nbt.so.0:net/samba413 \ - libndr-krb5pac.so.0:net/samba413 \ - libndr-standard.so.0:net/samba413 \ - libndr.so.1:net/samba413 \ - libsamba-util.so.0:net/samba413 \ - libsmbclient.so.0:net/samba413 - -.if ${FLAVOR} == smb -OPTIONS_DEFAULT+= SMB -.endif - post-patch: @${REINPLACE_CMD} -e 's|NSS_STATUS_NOTFOUND|NS_NOTFOUND|g' \ -e 's|NSS_STATUS_UNAVAIL|NS_UNAVAIL|g' \ diff --git a/security/sssd/pkg-plist b/security/sssd/pkg-plist index 158ec6b360e0..8ee68e8602ba 100644 --- a/security/sssd/pkg-plist +++ b/security/sssd/pkg-plist @@ -10,7 +10,6 @@ include/sss_nss_idmap.h include/sss_sifp.h include/sss_sifp_dbus.h include/wbclient_sssd.h -%%SMB%%lib/krb5/plugins/authdata/sssd_pac_plugin.so lib/krb5/plugins/libkrb5/sssd_krb5_locator_plugin.so lib/libipa_hbac.so lib/libipa_hbac.so.0 @@ -33,7 +32,7 @@ lib/nss_sss.so.1 lib/nss_sss.so.2 lib/nss_sss.so.2.0.0 lib/pam_sss.so -%%NO_SMB%%%%PYTHON_SITELIBDIR%%/SSSDConfig-1.16.5-py%%PYTHON_VER%%.egg-info +%%PYTHON_SITELIBDIR%%/SSSDConfig-1.16.5-py%%PYTHON_VER%%.egg-info %%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.py %%PYTHON_SITELIBDIR%%/SSSDConfig/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/SSSDConfig/__pycache__/ipachangeconf.cpython-%%PYTHON_SUFFIX%%.pyc @@ -42,15 +41,12 @@ lib/pam_sss.so %%PYTHON_SITELIBDIR%%/pysss.so %%PYTHON_SITELIBDIR%%/pysss_murmur.so %%PYTHON_SITELIBDIR%%/pysss_nss_idmap.so -%%SMB%%lib/samba/idmap/winbind_idmap_sss.so lib/shared-modules/ldb/memberof.so -%%SMB%%lib/sssd/libsss_ad.so lib/sssd/conf/sssd.conf lib/sssd/libsss_cert.so lib/sssd/libsss_child.so lib/sssd/libsss_crypt.so lib/sssd/libsss_debug.so -%%SMB%%lib/sssd/libsss_ipa.so lib/sssd/libsss_krb5.so lib/sssd/libsss_krb5_common.so lib/sssd/libsss_ldap.so @@ -69,7 +65,6 @@ libdata/pkgconfig/sss_idmap.pc libdata/pkgconfig/sss_nss_idmap.pc libdata/pkgconfig/sss_simpleifp.pc libdata/pkgconfig/wbclient_sssd.pc -%%SMB%%libexec/sssd/gpo_child libexec/sssd/krb5_child libexec/sssd/ldap_child libexec/sssd/p11_child @@ -78,7 +73,6 @@ libexec/sssd/sss_signal libexec/sssd/sssd_be libexec/sssd/sssd_ifp libexec/sssd/sssd_nss -%%SMB%%libexec/sssd/sssd_pac libexec/sssd/sssd_pam libexec/sssd/sssd_ssh libexec/sssd/sssd_sudo @@ -157,10 +151,8 @@ share/man/ja/man8/sssd.8.gz share/man/man1/sss_ssh_authorizedkeys.1.gz share/man/man1/sss_ssh_knownhostsproxy.1.gz share/man/man5/sss-certmap.5.gz -%%SMB%%share/man/man5/sssd-ad.5.gz share/man/man5/sssd-files.5.gz share/man/man5/sssd-ifp.5.gz -%%SMB%%share/man/man5/sssd-ipa.5.gz share/man/man5/sssd-krb5.5.gz share/man/man5/sssd-ldap.5.gz share/man/man5/sssd-session-recording.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404011316.431DGCuJ016583>