From nobody Mon Apr 1 13:16:12 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 4V7Wjn2LjJz5GT1r; Mon, 1 Apr 2024 13:16:13 +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 4V7Wjn0RyYz4CSy; Mon, 1 Apr 2024 13:16:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711977373; 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=peMTufIqXn9P9g5dPYSP6ITIiuqgLRYu5Zo+YtyA3LE=; b=JdhPMn/toQcjddI6bq3ueQBKKLgU2P9B3eskTEa6wtVa9099WOfpZ6a7XB7QnvBUVcQkgj K52yvNGkAr8IjT149fJH0pY68Of5x/EK3GMObQQ9m2PEQ2yCjC4Wzk+anqoWG5P9vdXa4/ JoHCzpxKbKsHnHXvoMFrlB3B5fycL736VpIbyEEONdJfRfM4BBEyJUS2pPSdlW4jB+I0Rl S95Xt8CDyT+wNFCU6mROIhLYHSgIWEUL3LDKO1yDeREhCLf2vMKrs4m32yaDxmTDBn7Gix 2t1d+qIG9gUyl6kiMP/lRN8DG7zq2LD0unekLk9ZKkLGAi/4EyRufAT/P60TsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711977373; a=rsa-sha256; cv=none; b=mxWAQIS8lo/rmbRrwqUb9tN29PDOYb6hkfC3MQ3g8TKW34c5yAWj8kC8u7fzIMZybXfWtw joe1Fd9IfLMIx0iR54BIV2zm3XKwrNN0TLo2wmUTUzR6ecZAH255Uk4xmRb4SfGYMZJOVy VC7Bg6l5HfpqvfvC+0v/lpSSZKpCXhTBwD3iMVUAc3kmwSC2ZXwdRc2TbpkR4oo62KwaPI lkF3DN96OWMZnyBbbKsL5CxSEzUeMr7LQad7XrgqHTM53vkoOMprYE5lBI+tvA9WHR5vom FtGbj41NAkFN/NFqyyUZCZXRldPUI37QEJM02lZbj2Wjhkm7D4KkRkJ9y7d4IQ== 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=1711977373; 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=peMTufIqXn9P9g5dPYSP6ITIiuqgLRYu5Zo+YtyA3LE=; b=cL6iPGkKgLwKBnU/E+M3BCKXFXpWA+8LhgQ7pFQBIAwD02n5ZB9a13AlH6HS/3cjwg8ACQ PGeG6htdk4CSNxn8d1iSDZ8NPow1ZP28i87b9AB5Hj+w+GAoQjL9kf/LszCCQGT6AZa0/S /hSYXgvmVYDPU+AP7GT6cotiVtFtIvp+hn6HdSrTSz2cl2lf8Uv3KL/jRptm1k7C4vEfUY fl2CFIUMZH/DDd6qLrY2CIuzAzqwD9kX7aK8lvGnrTuUjBlzJyUx784QFqQZAk8xXZunoT GrcGX+ZVImnoV5aDwJQ8PF5c7n9YNN8q73UTYvPAhJpCM2k1TA/DjR3hF53r6g== 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 4V7Wjm713sz1M9x; Mon, 1 Apr 2024 13:16:12 +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 431DGCQl016586; Mon, 1 Apr 2024 13:16:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431DGCuJ016583; Mon, 1 Apr 2024 13:16:12 GMT (envelope-from git) Date: Mon, 1 Apr 2024 13:16:12 GMT Message-Id: <202404011316.431DGCuJ016583@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rene Ladan Subject: git: 7afe28884b8d - main - security/sssd: remove OPTION for expired Samba 4.13 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7afe28884b8dea01e20ddc51cbcc18c618532249 Auto-Submitted: auto-generated The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=7afe28884b8dea01e20ddc51cbcc18c618532249 commit 7afe28884b8dea01e20ddc51cbcc18c618532249 Author: Rene Ladan AuthorDate: 2024-04-01 13:14:53 +0000 Commit: Rene Ladan 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