Date: Fri, 16 Apr 2021 17:12:06 GMT From: =?utf-8?B?RmVybmFuZG8gQXBlc3RlZ3XDrWE=?= <fernape@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 40b825c32468 - 2021Q2 - security/sssd: Fix package with SMB=on Message-ID: <202104161712.13GHC6w9086187@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by fernape: URL: https://cgit.FreeBSD.org/ports/commit/?id=40b825c32468f1f672b190c448e81dcb072e1725 commit 40b825c32468f1f672b190c448e81dcb072e1725 Author: Fernando Apesteguía <fernape@FreeBSD.org> AuthorDate: 2021-04-15 10:52:38 +0000 Commit: Fernando Apesteguía <fernape@FreeBSD.org> CommitDate: 2021-04-16 17:08:00 +0000 security/sssd: Fix package with SMB=on While here, add comment in security/krb5 to remember the obscure dependency in security/sssd so it does not break again. PR: 244778 Reported by: tommyhp2@gmail.com Tested by: tommyhp2@gmail.com MFH: 2021Q2 (build fix) (cherry picked from commit 11964e74b9165c24b41ac8e6960f727d36ac4241) --- security/krb5/Makefile | 2 ++ security/sssd/Makefile | 2 +- security/sssd/files/patch-src__external__pac_responder.m4 | 9 ++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/security/krb5/Makefile b/security/krb5/Makefile index 1cf1648bc3cd..f575aacfc718 100644 --- a/security/krb5/Makefile +++ b/security/krb5/Makefile @@ -1,5 +1,7 @@ VERSIONS= 117 118 119 +# When changing this, remember to build test security/sssd with SMB=on +# Reference: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=244778 KRB5_VERSION?= 119 MASTERDIR= ${.CURDIR}/../krb5-${KRB5_VERSION} diff --git a/security/sssd/Makefile b/security/sssd/Makefile index 85eb2359a59b..050642d6e865 100644 --- a/security/sssd/Makefile +++ b/security/sssd/Makefile @@ -2,7 +2,7 @@ PORTNAME= sssd PORTVERSION= 1.16.5 -PORTREVISION= 1 +PORTREVISION= 2 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 a870a179c34c..870b900c8acf 100644 --- a/security/sssd/files/patch-src__external__pac_responder.m4 +++ b/security/sssd/files/patch-src__external__pac_responder.m4 @@ -1,6 +1,4 @@ -diff --git src/external/pac_responder.m4 src/external/pac_responder.m4 -index dc986a1b8..09efdb139 100644 ---- src/external/pac_responder.m4 +--- src/external/pac_responder.m4.orig 2020-03-17 13:31:28 UTC +++ src/external/pac_responder.m4 @@ -7,7 +7,7 @@ AC_ARG_ENABLE([pac-responder], krb5_version_ok=no @@ -11,13 +9,14 @@ index dc986a1b8..09efdb139 100644 AC_MSG_CHECKING(for supported MIT krb5 version) KRB5_VERSION="`$KRB5_CONFIG --version`" case $KRB5_VERSION in -@@ -19,7 +19,8 @@ +@@ -19,7 +19,9 @@ then Kerberos\ 5\ release\ 1.14* | \ Kerberos\ 5\ release\ 1.15* | \ Kerberos\ 5\ release\ 1.16* | \ - Kerberos\ 5\ release\ 1.17*) + Kerberos\ 5\ release\ 1.17* | \ -+ Kerberos\ 5\ release\ 1.18*) ++ Kerberos\ 5\ release\ 1.18* | \ ++ Kerberos\ 5\ release\ 1.19*) krb5_version_ok=yes AC_MSG_RESULT([yes]) ;;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104161712.13GHC6w9086187>