Update mysql-{client,server} to 4.0.23a (bugfix release).

See http://dev.mysql.com/doc/mysql/en/News-4.0.23.html for the full
list of changes.

This update applies the fix for the mysqlaccess script symlink
vulnerability, bump BUILDLINK_RECOMMENDED.

8 files changed, 120 insertions, 30 deletions

diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile
index 859124a31fc..2afd102c84b 100644
--- a/databases/mysql-client/Makefile
+++ b/databases/mysql-client/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2004/12/31 13:27:06 minskim Exp $
+# $NetBSD: Makefile,v 1.42 2005/01/20 14:17:15 xtraeme Exp $
 
 PKGNAME=		${DISTNAME:S/-/-client-/}
 SVR4_PKGNAME=		mysqc
-PKGREVISION=		4
 COMMENT=		MySQL 4, a free SQL database (client)
 
 CONFLICTS=		{mysql-client-[0-9]*,mysql3-client-[0-9]*}
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 358fdebcc56..f8d02e8094b 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.37 2004/12/17 17:48:08 wiz Exp $
+# $NetBSD: Makefile.common,v 1.38 2005/01/20 14:17:15 xtraeme Exp $
 
-DISTNAME=		mysql-4.0.22
+DISTNAME=		mysql-4.0.23a
 CATEGORIES=		databases
 MASTER_SITES=		http://mirrors.sunsite.dk/mysql/Downloads/MySQL-4.0/ \
 			ftp://sunsite.dk/mirrors/mysql/Downloads/MySQL-4.0/ \
diff --git a/databases/mysql-client/PLIST b/databases/mysql-client/PLIST
index c03b8af7c69..0003ab2217d 100644
--- a/databases/mysql-client/PLIST
+++ b/databases/mysql-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2004/11/23 16:07:02 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.15 2005/01/20 14:17:15 xtraeme Exp $
 bin/msql2mysql
 bin/mysql
 bin/mysql_config
@@ -63,6 +63,6 @@ share/examples/mysql/my-small.cnf
 share/mysql/make_binary_distribution
 share/mysql/make_sharedlib_distribution
 @dirrm share/mysql
-@dirrm lib/mysql
 @dirrm share/examples/mysql
+@dirrm lib/mysql
 @dirrm include/mysql
diff --git a/databases/mysql-client/buildlink3.mk b/databases/mysql-client/buildlink3.mk
index e49e25bcf9b..a5627cfcbba 100644
--- a/databases/mysql-client/buildlink3.mk
+++ b/databases/mysql-client/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/10/28 01:45:19 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2005/01/20 14:17:15 xtraeme Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 MYSQL_CLIENT_BUILDLINK3_MK:=	${MYSQL_CLIENT_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	mysql-client
 
 .if !empty(MYSQL_CLIENT_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.mysql-client+=	mysql-client>=4.0.18nb1
-BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=4.0.20nb1
+BUILDLINK_RECOMMENDED.mysql-client?=	mysql-client>=4.0.23a
 BUILDLINK_PKGSRCDIR.mysql-client?=	../../databases/mysql-client
 BUILDLINK_LIBDIRS.mysql-client?=	lib/mysql
 .endif	# MYSQL_CLIENT_BUILDLINK3_MK
diff --git a/databases/mysql-client/distinfo b/databases/mysql-client/distinfo
index 40ba734bf6b..b61d80d5256 100644
--- a/databases/mysql-client/distinfo
+++ b/databases/mysql-client/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.15 2004/11/09 06:11:48 xtraeme Exp $
+$NetBSD: distinfo,v 1.16 2005/01/20 14:17:15 xtraeme Exp $
 
-SHA1 (mysql-4.0.22.tar.gz) = 0b43446a0fd2887c4bc69d8b30dc57f348e145cd
-Size (mysql-4.0.22.tar.gz) = 14395535 bytes
+SHA1 (mysql-4.0.23a.tar.gz) = b85f6ace8e120da34aef2a8ee26b5751de69b97b
+Size (mysql-4.0.23a.tar.gz) = 16735725 bytes
 SHA1 (patch-af) = 2f3bab4108c002420e243a4ca6c9c0c3d4bdd21b
 SHA1 (patch-au) = 9183bfa3a6f5b4a9553a6de83448fb684d514a91
 SHA1 (patch-av) = 684c1e2ff1f96652225045653c25707850fe0ff2
-SHA1 (patch-aw) = 67f10ae46e46bb047f4c7662af3954945590dfcc
-SHA1 (patch-ax) = d029adc40e6f80edfe090e4c3ca59bf076b9f462
+SHA1 (patch-aw) = 23d54ceddd0631aa93b32666853965a5fc7bdfab
+SHA1 (patch-ax) = 0ee6c30cc814d9404625191ac3b248ba9d9e094a
+SHA1 (patch-az) = 4fdb81d762f5fccf284ea518b1bf2e7d36950a1b
diff --git a/databases/mysql-client/patches/patch-aw b/databases/mysql-client/patches/patch-aw
index e77eca2f7b3..dd9a99d0c64 100644
--- a/databases/mysql-client/patches/patch-aw
+++ b/databases/mysql-client/patches/patch-aw
@@ -1,17 +1,16 @@
-$NetBSD: patch-aw,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
+$NetBSD: patch-aw,v 1.2 2005/01/20 14:17:15 xtraeme Exp $
 
---- man/Makefile.in.orig	2004-11-09 06:38:12.000000000 +0100
-+++ man/Makefile.in	2004-11-09 06:38:39.000000000 +0100
-@@ -275,10 +275,8 @@
+--- man/Makefile.in.orig	2005-01-20 14:49:43.000000000 +0100
++++ man/Makefile.in	2005-01-20 14:50:07.000000000 +0100
+@@ -290,9 +290,8 @@
+ uname_prog = @uname_prog@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
- 
 -man_MANS = mysql.1 isamchk.1 isamlog.1 mysql_zap.1 mysqlaccess.1 \
 -		mysqladmin.1 mysqld.1 mysqld_multi.1 mysqldump.1 mysqlshow.1 \
 -		perror.1 replace.1 mysqld_safe.1 mysql_fix_privilege_tables.1
--
 +man_MANS = mysql.1 mysql_zap.1 mysqlaccess.1 mysqladmin.1 \
-+	   mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
++		mysqldump.1 mysqlshow.1 mysql_fix_privilege_tables.1
  
  EXTRA_DIST = mysql.1.in isamchk.1.in isamlog.1.in mysql_zap.1.in \
  		mysqlaccess.1.in mysqladmin.1.in mysqld.1.in mysqld_multi.1.in \
diff --git a/databases/mysql-client/patches/patch-ax b/databases/mysql-client/patches/patch-ax
index c79e22e386b..08c9637232c 100644
--- a/databases/mysql-client/patches/patch-ax
+++ b/databases/mysql-client/patches/patch-ax
@@ -1,11 +1,11 @@
-$NetBSD: patch-ax,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
+$NetBSD: patch-ax,v 1.2 2005/01/20 14:17:15 xtraeme Exp $
 
---- scripts/Makefile.in.orig	2004-11-09 06:39:02.000000000 +0100
-+++ scripts/Makefile.in	2004-11-09 06:40:34.000000000 +0100
-@@ -274,26 +274,11 @@
+--- scripts/Makefile.in.orig	2005-01-20 14:48:37.000000000 +0100
++++ scripts/Makefile.in	2005-01-20 14:49:13.000000000 +0100
+@@ -292,25 +292,10 @@
+ uname_prog = @uname_prog@
  vio_dir = @vio_dir@
  vio_libs = @vio_libs@
- 
 -bin_SCRIPTS = @server_scripts@ \
 -			msql2mysql \
 -			mysql_config \
@@ -25,12 +25,10 @@ $NetBSD: patch-ax,v 1.1 2004/11/09 06:11:48 xtraeme Exp $
 -			mysqld_multi \
 -			make_win_src_distribution \
 -			make_win_binary_distribution
--
 +bin_SCRIPTS = msql2mysql mysql_config mysql_fix_privilege_tables \
-+	      mysql_setpermission mysql_zap mysqlaccess mysqlbug \
-+	      mysql_convert_table_format mysql_find_rows mysqlhotcopy \
-+	      mysqldumpslow mysql_explain_log mysql_tableinfo
-+
++		mysql_setpermission mysql_zap mysqlaccess mysqlbug \
++		mysql_convert_table_format mysql_find_rows mysqlhotcopy \
++		mysqldumpslow mysql_explain_log mysql_tableinfo
  
  EXTRA_SCRIPTS = make_binary_distribution.sh \
  			make_sharedlib_distribution.sh \
diff --git a/databases/mysql-client/patches/patch-az b/databases/mysql-client/patches/patch-az
new file mode 100644
index 00000000000..9652ef194cc
--- /dev/null
+++ b/databases/mysql-client/patches/patch-az
@@ -0,0 +1,93 @@
+$NetBSD: patch-az,v 1.1 2005/01/20 14:17:15 xtraeme Exp $
+
+--- scripts/mysqlaccess.sh.orig	2005-01-16 14:28:38 -08:00
++++ scripts/mysqlaccess.sh	2005-01-16 14:28:38 -08:00
+@@ -2,7 +2,7 @@
+ # ****************************
+ package MySQLaccess;
+ #use strict;
+-use POSIX qw(tmpnam);
++use File::Temp qw(tempfile tmpnam);
+ use Fcntl;
+ 
+ BEGIN {
+@@ -32,7 +32,6 @@
+ 	$ACCESS_U_BCK = 'user_backup';   
+ 	$ACCESS_D_BCK = 'db_backup';     
+         $DIFF      = '/usr/bin/diff'; 
+-        $TMP_PATH  = '/tmp';             #path to writable tmp-directory
+         $MYSQLDUMP = '@bindir@/mysqldump';
+                                          #path to mysqldump executable
+ 
+@@ -432,7 +431,7 @@
+ # no caching on STDOUT
+ 	$|=1;
+ 
+-	$MYSQL_CNF = POSIX::tmpnam();
++	$MYSQL_CNF = tmpnam();
+ 	%MYSQL_CNF = (client    => { },
+                       mysql     => { },
+                       mysqldump => { },
+@@ -577,8 +576,6 @@
+ push(@MySQLaccess::Grant::Error,'not_found_mysql')     if !(-x $MYSQL);
+ push(@MySQLaccess::Grant::Error,'not_found_diff')      if !(-x $DIFF);
+ push(@MySQLaccess::Grant::Error,'not_found_mysqldump') if !(-x $MYSQLDUMP);
+-push(@MySQLaccess::Grant::Error,'not_found_tmp')       if !(-d $TMP_PATH);
+-push(@MySQLaccess::Grant::Error,'write_err_tmp')       if !(-w $TMP_PATH);
+ if (@MySQLaccess::Grant::Error) {
+    MySQLaccess::Report::Print_Error_Messages() ;
+    exit 0;
+@@ -1777,17 +1774,15 @@
+    @before = sort(@before);
+    @after  = sort(@after);
+ 
+-   $before = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.before.$$";
+-   $after  = "$MySQLaccess::TMP_PATH/$MySQLaccess::script.after.$$";
+-   #$after = "/tmp/t0";
+-   open(BEFORE,"> $before") ||
+-    push(@MySQLaccess::Report::Errors,"Can't open temporary file $before for writing");
+-   open(AFTER,"> $after") ||
+-    push(@MySQLaccess::Report::Errors,"Can't open temporary file $after for writing");
+-   print BEFORE join("\n",@before);
+-   print AFTER  join("\n",@after);
+-   close(BEFORE);
+-   close(AFTER);
++   ($hb, $before) = tempfile("$MySQLaccess::script.XXXXXX") or
++    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
++   ($ha, $after)  = tempfile("$MySQLaccess::script.XXXXXX") or
++    push(@MySQLaccess::Report::Errors,"Can't create temporary file: $!");
++
++   print $hb join("\n",@before);
++   print $ha join("\n",@after);
++   close $hb;
++   close $ha;
+ 
+    # ----------------------------------
+    # compute difference
+@@ -1800,8 +1795,8 @@
+ 
+    # ----------------------------------
+    # cleanup temp. files
+-   unlink(BEFORE);
+-   unlink(AFTER);
++   unlink($before);
++   unlink($after);
+ 
+    return \@diffs;
+ }
+@@ -2316,14 +2311,6 @@
+    => "The diff program <$MySQLaccess::DIFF> could not be found.\n"
+      ."+ Check your path, or\n"
+      ."+ edit the source of this script to point \$DIFF to the diff program.\n"
+- ,'not_found_tmp'
+-   => "The temporary directory <$MySQLaccess::TMP_PATH> could not be found.\n"
+-     ."+ create this directory (writeable!), or\n"
+-     ."+ edit the source of this script to point \$TMP_PATH to the right directory.\n"
+- ,'write_err_tmp'
+-   => "The temporary directory <$MySQLaccess::TMP_PATH> is not writable.\n"
+-     ."+ make this directory writeable!, or\n"
+-     ."+ edit the source of this script to point \$TMP_PATH to another directory.\n"
+  ,'Unrecognized_option'
+    => "Sorry,\n"
+      ."You are using an old version of the mysql-program,\n"
+