Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 13 Jul 2023 09:45:11 GMT
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ae334add4bdb - main - security/sssd: Fix pkg-plist and chase krb5 update
Message-ID:  <202307130945.36D9jB4j049954@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ae334add4bdb2a871fc604510b1d734ceeb30660

commit ae334add4bdb2a871fc604510b1d734ceeb30660
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2023-07-13 09:43:49 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2023-07-13 09:43:49 +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.
---
 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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307130945.36D9jB4j049954>