Re: Strange krb5-config output after recent Heimdel import

On 9 May 2008, at 11:31, Pascal Hofstee wrote:

> On Fri, 9 May 2008 18:16:58 +0800
> "Jiawei Ye" <leafy7382_at_gmail.com> wrote:
>
>> Dear All,
>> After recent heimdel import, "krb5-config --libs" results in
>>
>> [root_at_business /usr/src/kerberos5]# krb5-config --libs
>> -L/usr/lib -lkrb5 _at_LIB_pkinit_at_ -lcom_err _at_LIB_hcrypto_appl_at_ -lasn1
>> -lroken -lcrypt _at_LIB_dlopen_at_ _at_LIB_door_create_at_ -lcom_err
>>
>> Before the import, it was:
>>
>> [ leafy_at_sh-mail ~] $ krb5-config --libs
>> -L/usr/lib -lkrb5 -lasn1 -lcrypto -lroken -lcrypt -lcom_err
>>
>> This broke some ports that depends on the output of krb5-config (ex.
>> security/p5-GSSAPI).
>>
>> Could the importer please fix this issue?
>
> Ahh, this explains the gnome-vfs build breakage i observed this
> morning. In my case it was "krb5-config --cflags" causing the build
> breakage.

Try this patch (untested - I'm waiting for my buildworld to complete).

Index: Makefile
===================================================================
RCS file: /home/ncvs/src/kerberos5/usr.bin/krb5-config/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	24 Feb 2005 22:24:24 -0000	1.15
+++ Makefile	9 May 2008 11:08:56 -0000
_at__at_ -7,16 +7,19 _at__at_

  krb5-config: krb5-config.in
  	sed -e "s,_at_PACKAGE\_at_,FreeBSD heimdal,g" \
-	    -e "s,_at_VERSION\_at_,0.6.3,g" \
+	    -e "s,_at_VERSION\_at_,1.1.0,g" \
  	    -e "s,_at_prefix\_at_,/usr,g" \
  	    -e "s,_at_exec_prefix\_at_,/usr,g" \
  	    -e "s,_at_libdir\_at_,${LIBDIR},g" \
  	    -e "s,_at_includedir\_at_,${INCLUDEDIR},g" \
  	    -e "s,_at_LIB_crypt\_at_,-lcrypt,g" \
  	    -e "s,_at_LIB_dbopen\_at_,,g" \
-	    -e "s,_at_LIB_des_appl\_at_,-lcrypto,g" \
-	    -e "s,_at_LIBS\_at_,-lcom_err,g" \
-	    -e "s,_at_INCLUDE_des_at_,,g" \
+	    -e "s,_at_LIB_hcrypto_appl\_at_,-lcrypto,g" \
+	    -e "s,_at_LIB_pkinit\_at_,-lhx509,g" \
+	    -e "s,_at_LIB_dlopen\_at_,,g" \
+	    -e "s,_at_LIB_door_create\_at_,,g" \
+	    -e "s,_at_LIBS\_at_,,g" \
+	    -e "s,_at_INCLUDE_hcrypto_at_,,g" \
  	    ${.ALLSRC} > ${.TARGET}

  .include <bsd.prog.mk>