Date: Sun, 6 Jan 2013 16:37:52 +0000 (UTC) From: Hajimu UMEMOTO <ume@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310000 - head/security/cyrus-sasl2/files Message-ID: <201301061637.r06GbqHA074534@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ume Date: Sun Jan 6 16:37:52 2013 New Revision: 310000 URL: http://svnweb.freebsd.org/changeset/ports/310000 Log: Use proper krb5-config when using HEIMDAL in ports. Modified: head/security/cyrus-sasl2/files/patch-configure head/security/cyrus-sasl2/files/patch-saslauthd::configure Modified: head/security/cyrus-sasl2/files/patch-configure ============================================================================== --- head/security/cyrus-sasl2/files/patch-configure Sun Jan 6 16:33:18 2013 (r309999) +++ head/security/cyrus-sasl2/files/patch-configure Sun Jan 6 16:37:52 2013 (r310000) @@ -1,7 +1,7 @@ Index: configure diff -u configure.orig configure ---- configure.orig 2011-09-07 22:29:25.000000000 +0900 -+++ configure 2011-09-14 15:48:43.574171984 +0900 +--- configure.orig 2012-11-07 04:21:37.000000000 +0900 ++++ configure 2013-01-06 17:10:15.920678021 +0900 @@ -2365,6 +2365,7 @@ fi { $as_echo "$as_me:$LINENO: result: yes" >&5 @@ -18,7 +18,7 @@ diff -u configure.orig configure #include <db.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" -@@ -7139,6 +7141,7 @@ +@@ -7156,6 +7158,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -26,7 +26,7 @@ diff -u configure.orig configure #include <db.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" -@@ -8666,6 +8669,8 @@ +@@ -8700,6 +8703,8 @@ SASLAUTHD_TRUE='#' SASLAUTHD_FALSE= fi @@ -35,25 +35,33 @@ diff -u configure.orig configure { $as_echo "$as_me:$LINENO: checking if I should include saslauthd" >&5 $as_echo_n "checking if I should include saslauthd... " >&6; } -@@ -12537,7 +12542,7 @@ +@@ -12552,6 +12557,7 @@ + gssapi_dir="${gssapi}/lib" + GSSAPIBASE_LIBS="-L$gssapi_dir" + GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir" ++ gssapi_bindir="${gssapi}/bin/" + else + # FIXME: This is only used for building cyrus, and then only as + # a real hack. it needs to be fixed. +@@ -12571,7 +12577,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" -+LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS" ++LIBS="${GSSAPIBASE_LIBS} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13013,7 +13018,7 @@ +@@ -13047,7 +13053,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" - GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" -+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`" ++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}krb5-config --libs gssapi`" GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -14358,7 +14363,7 @@ +@@ -14479,7 +14485,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS Modified: head/security/cyrus-sasl2/files/patch-saslauthd::configure ============================================================================== --- head/security/cyrus-sasl2/files/patch-saslauthd::configure Sun Jan 6 16:33:18 2013 (r309999) +++ head/security/cyrus-sasl2/files/patch-saslauthd::configure Sun Jan 6 16:37:52 2013 (r310000) @@ -1,7 +1,7 @@ Index: saslauthd/configure diff -u saslauthd/configure.orig saslauthd/configure ---- saslauthd/configure.orig 2011-09-03 00:40:17.000000000 +0900 -+++ saslauthd/configure 2011-09-14 15:22:38.269314778 +0900 +--- saslauthd/configure.orig 2012-11-07 04:21:44.000000000 +0900 ++++ saslauthd/configure 2013-01-06 17:15:30.597678365 +0900 @@ -2185,6 +2185,7 @@ fi { $as_echo "$as_me:$LINENO: result: yes" >&5 @@ -10,25 +10,33 @@ diff -u saslauthd/configure.orig saslaut test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. -@@ -8320,7 +8321,7 @@ +@@ -8301,6 +8302,7 @@ + gssapi_dir="${gssapi}/lib" + GSSAPIBASE_LIBS="-L$gssapi_dir" + GSSAPIBASE_STATIC_LIBS="-L$gssapi_dir" ++ gssapi_bindir="${gssapi}/bin/" + else + # FIXME: This is only used for building cyrus, and then only as + # a real hack. it needs to be fixed. +@@ -8320,7 +8322,7 @@ $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgssapi ${GSSAPIBASE_LIBS} -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err ${LIB_SOCKET} $LIBS" -+LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS" ++LIBS="${GSSAPIBASE_LIBS} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -8796,7 +8797,7 @@ +@@ -8796,7 +8798,7 @@ GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a ${K5SUPSTATIC}" elif test "$gss_impl" = "heimdal"; then CPPFLAGS="$CPPFLAGS -DKRB5_HEIMDAL" - GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} ${LIB_DES} -lcom_err" -+ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`" ++ GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `${gssapi_bindir}krb5-config --libs gssapi`" GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_STATIC_LIBS $gssapi_dir/libgssapi.a $gssapi_dir/libkrb5.a $gssapi_dir/libasn1.a $gssapi_dir/libroken.a $gssapi_dir/libcom_err.a ${LIB_CRYPT}" elif test "$gss_impl" = "cybersafe03"; then # Version of CyberSafe with two libraries -@@ -9978,6 +9979,7 @@ +@@ -10065,6 +10067,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ @@ -36,7 +44,7 @@ diff -u saslauthd/configure.orig saslaut #include <db.h> _ACEOF if { (ac_try="$ac_cpp conftest.$ac_ext" -@@ -10788,6 +10790,7 @@ +@@ -10892,6 +10895,7 @@ cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301061637.r06GbqHA074534>