From nobody Thu Jul 13 11:47:27 2023 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 4R1tBl3nssz4n11n; Thu, 13 Jul 2023 11:47:27 +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 4R1tBl3J7Yz3rtd; Thu, 13 Jul 2023 11:47:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689248847; 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=Lo7Pnjq7A0GXrmE7ZDQwMKwn9m8mY5BA3U097LPlfPQ=; b=IkGO7ha1NYUKzVK/1eW20+UOgcz4vlMoyP/HOyD9QwSmQMMPa66d5Gi4+r9c7jbmvTOdIZ zv1Kdp2UfZX0jLloBDAVCXSTAzzeIpAg6tvbTuowawXIu7zegS2lEa1Uzva9ILk+U1fQr5 5iqnjhLzDaR0ZUL9gFE0CbIotjZTaZUTbj5Y4YfaxgwmmgmlCHkqQOxFEklBBc1mMQIaX7 sDbvUf0Rn+ulkevzngTzMtqq6v3m4DcX0B3dyN7F+Se3IX9/P8K3Q7hH3yvaMq3hKVBf3M alWpiQdHV7kPi7otBuzctWwgJnsq+1XsHQy3+NKXCxeqgSbOHyaj1R9RPRT7jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689248847; 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=Lo7Pnjq7A0GXrmE7ZDQwMKwn9m8mY5BA3U097LPlfPQ=; b=QR2QVXoTFwSNmRPwdUOcCxoNJTDdQsSXYpeSl5N64Zt0mNFdPh4DRE7mh6beSIOoFy/Ak5 Z+KCYVHSUBOq401yEsUQ1GyJD51yFogK8BoQ12nDdXnblzTttJ+mSAJoaMOjGR/0hOTFPL ZUXImV94TXzQhVWFCFprH+mQ8X9zpco217Xe/XaVPeYwo2ef4CkfUFWfB6CLoyJRQbtHFA F+O20RHd0Dj0CXqADXq0kFrAemIiVyf7djE2Cu19ekh/96z6XrQM7vtu/WuH1WWV9kNQuo GT1IbiTlADZIjEofx51tnbtRk3g0fcUzmrxKZ6LG6qD2vjm9YDSUsBTVF8D6qQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689248847; a=rsa-sha256; cv=none; b=UuuDBF39cr6tVDwkSWc+TF3YKHcSawZd7A+Q+ZvzUiDSjjMROHAkqfOOTP/ui/BefsMybo 9oycvewBXH/14njXpxqr2Hx3DzlZcR/djl8PGfiG7LGe4rFOr33FMYhtb4/JZbnTxvyNGU ERP/2tpmmWenDn6yho9Jy3ZQT14oFvj/TUfvFGVugNl3X8zEEIACy2ioDhl2VHfu2EIByK wri9MINeP3te92SGL+/sRQXfteWJtdSYV3vD/M+XbSN3MRzKvQYU9agMLHepBjXeswEE1G Mv5NTbwg+rTJq893pHDHjmx1VoDKZwX0djWwQKzIpyjKq8I00PTGCBh7YaLr8Q== 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 4R1tBl2LgCzqZw; Thu, 13 Jul 2023 11:47:27 +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 36DBlRg9047911; Thu, 13 Jul 2023 11:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36DBlR6t047910; Thu, 13 Jul 2023 11:47:27 GMT (envelope-from git) Date: Thu, 13 Jul 2023 11:47:27 GMT Message-Id: <202307131147.36DBlR6t047910@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 0784000f84c7 - 2023Q3 - security/sssd: Fix pkg-plist and chase krb5 update 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: 0mp X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 0784000f84c77ccd98ff973f99b26f61460b9c5e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by 0mp: URL: https://cgit.FreeBSD.org/ports/commit/?id=0784000f84c77ccd98ff973f99b26f61460b9c5e commit 0784000f84c77ccd98ff973f99b26f61460b9c5e Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-07-13 09:43:49 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-07-13 11:46:35 +0000 security/sssd: Fix pkg-plist and chase krb5 update This patch fixes two issues. The first issue was presence of missing files of the SSSDConfig Python module: PKG-INFO, SOURCES.txt, dependency_links., and top_level.txt. It looks like those files are not installed anymore so let's just remove them from pkg-plist. The other issue was the build system not accepting the new version of secruity/krb5. The fix is to patch sssd's build system to accept the new version. This is how we fixed previous incarnations of this bug in the past. PR: 271939 Reported by: ddrinnon@cdor.net Fixes: 7228a09df016 security/krb5: krb5-121 is now default MFH: 2023Q3 Sponsored by: Klara Inc. (cherry picked from commit ae334add4bdb2a871fc604510b1d734ceeb30660) --- security/sssd/Makefile | 2 +- security/sssd/files/patch-src__external__pac_responder.m4 | 5 +++-- security/sssd/pkg-plist | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/security/sssd/Makefile b/security/sssd/Makefile index d9327a78b1d8..b0064eda76ea 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -1,6 +1,6 @@ PORTNAME= sssd PORTVERSION= 1.16.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= security MASTER_SITES= https://releases.pagure.org/SSSD/${PORTNAME}/ diff --git a/security/sssd/files/patch-src__external__pac_responder.m4 b/security/sssd/files/patch-src__external__pac_responder.m4 index 832eb055bf45..94dfde4f335c 100644 --- a/security/sssd/files/patch-src__external__pac_responder.m4 +++ b/security/sssd/files/patch-src__external__pac_responder.m4 @@ -9,7 +9,7 @@ AC_MSG_CHECKING(for supported MIT krb5 version) KRB5_VERSION="`$KRB5_CONFIG --version`" case $KRB5_VERSION in -@@ -19,7 +19,10 @@ then +@@ -19,7 +19,11 @@ then Kerberos\ 5\ release\ 1.14* | \ Kerberos\ 5\ release\ 1.15* | \ Kerberos\ 5\ release\ 1.16* | \ @@ -17,7 +17,8 @@ + Kerberos\ 5\ release\ 1.17* | \ + Kerberos\ 5\ release\ 1.18* | \ + Kerberos\ 5\ release\ 1.19* | \ -+ Kerberos\ 5\ release\ 1.20*) ++ Kerberos\ 5\ release\ 1.20* | \ ++ Kerberos\ 5\ release\ 1.21*) krb5_version_ok=yes AC_MSG_RESULT([yes]) ;; diff --git a/security/sssd/pkg-plist b/security/sssd/pkg-plist index cc7179248ad9..8a2acfc8732a 100644 --- a/security/sssd/pkg-plist +++ b/security/sssd/pkg-plist @@ -34,10 +34,6 @@ 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 -%%SMB%%%%PYTHON_SITELIBDIR%%/SSSDConfig-1.16.5-py%%PYTHON_VER%%.egg-info/PKG-INFO -%%SMB%%%%PYTHON_SITELIBDIR%%/SSSDConfig-1.16.5-py%%PYTHON_VER%%.egg-info/SOURCES.txt -%%SMB%%%%PYTHON_SITELIBDIR%%/SSSDConfig-1.16.5-py%%PYTHON_VER%%.egg-info/dependency_links.txt -%%SMB%%%%PYTHON_SITELIBDIR%%/SSSDConfig-1.16.5-py%%PYTHON_VER%%.egg-info/top_level.txt %%PYTHON_SITELIBDIR%%/SSSDConfig/__init__.py %%PYTHON_SITELIBDIR%%/SSSDConfig/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/SSSDConfig/__pycache__/ipachangeconf.cpython-%%PYTHON_SUFFIX%%.pyc