Re: mit-krb5/builtin.mk problems on solaris

[Tim Zingelman <tez%netbsd.org@localhost>]

please go ahead, thanks!

On Fri, Oct 25, 2013 at 12:05 PM, Richard PALO <richard.palo%free.fr@localhost> 
wrote:
> Le 25/10/13 14:41, Jörn Clausen a écrit :
>
>> For the record: To use builtin mit-krb5 on Solaris 10, I had to
>> (re)apply the following changes:
>>
>> --- builtin.mk  2013/10/25 12:27:51     1.1
>> +++ builtin.mk  2013/10/25 12:28:14
>> @@ -39,7 +39,7 @@
>>       !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS])
>>   .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
>>   BUILTIN_VERSION.mit-krb5!=     ${SH_KRB5_CONFIG} --version | \
>> -                               ${SED} -e 's/.*release //' -e 's/-.*//'
>> +                               ${SED} -e 's/.*release \([0-9\.]*\).*/\1/'
>>   .  endif
>>   BUILTIN_VERSION.mit-krb5?=     1.4.0
>>   BUILTIN_PKG.mit-krb5=          mit-krb5-${BUILTIN_VERSION.mit-krb5}
>>
>>
>> --- buildlink3.mk       2013/10/25 12:30:41     1.1
>> +++ buildlink3.mk       2013/10/25 12:35:58
>> @@ -5,7 +5,7 @@
>>   .if !defined(MIT_KRB5_BUILDLINK3_MK)
>>   MIT_KRB5_BUILDLINK3_MK:=
>>
>> -BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.4nb1
>> +BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.4
>>   BUILDLINK_PKGSRCDIR.mit-krb5?=         ../../security/mit-krb5
>>   .endif # MIT_KRB5_BUILDLINK3_MK
>>
>>
>> The first change is necessary, because "krb5-config" returns
>>
>> Solaris Kerberos (based on MIT Kerberos 5 release 1.4.0)
>>
>> and the original regex keeps the closing parenthesis. I'm not sure
>> about the second change, but without it, other packages trigger a
>> build of mit-krb5 instead of using the native version.
>>
>>
>
> Difficult top post, but this is indeed odd as in my original post the patch
> intended was:
>>>
>>> richard@x3200:~/src/pkgsrc/security/mit-krb5$ git diff .
>>> diff --git a/security/mit-krb5/builtin.mk b/security/mit-krb5/builtin.mk
>>> index c31837d..c3e754e 100644
>>> --- a/security/mit-krb5/builtin.mk
>>> +++ b/security/mit-krb5/builtin.mk
>>>
>>> @@ -39,7 +39,7 @@ MAKEVARS+=    IS_BUILTIN.mit-krb5
>>>      !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS])
>>>  .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
>>>  BUILTIN_VERSION.mit-krb5!=     ${SH_KRB5_CONFIG} --version | \
>>> -                               ${SED} -e 's/.*release //' -e 's/-.*//'
>>> +               ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
>>>  .  endif
>>>  BUILTIN_VERSION.mit-krb5?=     1.4.0
>>>  BUILTIN_PKG.mit-krb5=          mit-krb5-${BUILTIN_VERSION.mit-krb5}
>
>
> Not sure what happened, looks like it never updated!
> I believe that the orginal patch proposed is needed to ensure that the
> syntax 'x.x.x-xxx' remains supported.
>
> As far as the dropping the nb1 from the version, Tim believed it should have
> worked...  Since I'm running 1.6.3 I have no problems with your plain
> mit-krb5>=1.4, anybody else have an issue?
>
> If not, then I propose pushing the following (including the
> BUILDLINK_CPPFLAGS/LDFLAGS bits):
>
> richard@x3200:~/src/pkgsrc/security/mit-krb5$ cvs diff
> Index: buildlink3.mk
> ===================================================================
> RCS file: /cvsroot/pkgsrc/security/mit-krb5/buildlink3.mk,v
> retrieving revision 1.13
> diff -u -r1.13 buildlink3.mk
> --- buildlink3.mk       12 Oct 2013 04:24:59 -0000      1.13
> +++ buildlink3.mk       25 Oct 2013 17:00:21 -0000
>
> @@ -5,7 +5,7 @@
>  .if !defined(MIT_KRB5_BUILDLINK3_MK)
>  MIT_KRB5_BUILDLINK3_MK:=
>
> -BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.4nb1
> +BUILDLINK_API_DEPENDS.mit-krb5+=       mit-krb5>=1.4
>  BUILDLINK_PKGSRCDIR.mit-krb5?=         ../../security/mit-krb5
>  .endif # MIT_KRB5_BUILDLINK3_MK
>
> Index: builtin.mk
> ===================================================================
> RCS file: /cvsroot/pkgsrc/security/mit-krb5/builtin.mk,v
> retrieving revision 1.7
> diff -u -r1.7 builtin.mk
> --- builtin.mk  8 Apr 2011 17:30:35 -0000       1.7
> +++ builtin.mk  25 Oct 2013 17:00:21 -0000
>
> @@ -39,7 +39,7 @@
>      !empty(IS_BUILTIN.mit-krb5:M[yY][eE][sS])
>  .  if empty(SH_KRB5_CONFIG:M__nonexistent__)
>  BUILTIN_VERSION.mit-krb5!=     ${SH_KRB5_CONFIG} --version | \
> -                               ${SED} -e 's/.*release //' -e 's/-.*//'
> +               ${SED} -e 's/.*release //' -e 's/-.*//' -e 's/).*//'
>  .  endif
>  BUILTIN_VERSION.mit-krb5?=     1.4.0
>  BUILTIN_PKG.mit-krb5=          mit-krb5-${BUILTIN_VERSION.mit-krb5}
> @@ -72,3 +72,22 @@
>
>  .  endif
>  .endif
>  MAKEVARS+=     USE_BUILTIN.mit-krb5
> +
> +###
> +### The section below only applies if we are not including this file
> +### solely to determine whether a built-in implementation exists.
> +###
> +CHECK_BUILTIN.mit-krb5?=       no
> +.if !empty(CHECK_BUILTIN.mit-krb5:M[nN][oO])
> +.  if !empty(USE_BUILTIN.mit-krb5:M[yY][eE][sS])
> +KRB5_CONFIG?=  ${SH_KRB5_CONFIG}
> +ALL_ENV+=      KRB5_CONFIG=${KRB5_CONFIG:Q}
> +
> +BUILDLINK_CPPFLAGS.mit-krb5!=  ${SH_KRB5_CONFIG} --cflags
> +BUILDLINK_LDFLAGS.mit-krb5!=   ${SH_KRB5_CONFIG} --libs
> +.    if ${OPSYS} == "SunOS"
> +BUILDLINK_LDFLAGS.mit-krb5+=   -lgss
> +.    endif
> +.  endif
> +
> +.endif # CHECK_BUILTIN.mit-krb5
>
>