update to 3.0.6

1 files changed, 52 insertions, 18 deletions

diff --git a/mail/courier-imap/files/patch-mysql b/mail/courier-imap/files/patch-mysql
index 37aca7b23304..029829ef7a5d 100644
--- a/mail/courier-imap/files/patch-mysql
+++ b/mail/courier-imap/files/patch-mysql
@@ -1,28 +1,44 @@
---- authlib/configure.orig	Thu Oct 30 21:36:15 2003
-+++ authlib/configure	Thu Oct 30 21:43:26 2003
-@@ -6766,9 +6766,9 @@
+--- authlib/configure.orig	Tue Jul 20 19:37:46 2004
++++ authlib/configure	Tue Jul 20 19:37:22 2004
+@@ -7337,9 +7337,9 @@
  if test "$doauthmysql" = ""
  then
  	LIBS="$MYSQL_LIBS $LIBS"
 -	echo "$as_me:$LINENO: checking for mysql_connect" >&5
 -echo $ECHO_N "checking for mysql_connect... $ECHO_C" >&6
 -if test "${ac_cv_func_mysql_connect+set}" = set; then
-+       echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
++	echo "$as_me:$LINENO: checking for mysql_real_connect" >&5
 +echo $ECHO_N "checking for mysql_real_connect... $ECHO_C" >&6
 +if test "${ac_cv_func_mysql_real_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6779,7 +6779,7 @@
+@@ -7348,12 +7348,12 @@
+ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
++/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define mysql_connect innocuous_mysql_connect
++#define mysql_real_connect innocuous_mysql_real_connect
+ 
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char mysql_connect (); below.
-+    which can conflict with char mysql_real_connect (); below.  */
++    which can conflict with char mysql_real_connect (); below.
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
-@@ -6794,14 +6794,14 @@
+ 
+@@ -7363,7 +7363,7 @@
+ # include <assert.h>
+ #endif
+ 
+-#undef mysql_connect
++#undef mysql_real_connect
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -7372,14 +7372,14 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -40,7 +56,7 @@
  #endif
  #ifdef __cplusplus
  }
-@@ -6810,7 +6810,7 @@
+@@ -7388,7 +7388,7 @@
  int
  main ()
  {
@@ -49,7 +65,7 @@
    ;
    return 0;
  }
-@@ -6827,18 +6827,18 @@
+@@ -7415,19 +7415,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -62,7 +78,8 @@
 -ac_cv_func_mysql_connect=no
 +ac_cv_func_mysql_real_connect=no
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
 -echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6
@@ -73,7 +90,7 @@
    doauthmysql="yes"
  
  fi
-@@ -6930,9 +6930,9 @@
+@@ -7537,9 +7537,9 @@
  else
  	saveLIBS="$LIBS"
  	LIBS="$MYSQL_LIBS $LIBS"
@@ -86,16 +103,32 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -6943,7 +6943,7 @@
+@@ -7548,12 +7548,12 @@
+ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
+-/* Define mysql_connect to an innocuous variant, in case <limits.h> declares mysql_connect.
++/* Define mysql_real_connect to an innocuous variant, in case <limits.h> declares mysql_real_connect.
+    For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define mysql_connect innocuous_mysql_connect
++#define mysql_real_connect innocuous_mysql_real_connect
+ 
  /* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char mysql_connect (); below.
 +    which can conflict with char mysql_real_connect (); below.
      Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
      <limits.h> exists even on freestanding compilers.  */
- #ifdef __STDC__
-@@ -6958,14 +6958,14 @@
+ 
+@@ -7563,7 +7563,7 @@
+ # include <assert.h>
+ #endif
+ 
+-#undef mysql_connect
++#undef mysql_real_connect
+ 
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ #ifdef __cplusplus
+@@ -7572,14 +7572,14 @@
  #endif
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
@@ -113,7 +146,7 @@
  #endif
  #ifdef __cplusplus
  }
-@@ -6974,7 +6974,7 @@
+@@ -7588,7 +7588,7 @@
  int
  main ()
  {
@@ -122,7 +155,7 @@
    ;
    return 0;
  }
-@@ -6991,18 +6991,18 @@
+@@ -7615,19 +7615,19 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
@@ -135,7 +168,8 @@
 -ac_cv_func_mysql_connect=no
 +ac_cv_func_mysql_real_connect=no
  fi
- rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_func_mysql_connect" >&5
 -echo "${ECHO_T}$ac_cv_func_mysql_connect" >&6