bring up to date for Mac OS X 10.2

Rolf Braun · Rolf Braun · commit c0c8bdd6284a · 2003-06-12T00:32:36.000Z
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2003-06-11  Rolf Braun <rbraun@andrew.cmu.edu>
+	* config/kerberos_v4.m4:
+	  fix fallback to -lkrb4 when --enable-krb4 is specified
+	* config/ltconfig:
+	* config/ltmain.sh:
+	  make the darwin libtool work on OS X v10.2
+	  (bash/zsh shell syntax, and don't link bundles with extra args)
+	* dlcompat-20010505/dlopen.c: back out bogus delimiter change
+	* doc/macosx.html: update for 10.2 and add known problems section
+	* mac/osx_cfm_glue/cfmglue.c: fix sasl_done followed by client_init
+
 2003-06-11  Rob Siemborski <rjs3@andrew.cmu.edu>
 	* man/sasl_client_new.3, man/sasl_server_new.3:
 	  Security flags don't belong here, connection flags do.
diff --git a/config/kerberos_v4.m4 b/config/kerberos_v4.m4
@@ -113,7 +113,7 @@ AC_DEFUN(SASL_KERBEROS_V4_CHK, [
                      [COM_ERR=""; SASL_KRB_LIB="-lkrb"; krb4lib="yes"],
                      krb4lib=no, $LIB_DES)])], krb4="no")
 
-      if test "$krb4" = "yes" -a "$krb4lib" = "no"; then
+      if test "$krb4" != "no" -a "$krb4lib" = "no"; then
 	AC_CHECK_LIB(krb4, krb_mk_priv,
                      [COM_ERR=""; SASL_KRB_LIB="-lkrb4"; krb4=yes],
                      krb4=no, $LIB_DES)
diff --git a/config/ltconfig b/config/ltconfig
@@ -1372,7 +1372,7 @@ else
     hardcode_shlibpath_var=no
     ;;
 
-  darwin* | rhapsody*)
+  darwin[15]* | rhapsody*)
     allow_undefined_flag='-undefined error'
     archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts -install_name $rpath/$soname $(test -n "$verstring" -a x$verstring != x0.0 && echo $verstring)'
     # We need to add '_' to the symbols in $export_symbols first
@@ -1382,6 +1382,17 @@ else
     whole_archive_flag_spec='-all_load $convenience'
     ;;
 
+  # Mac OS X v10.2 uses bash for /bin/sh instead of zsh, and the quoting syntax is incompatible
+  darwin*)
+    allow_undefined_flag='-undefined error'
+    archive_cmds='$CC $(test x$module = xyes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs $linkopts $(test x$module != xyes && echo -install_name $rpath/$soname $tmp_verstring)'
+    # We need to add '_' to the symbols in $export_symbols first
+    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols $lib'
+    hardcode_direct=yes
+    hardcode_shlibpath_var=no
+    whole_archive_flag_spec='-all_load $convenience'
+    ;;
+
   hpux9* | hpux10* | hpux11*)
     case "$host_os" in
     hpux9*) archive_cmds='$rm $objdir/$soname~$LD -b +b $install_libdir -o $objdir/$soname $libobjs $deplibs $linkopts~test $objdir/$soname = $lib || mv $objdir/$soname $lib' ;;
diff --git a/config/ltmain.sh b/config/ltmain.sh
@@ -2181,6 +2181,11 @@ EOF
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
 	  eval cmds=\"$archive_expsym_cmds\"
 	else
+	  if test "x$verstring" = "x0.0"; then
+	    tmp_verstring=
+	  else
+	    tmp_verstring="$verstring"
+	  fi
 	  eval cmds=\"$archive_cmds\"
 	fi
 	IFS="${IFS= 	}"; save_ifs="$IFS"; IFS='~'
diff --git a/dlcompat-20010505/dlopen.c b/dlcompat-20010505/dlopen.c
@@ -135,9 +135,8 @@ struct stat *stat_buf)
 	            /* extract path list element */
 		    p = element;
 		    q = pathbuf;
-		    while(*p && *p != ':' && q < pathbuf_end) {
+		    while(*p && *p != ':' && q < pathbuf_end)
                         *q++ = *p++;
-                    }
 		    if(q == pathbuf){  /* empty element */
 		        if(*p){
 		            element = p+1;
diff --git a/doc/macosx.html b/doc/macosx.html
@@ -1,6 +1,6 @@
 <html><head>
 <title>Building and Using Cyrus SASL on Mac OS X</title>
-<!-- $Id: macosx.html,v 1.4 2002/12/25 00:25:14 leg Exp $ -->
+<!-- $Id: macosx.html,v 1.5 2003/06/12 00:32:50 rbraun Exp $ -->
 </head>
 <body>
 <h1>Cyrus SASL v2 on Mac OS X (and 9)</h1><p>
@@ -59,20 +59,28 @@ <h2>Compiling and Using the Unix library</h2>
 
 The Unix library is mostly ready to build on Mac OS X, but it does
 depend on the <tt>dlcompat</tt> package in order to load its
-plugins. <tt>dlcompat-20010505</tt> is the latest version and is known
+plugins. <tt>dlcompat-20010505</tt> is a relatively simple version known
 to work with SASL; it is provided with the distribution in a
 tarball. You should <tt>make</tt> and <tt>make install</tt> the
 <tt>dlcompat</tt> library (which probably goes into
 <tt>/usr/local/lib/libdl.dylib</tt>) before attempting to
 <tt>./configure</tt> the SASL distribution itself. SASL will then
 pretend it's a real Unix <tt>libdl</tt>, and link against it.<p>
 
-If you are using MIT Kerberos for Macintosh 4.0, which is fully
+Since there are, at this point, newer and far more complex versions of
+dlcompat, you may prefer to use those instead if other software
+requires their functionality. The dlcompat homepage is located
+<a href="http://www.opendarwin.org/projects/dlcompat/">on the
+OpenDarwin site.</a><p>
+
+If you are using MIT Kerberos for Macintosh 4.0 or later, which is fully
 supported by the SASL library, you should <tt>./configure</tt> with
 the added option <tt>--enable-krb4=/usr</tt> so that it finds the
 correct location for the header files. KfM will be automatically
 detected by the configure script, and the correct libraries linked
-in.<p>
+in. <i>Please read the "Known Problems" section at the end of this
+document for information on working around a problem with OpenSSL's
+DES headers.</i><p>
 
 You must be root to make install, since <tt>/usr/local</tt> is only
 modifiable by root. You need not enable the root account using
@@ -96,7 +104,9 @@ <h2>Changes to the Unix library to make it work on OS X</h2><p>
 <ul>
 <li>The random code supports the preferred way to generate random
 numbers in Darwin. (In SASL v2, it does this on all unix-like
-platforms that lack jrand48).
+platforms that lack jrand48). <i>Note that Mac OS X "Jaguar", version 10.2,
+now has the standard jrand48 function, and that SASL will use this instead
+of the previous workaround.</i>
 
 <li>Symbols which are dlopened have an underscore prefixed. (This
 behavior is detected by configure in SASL v2.)
@@ -113,7 +123,7 @@ <h2>Changes to the Unix library to make it work on OS X</h2><p>
 way). Note that the MD5 symbols have local names on all platforms with
 SASL v2; this was only different in SASL v1.
 
-<li>MIT Kerberos for Macintosh 4.0 is fully supported. This was
+<li>MIT Kerberos for Macintosh 4.0 and later are fully supported. This was
 accomplished by using <tt>krb_get_err_text</tt> if available and
 checking for additional names for the krb4 libraries.
 
@@ -172,3 +182,12 @@ <h2>Changes to the Mac OS 9 projects to support Carbon</h2><p>
 
 </ul><p>
 
+<h2>Known Problems</h2><p>
+
+<ul>
+<li>The Kerberos v4 headers bundled with Mac OS X (and Kerberos for Macintosh) are not compatible with OS X's OpenSSL headers. The easiest solution, for now, is to build without using OpenSSL's <tt>libcrypto</tt>. To do this, specify the <tt>--without-openssl</tt> option to <tt>configure</tt>. After running <tt>configure</tt>, you will need to instruct the build system not to use OpenSSL's headers, either. Edit the <tt>config.h</tt> file, and look for the line:<p>
+<tt>#define WITH_SSL_DES 1</tt><p>
+Comment this line out (for example, by adding a double slash <tt>//</tt> to the beginning of it).<p>
+<li>Versions of Cyrus SASL prior to 2.1.14 with support for Carbon CFM applications on Mac OS X have a known bug involving the CFM glue code (in <tt>mac/osx_cfm_glue</tt>). If <tt>sasl_done</tt> is called to unload the SASL library, and then one of the initialization functions (such as <tt>sasl_client_init</tt>) is called to reinitialize it from the same process, the application will crash. A fix for one obvious cause of this problem is included in 2.1.14; however, as of this writing, it has not been tested. It is possible that other bugs in Cyrus SASL, or deficiencies in Apple's libraries, will make this fix insufficient to resolve this issue.
+</ul><p>
+
