From owner-svn-ports-head@freebsd.org Fri Sep 18 02:56:15 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 029409CE2DC; Fri, 18 Sep 2015 02:56:15 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.allbsd.org", Issuer "RapidSSL CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AB29A1B67; Fri, 18 Sep 2015 02:56:13 +0000 (UTC) (envelope-from hrs@FreeBSD.org) Received: from alph.d.allbsd.org (alph.d.allbsd.org [IPv6:2001:2f0:104:e010:862b:2bff:febc:8956] (may be forged)) (authenticated bits=56) by mail.allbsd.org (8.14.9/8.14.9) with ESMTP id t8I2u2Vn034277 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 18 Sep 2015 11:56:03 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.d.allbsd.org (8.15.2/8.14.9) with ESMTPA id t8I2u1HN021598; Fri, 18 Sep 2015 11:56:02 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Fri, 18 Sep 2015 11:55:37 +0900 (JST) Message-Id: <20150918.115537.1252503353168547542.hrs@allbsd.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 From: Hiroki Sato In-Reply-To: References: <4D8645CCEB5F29197DA682A3@ogg.in.absolight.net> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart0(Fri_Sep_18_11_55_37_2015_546)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.98.6 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (mail.allbsd.org [IPv6:2001:2f0:104:e001::32]); Fri, 18 Sep 2015 11:56:07 +0900 (JST) X-Spam-Status: No, score=-98.0 required=13.0 tests=CONTENT_TYPE_PRESENT, RCVD_IN_AHBL, RCVD_IN_AHBL_PROXY, RCVD_IN_AHBL_SPAM, RDNS_NONE, USER_IN_WHITELIST autolearn=no autolearn_force=no version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on gatekeeper.allbsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Sep 2015 02:56:15 -0000 ----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 wrote in : ma> ma> ma> +--On 16 septembre 2015 23:15:28 +0800 Sunpoet Po-Chuan Hsieh ma> wrote: ma> | On Wed, Sep 16, 2015 at 9:12 PM, Mathieu Arnold wrote: ma> | ma> |> +--On 16 septembre 2015 21:07:44 +0800 Sunpoet Po-Chuan Hsieh ma> |> 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 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)----