Update "mysql5-client" and "mysql5-server" packages to version 5.0.24.

Changes since version 5.0.22:
- Security fix: If a user has access to MyISAM table t, that user can
  create a MERGE table m that accesses t. However, if the user's
  privileges on t are subsequently revoked, the user can continue to
  access t by doing so through m. If this behavior is undesirable, you
  can start the server with the new --skip-merge option to disable the
  MERGE storage engine. (Bug#15195)
- In the INFORMATION_SCHEMA.ROUTINES table the ROUTINE_DEFINITION
  column now is defined as NULL rather than NOT NULL. Also, NULL rather
  than the empty string is returned as the column value if the user does
  not have sufficient privileges to see the routine
  definition. (Bug#20230)
- Several other bug fixes

6 files changed, 61 insertions, 24 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 4a78145c3db..fdbcb1bdb39 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2006/04/13 11:19:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2006/08/06 16:30:40 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-#PKGREVISION=		1
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 2e27b00a417..f109340d1d4 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.14 2006/06/06 21:18:55 jklos Exp $
+# $NetBSD: Makefile.common,v 1.15 2006/08/06 16:30:40 tron Exp $
 
-DISTNAME=		mysql-5.0.22
+DISTNAME=		mysql-5.0.24
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -94,7 +94,7 @@ CONFIGURE_ENV+=	ac_cv_func_pthread_setschedparam=no
 CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
-USE_LANGUAGES=		c c++
+USE_LANGUAGES+=		c c++
 USE_TOOLS+=		gmake perl:run
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index 2b3e0506df7..8c47c6df21b 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/13 11:19:25 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/08/06 16:30:40 tron Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -11,6 +11,7 @@ bin/mysql_fix_privilege_tables
 bin/mysql_setpermission
 bin/mysql_tableinfo
 bin/mysql_upgrade
+bin/mysql_upgrade_shell
 bin/mysql_zap
 bin/mysqlaccess
 bin/mysqladmin
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index c10b828036d..81dbc159d4a 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.7 2006/06/03 15:29:13 tron Exp $
+$NetBSD: distinfo,v 1.8 2006/08/06 16:30:40 tron Exp $
 
-SHA1 (mysql-5.0.22.tar.gz) = b4310bfa838771f0b01e01cf9c1f789a3bbb4b76
-RMD160 (mysql-5.0.22.tar.gz) = 12aad812756b2a97a380bc504c514db15a997362
-Size (mysql-5.0.22.tar.gz) = 19542405 bytes
+SHA1 (mysql-5.0.24.tar.gz) = 03f4fbe5e6efaadcd468798daf147fadf7abbe52
+RMD160 (mysql-5.0.24.tar.gz) = a4ffe83969dd4781762a0f5b906f2f0ece5fdff5
+Size (mysql-5.0.24.tar.gz) = 19974920 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
-SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
+SHA1 (patch-ac) = 86f7e2755d313bf2debc8dfa53cbe3fa0e8bd893
 SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
-SHA1 (patch-ae) = 02742fab876345d29119aee80ea3434d7c246cf3
+SHA1 (patch-ae) = f94e786b15089174b33045cdcdc76ba195609f34
 SHA1 (patch-af) = ecd74709e969fb1c6a03e836ee3e7ff8238b3dd5
 SHA1 (patch-ag) = 52fb37b6f0db7eefd9ca9102451d13a365dd0816
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
diff --git a/databases/mysql5-client/patches/patch-ac b/databases/mysql5-client/patches/patch-ac
index 920e18babc2..c3ddb0a01ca 100644
--- a/databases/mysql5-client/patches/patch-ac
+++ b/databases/mysql5-client/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ac,v 1.2 2006/08/06 16:30:40 tron Exp $
 
---- configure.orig	2005-10-17 03:29:33.000000000 +0200
-+++ configure	2005-10-31 09:16:17.000000000 +0100
-@@ -21984,7 +21984,7 @@
+--- configure.orig	2006-07-27 19:53:44.000000000 +0100
++++ configure	2006-08-06 15:34:25.000000000 +0100
+@@ -21500,7 +21500,7 @@
    FIND_PROC="$PS \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
  else
    case $SYSTEM_TYPE in
@@ -11,7 +11,33 @@ $NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
        FIND_PROC="$PS p \$\$PID | grep -v grep | grep \$\$MYSQLD > /dev/null"
        ;;
      *darwin*)
-@@ -26258,6 +26258,10 @@
+@@ -24458,13 +24458,13 @@
+   :
+ else
+ 
+-echo "$as_me:$LINENO: checking for sem_init in -lposix4" >&5
+-echo $ECHO_N "checking for sem_init in -lposix4... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for sem_init in -lrt" >&5
++echo $ECHO_N "checking for sem_init in -lrt... $ECHO_C" >&6
+ if test "${ac_cv_lib_posix4_sem_init+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lposix4  $LIBS"
++LIBS="-lrt  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -24527,7 +24527,7 @@
+ #define HAVE_LIBPOSIX4 1
+ _ACEOF
+ 
+-  LIBS="-lposix4 $LIBS"
++  LIBS="-lrt $LIBS"
+ 
+ fi
+ 
+@@ -25792,6 +25792,10 @@
        MAX_C_OPTIMIZE="-O"
      fi
      ;;
@@ -22,7 +48,18 @@ $NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
    *freebsd*)
      { echo "$as_me:$LINENO: WARNING: Adding fix for interrupted reads" >&5
  echo "$as_me: WARNING: Adding fix for interrupted reads" >&2;}
-@@ -39729,7 +39733,7 @@
+@@ -39038,8 +39042,8 @@
+         OPENSSL_INCLUDE=-I$incs
+       fi
+       # Test for libssl using all known library file endings
+-      if test -f $d/libssl.a || test -f $d/libssl.so || \
+-         test -f $d/libssl.sl || test -f $d/libssl.dylib ; then
++      if test -f $libs/libssl.a || test -f $libs/libssl.so || \
++         test -f $libs/libssl.sl || test -f $libs/libssl.dylib ; then
+         OPENSSL_LIB=$libs
+       fi
+       ;;
+@@ -39377,7 +39381,7 @@
  main ()
  {
  
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 0272e2ef7de..4dad72cff0b 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,10 +1,10 @@
-$NetBSD: patch-ae,v 1.5 2006/05/18 16:11:15 cube Exp $
+$NetBSD: patch-ae,v 1.6 2006/08/06 16:30:40 tron Exp $
 
 Don't install scripts handled by mysql-server.
 
---- scripts/Makefile.in.orig	2006-04-26 20:32:21.000000000 +0200
-+++ scripts/Makefile.in
-@@ -351,13 +351,12 @@ yassl_includes = @yassl_includes@
+--- scripts/Makefile.in.orig	2006-07-27 19:53:32.000000000 +0100
++++ scripts/Makefile.in	2006-08-06 15:11:56.000000000 +0100
+@@ -351,13 +351,12 @@
  yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
@@ -19,10 +19,10 @@ Don't install scripts handled by mysql-server.
  			mysql_zap \
  			mysqlaccess \
  			mysqlbug \
-@@ -368,7 +367,6 @@ bin_SCRIPTS = @server_scripts@ \
+@@ -368,7 +367,6 @@
  			mysql_explain_log \
  			mysql_tableinfo \
- 			mysql_upgrade \
+ 			mysql_upgrade_shell \
 -			mysqld_multi \
  			mysql_create_system_tables