git: 11964e74b916 - main - security/sssd: Fix package with SMB=on

[Fernando Apesteguía]

On Fri, Apr 16, 2021 at 7:10 PM Fernando Apesteguía <fernape at freebsd.org> wrote:
>
> The branch main has been updated by fernape:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=11964e74b9165c24b41ac8e6960f727d36ac4241
>
> commit 11964e74b9165c24b41ac8e6960f727d36ac4241
> Author:     Fernando Apesteguía <fernape at FreeBSD.org>
> AuthorDate: 2021-04-15 10:52:38 +0000
> Commit:     Fernando Apesteguía <fernape at FreeBSD.org>
> CommitDate: 2021-04-16 17:06:28 +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

This should have been 254916. 244778 is the first (closed) PR where
this problem arised.

>     Reported by:    tommyhp2 at gmail.com
>     Tested by:      tommyhp2 at gmail.com
>     MFH:            2021Q2 (build fix)
> ---
>  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 28cf6c520b96..91ad61a0ac8f 100644
> --- a/security/krb5/Makefile
> +++ b/security/krb5/Makefile
> @@ -1,4 +1,6 @@
>  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])
>               ;;