head	1.12;
access;
symbols
	RELEASE_8_3_0:1.11
	RELEASE_9_0_0:1.11
	RELEASE_7_4_0:1.10
	RELEASE_8_2_0:1.10
	RELEASE_6_EOL:1.10
	RELEASE_8_1_0:1.10
	RELEASE_7_3_0:1.10
	RELEASE_8_0_0:1.10
	RELEASE_7_2_0:1.10
	RELEASE_7_1_0:1.10
	RELEASE_6_4_0:1.10
	RELEASE_5_EOL:1.10
	RELEASE_7_0_0:1.9
	RELEASE_6_3_0:1.9
	PRE_XORG_7:1.9
	RELEASE_4_EOL:1.9
	RELEASE_6_2_0:1.9
	RELEASE_6_1_0:1.9
	RELEASE_5_5_0:1.9
	RELEASE_6_0_0:1.9
	RELEASE_5_4_0:1.8
	RELEASE_4_11_0:1.8
	RELEASE_5_3_0:1.7
	RELEASE_4_10_0:1.7
	RELEASE_5_2_1:1.4
	RELEASE_5_2_0:1.4
	RELEASE_4_9_0:1.4
	RELEASE_5_1_0:1.3;
locks; strict;
comment	@# @;


1.12
date	2013.01.06.18.42.44;	author svnexp;	state Exp;
branches;
next	1.11;

1.11
date	2011.09.24.09.13.35;	author ume;	state Exp;
branches;
next	1.10;

1.10
date	2008.05.21.02.34.39;	author kevlo;	state Exp;
branches;
next	1.9;

1.9
date	2005.05.17.16.35.40;	author ume;	state Exp;
branches;
next	1.8;

1.8
date	2004.10.25.12.42.40;	author ume;	state Exp;
branches;
next	1.7;

1.7
date	2004.03.11.17.16.40;	author ume;	state Exp;
branches;
next	1.6;

1.6
date	2004.01.17.15.35.34;	author ume;	state Exp;
branches;
next	1.5;

1.5
date	2003.12.04.08.06.03;	author ume;	state Exp;
branches;
next	1.4;

1.4
date	2003.06.30.16.51.00;	author ume;	state Exp;
branches;
next	1.3;

1.3
date	2003.04.17.17.54.43;	author ume;	state Exp;
branches;
next	1.2;

1.2
date	2003.04.16.17.28.05;	author ume;	state Exp;
branches;
next	1.1;

1.1
date	2003.04.15.18.09.30;	author ume;	state Exp;
branches;
next	;


desc
@@


1.12
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310000
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310000 | ume | 2013-01-06 16:37:52 +0000 (Sun, 06 Jan 2013) | 2 lines
## SVN ##
## SVN ## Use proper krb5-config when using HEIMDAL in ports.
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@Index: saslauthd/configure
diff -u saslauthd/configure.orig saslauthd/configure
--- 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
 $as_echo "yes" >&6; }
+program_prefix=NONE
 test "$program_prefix" != NONE &&
   program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
@@@@ -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} `${gssapi_bindir}krb5-config --libs gssapi` $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@@@ -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 `${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
@@@@ -10065,6 +10067,7 @@@@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <stdio.h>
 #include <db.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@@@@ -10892,6 +10895,7 @@@@
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+#include <stdio.h>
 #include <db.h>
 _ACEOF
 if { (ac_try="$ac_cpp conftest.$ac_ext"
@


1.11
log
@Update to 2.1.25.
@
text
@d3 2
a4 2
--- saslauthd/configure.orig	2011-09-03 00:40:17.000000000 +0900
+++ saslauthd/configure	2011-09-14 15:22:38.269314778 +0900
d13 9
a21 1
@@@@ -8320,7 +8321,7 @@@@
d26 1
a26 1
+LIBS="${GSSAPIBASE_LIBS} `krb5-config --libs gssapi` $LIBS"
d30 1
a30 1
@@@@ -8796,7 +8797,7 @@@@
d35 1
a35 1
+    GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `krb5-config --libs gssapi`"
d39 1
a39 1
@@@@ -9978,6 +9979,7 @@@@
d47 1
a47 1
@@@@ -10788,6 +10790,7 @@@@
@


1.10
log
@Oops, forgot to commit the fix
@
text
@d1 5
a5 12
--- saslauthd/configure.orig	2006-05-19 03:30:20.000000000 +0800
+++ saslauthd/configure	2008-05-21 10:00:20.000000000 +0800
@@@@ -1234,7 +1234,7 @@@@
       ac_cache_corrupted=: ;;
     ,);;
     *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
+      if test "`echo $ac_old_val`" != "`echo $ac_new_val`"; then
         { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
         { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
@@@@ -1526,6 +1526,7 @@@@
d7 2
a8 2
 echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
d11 1
a11 1
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
d13 2
a14 2
@@@@ -6843,7 +6844,7 @@@@
   echo $ECHO_N "(cached) $ECHO_C" >&6
a19 1
 #line $LINENO "configure"
d21 2
a22 1
@@@@ -7253,7 +7254,7 @@@@
d31 1
a31 10
@@@@ -8010,7 +8011,7 @@@@
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    cat >conftest.$ac_ext <<_ACEOF
@@@@ -8020,6 +8021,7 @@@@
d37 3
a39 12
 int
 main ()
@@@@ -8767,7 +8769,7 @@@@
 	fi
 
 	saved_LIBS=$LIBS
-        for dbname in db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.4 db4.4 db44 db-4.3 db4.3 db43 db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
           do
 	    LIBS="$saved_LIBS -l$dbname"
 	    cat >conftest.$ac_ext <<_ACEOF
@@@@ -8777,6 +8779,7 @@@@
d45 2
a46 2
 int
 main ()
@


1.9
log
@Update to 2.1.21.
LDAPDB auxprop plugin was added since this version.  Unfortunately,
we cannot simply enable it in ports tree to avoid dependency loop
with OpenLDAP port.  So, I'll add separete port for it later.
@
text
@d1 12
a12 5
Index: saslauthd/configure
diff -u saslauthd/configure.orig saslauthd/configure
--- saslauthd/configure.orig	Sun May 15 14:59:04 2005
+++ saslauthd/configure	Tue May 17 14:57:49 2005
@@@@ -1525,6 +1525,7 @@@@
d20 1
a20 1
@@@@ -6782,7 +6783,7 @@@@
d29 2
a30 2
@@@@ -7132,7 +7133,7 @@@@
     GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
d38 1
a38 1
@@@@ -7889,7 +7890,7 @@@@
d47 1
a47 1
@@@@ -7899,6 +7900,7 @@@@
d55 1
a55 1
@@@@ -8646,7 +8648,7 @@@@
d64 1
a64 1
@@@@ -8656,6 +8658,7 @@@@
@


1.8
log
@Update to 2.1.20.

  * Fixes to cram plugin to avoid attempting to canonify uninitialized data.
  * NTLM portability fixes.
  * Avoid potential attack using SASL_PATH when sasl is used in a setuid
    environment.
  * A trivial number of small bugfixes.
@
text
@d3 3
a5 3
--- saslauthd/configure.orig	Mon Oct 25 05:21:13 2004
+++ saslauthd/configure	Mon Oct 25 21:24:46 2004
@@@@ -1523,6 +1523,7 @@@@
d13 1
a13 1
@@@@ -6392,7 +6393,7 @@@@
d17 2
a18 2
-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"
d22 1
a22 1
@@@@ -6742,7 +6743,7 @@@@
d31 1
a31 1
@@@@ -7502,7 +7503,7 @@@@
d35 2
a36 2
-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d40 1
a40 1
@@@@ -7512,6 +7513,7 @@@@
d48 1
a48 9
@@@@ -7534,6 +7536,7 @@@@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@@@@ -8258,7 +8261,7 @@@@
d52 2
a53 2
-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d57 1
a57 1
@@@@ -8268,6 +8271,7 @@@@
a64 8
@@@@ -8290,6 +8294,7 @@@@
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   BDB_LIBADD="$BDB_LIBADD -l$dbname"; dblib="berkeley"; dbname=db
+  break
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
@


1.7
log
@Update to 2.1.18.
@
text
@d3 2
a4 2
--- saslauthd/configure.orig	Thu Mar 11 00:56:16 2004
+++ saslauthd/configure	Fri Mar 12 00:28:40 2004
d13 1
a13 1
@@@@ -6385,7 +6386,7 @@@@
d22 1
a22 2
@@@@ -6734,7 +6735,7 @@@@
     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
d25 1
d31 1
a31 2
@@@@ -7493,7 +7494,7 @@@@
 	    BDB_LIBADD=""
d34 1
d38 8
a45 8
             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
@@@@ -7517,11 +7518,11 @@@@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+#include <db.h>
d48 9
a56 8
 {
-db_create ();
+db_create (0, 0, 0);
   ;
   return 0;
 }
@@@@ -8296,7 +8297,7 @@@@
 	    BDB_LIBADD=""
d59 1
d63 8
a70 8
             as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
@@@@ -8320,11 +8321,11 @@@@
 #endif
 /* We use char because int might match the return type of a gcc2
    builtin and then its argument prototype would still apply.  */
-char db_create ();
+#include <db.h>
d73 8
a80 6
 {
-db_create ();
+db_create (0, 0, 0);
   ;
   return 0;
 }
@


1.6
log
@Support Berkeley DB 4.2.
Since our db42 requires to include db.h to use. existing configure
script cannot detect our db42.  AC_CHECK_LIB() simply test if a
function exists. :(

Requested by:	Dmitry Sorokin <dmitry_sorokin@@yahoo.ca>
@
text
@d3 2
a4 2
--- saslauthd/configure.orig	Tue Dec  2 01:35:11 2003
+++ saslauthd/configure	Sat Jan 17 23:23:56 2004
d13 1
a13 1
@@@@ -6376,7 +6377,7 @@@@
d22 1
a22 1
@@@@ -6725,7 +6726,7 @@@@
d31 1
a31 1
@@@@ -7484,7 +7485,7 @@@@
d35 2
a36 2
-        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d40 1
a40 1
@@@@ -7508,11 +7509,11 @@@@
d54 1
a54 1
@@@@ -8287,7 +8288,7 @@@@
d58 2
a59 2
-        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
d63 1
a63 1
@@@@ -8311,11 +8312,11 @@@@
@


1.5
log
@Update to 2.1.17.
@
text
@d4 1
a4 1
+++ saslauthd/configure	Tue Dec  2 14:02:53 2003
d40 14
d63 14
@


1.4
log
@Update to 2.1.14.
@
text
@d3 12
a14 4
--- saslauthd/configure.orig	Sat Jun 28 06:21:15 2003
+++ saslauthd/configure	Tue Jul  1 01:26:30 2003
@@@@ -2990,7 +2990,7 @@@@
   echo $ac_n "(cached) $ac_c" 1>&6
d16 2
a17 2
   ac_save_LIBS="$LIBS"
-LIBS="-lgssapi $GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err $LIBS"
d19 6
a24 6
 cat > conftest.$ac_ext <<EOF
 #line 2996 "configure"
 #include "confdefs.h"
@@@@ -3071,7 +3071,7 @@@@
      GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err"
      GSSAPIBASE_STATIC_LIBS="$GSSAPIBASE_LIBS $gssapi_dir/libgssapi_krb5.a $gssapi_dir/libkrb5.a $gssapi_dir/libk5crypto.a $gssapi_dir/libcom_err.a"
d26 6
a31 6
-     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS -lgssapi -lkrb5 -lasn1 -lroken ${LIB_CRYPT} -lcom_err"
+     GSSAPIBASE_LIBS="$GSSAPIBASE_LIBS `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" = "seam"; then
      GSSAPIBASE_LIBS=-lgss
@@@@ -3486,7 +3486,7 @@@@
d38 3
a40 3
             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
 echo "configure:3493: checking for db_create in -l$dbname" >&5
@@@@ -3877,7 +3877,7 @@@@
d47 2
a48 2
             echo $ac_n "checking for db_create in -l$dbname""... $ac_c" 1>&6
 echo "configure:3884: checking for db_create in -l$dbname" >&5
@


1.3
log
@- The pidfile of saslauthd was changed.
- The configure script should select correct version of Berkeley DB.

PR:		ports/51041
Submitted by:	Oliver Eikemeier <eikemeier@@fillmore-labs.com>
@
text
@d1 5
a5 3
--- saslauthd/configure.orig	Mon Apr 14 20:07:50 2003
+++ saslauthd/configure	Tue Apr 15 01:39:33 2003
@@@@ -2988,7 +2988,7 @@@@
d12 1
a12 1
 #line 2994 "configure"
d14 1
a14 1
@@@@ -3026,7 +3026,7 @@@@
d21 3
a23 3
   else
      gssapi="no"
@@@@ -3441,7 +3441,7 @@@@
d27 2
a28 2
-        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
d31 2
a32 2
 echo "configure:3448: checking for db_create in -l$dbname" >&5
@@@@ -3832,7 +3832,7 @@@@
d36 2
a37 2
-        for dbname in db-4.1 db4.1 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
d40 1
a40 1
 echo "configure:3839: checking for db_create in -l$dbname" >&5
@


1.2
log
@make configure script pickking up the Heimdal Kerberos that's
in FreeBSD's base.

Submitted by:	Graeme Mathieson <mathie@@wossname.org.uk>
@
text
@d26 1
a26 1
+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
d35 1
a35 1
+        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db4 db-3.3 db3.3 db-3.2 db3.2 db-3.1 db3.1 db-3 db3 db
@


1.1
log
@add missing files which should be committed by previous committed.
@
text
@d3 18
@

