Update "mysql5-client" and "mysql5-server" package to version 5.0.88.

This release fixes a large number of bugs and security vulnerabilities
including SA37372.

For detailed list of all the changes since 5.0.67 have a look here, please:
http://dev.mysql.com/doc/refman/5.0/en/news-5-0-x.html

7 files changed, 15 insertions, 103 deletions

diff --git a/databases/mysql5-client/Makefile b/databases/mysql5-client/Makefile
index 772324b4ffa..a4cf585a14d 100644
--- a/databases/mysql5-client/Makefile
+++ b/databases/mysql5-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2009/05/20 00:58:10 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2009/11/26 16:33:29 tron Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
-PKGREVISION=		3
 SVR4_PKGNAME=		mysqc
 COMMENT=		MySQL 5, a free SQL database (client)
 
@@ -21,7 +20,12 @@ AUTO_MKDIRS=	yes
 
 REPLACE_PERL=	scripts/mysql_convert_table_format.sh \
 		scripts/mysql_explain_log.sh \
+		scripts/mysql_find_rows.sh \
+		scripts/mysql_fix_extensions.sh \
+		scripts/mysql_setpermission.sh \
 		scripts/mysql_tableinfo.sh \
+		scripts/mysql_zap.sh \
+		scripts/mysqlaccess.sh \
 		scripts/mysqldumpslow.sh \
 		scripts/mysqlhotcopy.sh
 
@@ -34,8 +38,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/support-files/my-${f}.cnf.sh \
 		${DESTDIR}${PREFIX}/share/examples/mysql/my-${f}.cnf
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/Docs/manual.chm \
-		${DESTDIR}${PREFIX}/share/doc/mysql/
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index dd64186440c..085cdfa817a 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.35 2009/07/19 13:14:21 tron Exp $
+# $NetBSD: Makefile.common,v 1.36 2009/11/26 16:33:29 tron Exp $
 #
 # used by databases/mysql5-client/Makefile
 # used by databases/mysql5-server/Makefile
 #
 
-DISTNAME=		mysql-5.0.67
+DISTNAME=		mysql-5.0.88
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -40,6 +40,7 @@ MYSQL_EXTRA_CHARSET?=	all
 CONFIGURE_ARGS+=	--localstatedir=${MYSQL_DATADIR:Q}
 CONFIGURE_ARGS+=	--with-named-z-libs=z
 CONFIGURE_ARGS+=	--without-libwrap
+CONFIG_SHELL=		${TOOLS_PATH.bash}
 
 .if ${OPSYS} == "IRIX"
 CFLAGS+=		-DIRIX5 -DNEEDS_BSTRING_H
@@ -98,7 +99,7 @@ CONFIGURE_ENV+=		ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		autoconf autoheader gmake perl:run
+USE_TOOLS+=		autoconf bash autoheader gmake perl:run
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES=		mk
diff --git a/databases/mysql5-client/PLIST b/databases/mysql5-client/PLIST
index ba20648a396..543d374654a 100644
--- a/databases/mysql5-client/PLIST
+++ b/databases/mysql5-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.12 2009/11/26 16:33:29 tron Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -67,7 +67,6 @@ man/man1/mysqlaccess.1
 man/man1/mysqladmin.1
 man/man1/mysqldump.1
 man/man1/mysqlshow.1
-share/doc/mysql/manual.chm
 share/examples/mysql/my-huge.cnf
 share/examples/mysql/my-innodb-heavy-4G.cnf
 share/examples/mysql/my-large.cnf
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 90b41d7b653..cc3ac329bcb 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2009/01/28 10:30:53 he Exp $
+$NetBSD: distinfo,v 1.27 2009/11/26 16:33:29 tron Exp $
 
-SHA1 (mysql-5.0.67.tar.gz) = 168090a4698a3a5efa2f2c9380a4352d4433d377
-RMD160 (mysql-5.0.67.tar.gz) = 05d38a5f8d91cb4dac1ee446af96b28163bd3722
-Size (mysql-5.0.67.tar.gz) = 28370810 bytes
+SHA1 (mysql-5.0.88.tar.gz) = 2dc7a462eaca1452eefd334888a6c40022deb352
+RMD160 (mysql-5.0.88.tar.gz) = a3ba4bd04e573b4a0bab073f36eec3ff44348ae6
+Size (mysql-5.0.88.tar.gz) = 22932765 bytes
 SHA1 (patch-aa) = 256de04aefd067ac7bdf8a6d1d817723efa6c6ec
 SHA1 (patch-ab) = ee8103143b47a428319fbc25cf2f9a69828c15f7
 SHA1 (patch-ac) = 7e7034f64f8337e459fe16611db8d7854c02931e
@@ -23,6 +23,3 @@ SHA1 (patch-ar) = b55373d58540975e24af14b13640e26c4c756923
 SHA1 (patch-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
 SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
 SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-bh) = 83f6f7f29636265e987fb00897a55290e2434643
-SHA1 (patch-bi) = 5d0132f4e053abfc6210cd2dc425186765acaad3
-SHA1 (patch-bj) = 1e00fab7db2f5ea04802053d41dedd2a356ea9ed
diff --git a/databases/mysql5-client/patches/patch-bh b/databases/mysql5-client/patches/patch-bh
deleted file mode 100644
index 40020c87620..00000000000
--- a/databases/mysql5-client/patches/patch-bh
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-bh,v 1.3 2009/01/28 09:44:34 he Exp $
-
-What was here before: workaround for our use of -ledit instead
-of the real readline (?).
-
-New: add patch from http://bugs.mysql.com/file.php?id=9232,
-referenced on http://bugs.mysql.com/bug.php?id=27884, to fix the
-vulnerability recorded in
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-4456.
-
---- client/mysql.cc.orig	2008-08-04 12:19:04.000000000 +0000
-+++ client/mysql.cc
-@@ -2263,7 +2263,11 @@ static char **new_mysql_completion (cons
- */
- 
- #if defined(USE_NEW_READLINE_INTERFACE) || defined(USE_LIBEDIT_INTERFACE)
-+#  if defined(__NetBSD__) || defined(__DragonFly__)
-+int no_completion(const char *, int)
-+#  else
- char *no_completion(const char*,int)
-+#  endif
- #else
- char *no_completion()
- #endif
-@@ -3361,9 +3365,12 @@ print_table_data_html(MYSQL_RES *result)
-   {
-     while((field = mysql_fetch_field(result)))
-     {
--      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
--					 (field->name[0] ? field->name : 
--					  " &nbsp; ") : "NULL"));
-+      tee_fputs("<TH>", PAGER);
-+      if (field->name && field->name[0])
-+        xmlencode_print(field->name, field->name_length);
-+      else
-+        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
-+      tee_fputs("</TH>", PAGER);
-     }
-     (void) tee_fputs("</TR>", PAGER);
-   }
-@@ -3374,7 +3381,7 @@ print_table_data_html(MYSQL_RES *result)
-     for (uint i=0; i < mysql_num_fields(result); i++)
-     {
-       (void) tee_fputs("<TD>", PAGER);
--      safe_put_field(cur[i],lengths[i]);
-+      xmlencode_print(cur[i], lengths[i]);
-       (void) tee_fputs("</TD>", PAGER);
-     }
-     (void) tee_fputs("</TR>", PAGER);
diff --git a/databases/mysql5-client/patches/patch-bi b/databases/mysql5-client/patches/patch-bi
deleted file mode 100644
index 2693b755633..00000000000
--- a/databases/mysql5-client/patches/patch-bi
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bi,v 1.1 2009/01/28 09:44:34 he Exp $
-
-Add patch from http://bugs.mysql.com/file.php?id=9232,
-referenced on http://bugs.mysql.com/bug.php?id=27884, to fix the
-vulnerability recorded in 
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-4456. 
-
---- mysql-test/r/mysql.result.orig	2008-08-04 12:32:17.000000000 +0000
-+++ mysql-test/r/mysql.result
-@@ -180,4 +180,6 @@ ERROR at line 1: DELIMITER cannot contai
- 1
- This is a file starting with UTF8 BOM 0xEFBBBF
- This is a file starting with UTF8 BOM 0xEFBBBF
-+<TABLE BORDER=1><TR><TH>&lt;</TH></TR><TR><TD>&lt; &amp; &gt;</TD></TR></TABLE>
-+End of 5.1 tests
- End of 5.0 tests
diff --git a/databases/mysql5-client/patches/patch-bj b/databases/mysql5-client/patches/patch-bj
deleted file mode 100644
index e58236ae038..00000000000
--- a/databases/mysql5-client/patches/patch-bj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-bj,v 1.1 2009/01/28 09:44:34 he Exp $
-
-Add patch from http://bugs.mysql.com/file.php?id=9232,
-referenced on http://bugs.mysql.com/bug.php?id=27884, to fix the
-vulnerability recorded in
-http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-4456.
-
---- mysql-test/t/mysql.test.orig	2008-08-04 12:32:17.000000000 +0000
-+++ mysql-test/t/mysql.test
-@@ -290,4 +290,12 @@ EOF
- --exec $MYSQL < $MYSQLTEST_VARDIR/tmp/bug29323.sql 2>&1
- remove_file $MYSQLTEST_VARDIR/tmp/bug29323.sql;
- 
-+
-+#
-+# Bug #27884: mysql --html does not quote HTML special characters in output
-+# 
-+--exec $MYSQL --html test -e "select '< & >' as \`<\`"
-+
-+--echo
-+--echo End of 5.1 tests
- --echo End of 5.0 tests