2 files changed, 33 insertions, 17 deletions

diff --git a/security/cyrus-sasl2/files/patch-configure b/security/cyrus-sasl2/files/patch-configure
index cd8e33edff72..396cda9d9f35 100644
--- a/security/cyrus-sasl2/files/patch-configure
+++ b/security/cyrus-sasl2/files/patch-configure
@@ -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
diff --git a/security/cyrus-sasl2/files/patch-saslauthd::configure b/security/cyrus-sasl2/files/patch-saslauthd::configure
index 3b736f6874c1..f7dbb286e9d4 100644
--- a/security/cyrus-sasl2/files/patch-saslauthd::configure
+++ b/security/cyrus-sasl2/files/patch-saslauthd::configure
@@ -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 saslauthd/configure
  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 saslauthd/configure
  #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.  */