Date: Fri, 18 Sep 2015 11:55:37 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: mat@FreeBSD.org Cc: sunpoet@freebsd.org, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r397042 - in head/dns: bind910 bind910/files bind99 bind99/files Message-ID: <20150918.115537.1252503353168547542.hrs@allbsd.org> In-Reply-To: <DA0B191C8CF71DE1BD469AB2@ogg.in.absolight.net> References: <4D8645CCEB5F29197DA682A3@ogg.in.absolight.net> <CAMHz58SRw7NwBuRh6uhSV4qShWYxutmPO0FjoCeoT-QavKC2_w@mail.gmail.com> <DA0B191C8CF71DE1BD469AB2@ogg.in.absolight.net>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart0(Fri_Sep_18_11_55_37_2015_546)-- Content-Type: Multipart/Mixed; boundary="--Next_Part(Fri_Sep_18_11_55_37_2015_045)--" Content-Transfer-Encoding: 7bit ----Next_Part(Fri_Sep_18_11_55_37_2015_045)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Mathieu Arnold <mat@FreeBSD.org> wrote in <DA0B191C8CF71DE1BD469AB2@ogg.in.absolight.net>: ma> ma> ma> +--On 16 septembre 2015 23:15:28 +0800 Sunpoet Po-Chuan Hsieh ma> <sunpoet@freebsd.org> wrote: ma> | On Wed, Sep 16, 2015 at 9:12 PM, Mathieu Arnold <mat@freebsd.org> wrote: ma> | ma> |> +--On 16 septembre 2015 21:07:44 +0800 Sunpoet Po-Chuan Hsieh ma> |> <sunpoet@freebsd.org> wrote: ma> |> | Hi Mat, ma> |> | ma> |> | I got an error message about USES=libedit. ma> |> | Could you please take a look? ma> |> | Thanks! ma> |> ma> |> I can't reproduce. ma> |> ma> |> -- ma> |> Mathieu Arnold ma> | ma> | ma> | Try this option combination. ma> | ma> | dns_bind910_SET=FILTER_AAAA FIXED_RRSET GSSAPI_BASE IPV6 LARGE_FILE ma> | NEWSTATS RPZ_NSDNAME RPZ_NSIP RRL SIGCHASE SSL THREADS ma> ma> Mmm, ok, building with GSSAPI_BASE breaks USES=libedit, because USES=gssapi ma> fiddles with CFLAGS and puts -I/usr/include before everything. ma> ma> Adding hrs@ to the CC so he can have a look. The attached patch should fix it. I confirmed it built with GSSAPI_BASE or GSSAPI_HEIMDAL. Patch for configure is the same as one in PR 193912. -- Hiroki ----Next_Part(Fri_Sep_18_11_55_37_2015_045)-- Content-Type: Text/X-Patch; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="dns_bind910_gssapi.20150918-1.diff" Index: dns/bind910/Makefile =================================================================== --- dns/bind910/Makefile (revision 397209) +++ dns/bind910/Makefile (working copy) @@ -172,13 +172,13 @@ GSSAPI_BASE_USES= gssapi GSSAPI_BASE_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_HEIMDAL_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= \ - --with-gssapi=${GSSAPIBASEDIR} ${GSSAPI_CONFIGURE_ARGS} + --with-gssapi=${GSSAPIBASEDIR} KRB5CONFIG="${KRB5CONFIG}" GSSAPI_NONE_CONFIGURE_ON= --without-gssapi .include <bsd.port.options.mk> Index: dns/bind910/files/patch-configure =================================================================== --- dns/bind910/files/patch-configure (revision 397209) +++ dns/bind910/files/patch-configure (working copy) @@ -1,10 +1,68 @@ ---- configure.orig 2015-09-09 02:23:40 UTC -+++ configure -@@ -14105,6 +14105,7 @@ done - "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ - "-lgssapi" \ - "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ -+ "-lkrb5 -lgssapi_krb5 -lkrb5support -lk5crypto -lcom_err" \ - "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ - "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ +--- configure.orig 2015-09-09 11:23:40.000000000 +0900 ++++ configure 2015-09-18 09:08:41.023192000 +0900 +@@ -14100,15 +14100,7 @@ + # problems start to show up. + saved_libs="$LIBS" + for TRY_LIBS in \ +- "-lgssapi_krb5" \ +- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err" \ +- "-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err -lresolv" \ +- "-lgssapi" \ +- "-lgssapi -lkrb5 -ldes -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lgssapi_krb5 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgssapi -lkrb5 -lhx509 -lcrypto -lcrypt -lasn1 -lroken -lcom_err" \ +- "-lgss -lkrb5" ++ "$($KRB5CONFIG gssapi --libs)" + do + # Note that this does not include $saved_libs, because + # on FreeBSD machines this configure script has added +@@ -14163,47 +14155,7 @@ + no) as_fn_error $? "could not determine proper GSSAPI linkage" "$LINENO" 5 ;; + esac + +- # +- # XXXDCL Major kludge. Tries to cope with KTH in /usr/lib +- # but MIT in /usr/local/lib and trying to build with KTH. +- # /usr/local/lib can end up earlier on the link lines. +- # Like most kludges, this one is not only inelegant it +- # is also likely to be the wrong thing to do at least as +- # many times as it is the right thing. Something better +- # needs to be done. +- # +- if test "$use_gssapi" = "/usr" -a \ +- -f /usr/local/lib/libkrb5.a; then +- FIX_KTH_VS_MIT=yes +- fi +- +- case "$FIX_KTH_VS_MIT" in +- yes) +- case "$enable_static_linking" in +- yes) gssapi_lib_suffix=".a" ;; +- *) gssapi_lib_suffix=".so" ;; +- esac +- +- for lib in $LIBS; do +- case $lib in +- -L*) +- ;; +- -l*) +- new_lib=`echo $lib | +- sed -e s%^-l%$use_gssapi/lib/lib% \ +- -e s%$%$gssapi_lib_suffix%` +- NEW_LIBS="$NEW_LIBS $new_lib" +- ;; +- *) +- as_fn_error $? "KTH vs MIT Kerberos confusion!" "$LINENO" 5 +- ;; +- esac +- done +- LIBS="$NEW_LIBS" +- ;; +- esac +- +- DST_GSSAPI_INC="-I$use_gssapi/include" ++ DST_GSSAPI_INC="$(KRB5CONFIG gssapi --cflags)" + DNS_GSSAPI_LIBS="$LIBS" + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: using GSSAPI from $use_gssapi/lib and $use_gssapi/include" >&5 ----Next_Part(Fri_Sep_18_11_55_37_2015_045)---- ----Security_Multipart0(Fri_Sep_18_11_55_37_2015_546)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlX7fSkACgkQTyzT2CeTzy0j2gCfRiPO++FReTwIZ4hTJwQrd50H 1fsAniusKa7YU06Ua3L4GGcFCynl94ra =zU1h -----END PGP SIGNATURE----- ----Security_Multipart0(Fri_Sep_18_11_55_37_2015_546)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20150918.115537.1252503353168547542.hrs>