Pullup ticket 1624 - requested by cube

security update for mysql5

Revisions pulled up:
- pkgsrc/databases/mysql5-client/Makefile.common	1.11, 1.12
- pkgsrc/databases/mysql5-client/distinfo		1.6
- pkgsrc/databases/mysql5-client/patches/patch-ae	1.5
- pkgsrc/databases/mysql5-client/patches/patch-af	1.4
- pkgsrc/databases/mysql5-client/patches/patch-ag	1.2
- pkgsrc/databases/mysql5-server/Makefile		1.13
- pkgsrc/databases/mysql5-server/PLIST			1.6
- pkgsrc/databases/mysql5-server/distinfo		1.7
- pkgsrc/databases/mysql5-server/patches/patch-ac	1.2
- pkgsrc/databases/mysql5-server/patches/patch-ag	1.4
- pkgsrc/databases/mysql5-server/patches/patch-al	1.2

   Module Name:		pkgsrc
   Committed By:	cube
   Date:		Thu May 18 16:11:15 UTC 2006

   Modified Files:
   	pkgsrc/databases/mysql5-client: Makefile.common distinfo
   	pkgsrc/databases/mysql5-client/patches: patch-ae patch-af patch-ag
   	pkgsrc/databases/mysql5-server: Makefile PLIST distinfo
   	pkgsrc/databases/mysql5-server/patches: patch-ac patch-ag patch-al

   Log Message:
   Update to version 5.0.21.

   Full listing of changes:

   http://dev.mysql.com/doc/refman/5.0/en/news-5-0-21.html

   Notable changes include:
    - Security enhancement: Added the global max_prepared_stmt_count system
      variable to limit the total number of prepared statements in the
      server.
    - The default for the innodb_thread_concurrency system variable was
      changed to 8.
    - Fixes for CVE-2006-1516, CVE-2006-1517 and CVE-2006-1518.

    And a lot of bug fixes.
---
   Module Name:		pkgsrc
   Committed By:	tron
   Date:		Fri May 19 23:01:02 UTC 2006

   Modified Files:
   	pkgsrc/databases/mysql5-client: Makefile.common

   Log Message:
   Fix build problem under Mac OS X by repairing broken OpenSSL (shared)
   library detection.

11 files changed, 70 insertions, 58 deletions

diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 0095a3e7c5b..efd7fec3b5f 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.7.2.1 2006/04/17 21:58:38 salo Exp $
+# $NetBSD: Makefile.common,v 1.7.2.2 2006/05/22 12:18:25 salo Exp $
 
-DISTNAME=		mysql-5.0.20
+DISTNAME=		mysql-5.0.21
 CATEGORIES=		databases
 MASTER_SITES=		${MASTER_SITE_MYSQL:=MySQL-5.0/}
 
@@ -120,5 +120,13 @@ SUBST_FILES.sem=	configure
 SUBST_SED.sem=		"s|-lposix4|-lrt|g"
 .endif
 
+# Fix broken shared library detection under Mac OS X
+.if ${OPSYS} == Darwin
+SUBST_CLASSES+=		dylib
+SUBST_STAGE.dylib=	post-patch
+SUBST_FILES.dylib=	configure
+SUBST_SED.dylib=	-e "s|\\\$$shrext_cmds|\\.dylib|g"
+.endif
+
 .include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql5-client/distinfo b/databases/mysql5-client/distinfo
index 90bd7760600..bd00b29ab39 100644
--- a/databases/mysql5-client/distinfo
+++ b/databases/mysql5-client/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
+$NetBSD: distinfo,v 1.4.2.2 2006/05/22 12:18:25 salo Exp $
 
-SHA1 (mysql-5.0.20.tar.gz) = b66fd7821d6cb5f3150f703e90d64697a770a165
-RMD160 (mysql-5.0.20.tar.gz) = f7daabd98124b88c021b314ac23c25d09597e573
-Size (mysql-5.0.20.tar.gz) = 19445124 bytes
+SHA1 (mysql-5.0.21.tar.gz) = c249a237e7d84e08846df6f7becc277f4060219b
+RMD160 (mysql-5.0.21.tar.gz) = 4bbc85f2585c76c58ab09c74f144ee5bd701607e
+Size (mysql-5.0.21.tar.gz) = 19529703 bytes
 SHA1 (patch-aa) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f
 SHA1 (patch-ac) = c97ef88d13cba67b79cdb40fc23facf29edbe0b8
 SHA1 (patch-ad) = 81c48274e3a43e46cf9d53f9ed4620c02761902a
-SHA1 (patch-ae) = 3fe37b158abdd892f077c805ce3eb4ba19dc4594
-SHA1 (patch-af) = 61f9cfd169e630708809142694d2bbea0055d20d
-SHA1 (patch-ag) = 9b1dfa213491d8daf82ff8d5ee293d1279c64ce8
+SHA1 (patch-ae) = 02742fab876345d29119aee80ea3434d7c246cf3
+SHA1 (patch-af) = ecd74709e969fb1c6a03e836ee3e7ff8238b3dd5
+SHA1 (patch-ag) = 52fb37b6f0db7eefd9ca9102451d13a365dd0816
 SHA1 (patch-ah) = bd34391e522ae12ee63ec6a734f7a31116b2918d
 SHA1 (patch-ai) = 242c97ab4658838a6001d9c288e01209abfcee77
 SHA1 (patch-aj) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a
diff --git a/databases/mysql5-client/patches/patch-ae b/databases/mysql5-client/patches/patch-ae
index 31bfc1184cc..07b304d4aa1 100644
--- a/databases/mysql5-client/patches/patch-ae
+++ b/databases/mysql5-client/patches/patch-ae
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.3.2.1 2006/04/17 21:58:38 salo Exp $
+$NetBSD: patch-ae,v 1.3.2.2 2006/05/22 12:18:25 salo Exp $
 
 Don't install scripts handled by mysql-server.
 
---- scripts/Makefile.in.orig	2006-04-13 11:58:39.000000000 +0200
-+++ scripts/Makefile.in	2006-04-13 12:00:06.000000000 +0200
-@@ -344,13 +344,12 @@
- yassl_libs_with_path = @yassl_libs_with_path@
+--- scripts/Makefile.in.orig	2006-04-26 20:32:21.000000000 +0200
++++ scripts/Makefile.in
+@@ -351,13 +351,12 @@ yassl_includes = @yassl_includes@
+ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -bin_SCRIPTS = @server_scripts@ \
@@ -19,7 +19,7 @@ Don't install scripts handled by mysql-server.
  			mysql_zap \
  			mysqlaccess \
  			mysqlbug \
-@@ -361,7 +360,6 @@
+@@ -368,7 +367,6 @@ bin_SCRIPTS = @server_scripts@ \
  			mysql_explain_log \
  			mysql_tableinfo \
  			mysql_upgrade \
diff --git a/databases/mysql5-client/patches/patch-af b/databases/mysql5-client/patches/patch-af
index 0536e61b370..e2eaab066a9 100644
--- a/databases/mysql5-client/patches/patch-af
+++ b/databases/mysql5-client/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-af,v 1.3.2.1 2006/05/22 12:18:25 salo Exp $
 
---- man/Makefile.in.orig	2006-01-09 15:56:55.000000000 +0100
-+++ man/Makefile.in	2006-01-09 15:57:22.000000000 +0100
-@@ -338,7 +338,8 @@
- yassl_libs_with_path = @yassl_libs_with_path@
+--- man/Makefile.in.orig	2006-04-26 20:31:55.000000000 +0200
++++ man/Makefile.in
+@@ -342,7 +342,8 @@ yassl_includes = @yassl_includes@
+ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
diff --git a/databases/mysql5-client/patches/patch-ag b/databases/mysql5-client/patches/patch-ag
index ad842c60f2f..bf7b7852572 100644
--- a/databases/mysql5-client/patches/patch-ag
+++ b/databases/mysql5-client/patches/patch-ag
@@ -1,26 +1,26 @@
-$NetBSD: patch-ag,v 1.1.1.1 2005/10/31 09:21:40 xtraeme Exp $
+$NetBSD: patch-ag,v 1.1.1.1.4.1 2006/05/22 12:18:25 salo Exp $
 
---- strings/Makefile.in.orig	2004-12-27 17:48:04.000000000 +0100
-+++ strings/Makefile.in	2005-01-11 23:29:03.000000000 +0100
-@@ -599,7 +599,6 @@
+--- strings/Makefile.in.orig	2006-04-26 20:32:24.000000000 +0200
++++ strings/Makefile.in
+@@ -609,7 +609,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
  	  if test -f $$p; then \
- 	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	    f=$(am__strip_dir) \
  	    echo " $(pkglibLIBRARIES_INSTALL) '$$p' '$(DESTDIR)$(pkglibdir)/$$f'"; \
 -	    $(pkglibLIBRARIES_INSTALL) "$$p" "$(DESTDIR)$(pkglibdir)/$$f"; \
  	  else :; fi; \
  	done
  	@$(POST_INSTALL)
-@@ -607,7 +606,6 @@
+@@ -617,7 +616,6 @@ install-pkglibLIBRARIES: $(pkglib_LIBRAR
  	  if test -f $$p; then \
- 	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	    p=$(am__strip_dir) \
  	    echo " $(RANLIB) '$(DESTDIR)$(pkglibdir)/$$p'"; \
 -	    $(RANLIB) "$(DESTDIR)$(pkglibdir)/$$p"; \
  	  else :; fi; \
  	done
  
-@@ -616,7 +614,6 @@
+@@ -626,7 +624,6 @@ uninstall-pkglibLIBRARIES:
  	@list='$(pkglib_LIBRARIES)'; for p in $$list; do \
- 	  p="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  p=$(am__strip_dir) \
  	  echo " rm -f '$(DESTDIR)$(pkglibdir)/$$p'"; \
 -	  rm -f "$(DESTDIR)$(pkglibdir)/$$p"; \
  	done
diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile
index c7c2819899c..fc81a06fc5f 100644
--- a/databases/mysql5-server/Makefile
+++ b/databases/mysql5-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2006/03/14 01:14:27 jlam Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2006/05/22 12:18:25 salo Exp $
 
 PKGNAME=		${DISTNAME:S/-/-server-/}
-PKGREVISION=		1
 SVR4_PKGNAME=		mysqs
 COMMENT=		MySQL 5, a free SQL database (server)
 
diff --git a/databases/mysql5-server/PLIST b/databases/mysql5-server/PLIST
index bb34c578bc7..5c19637c12d 100644
--- a/databases/mysql5-server/PLIST
+++ b/databases/mysql5-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
+@comment $NetBSD: PLIST,v 1.4.2.2 2006/05/22 12:18:25 salo Exp $
 bin/comp_err
 bin/innochecksum
 bin/my_print_defaults
@@ -42,6 +42,7 @@ share/mysql-test/include/ctype_like_escape.inc
 share/mysql-test/include/endspace.inc
 share/mysql-test/include/federated.inc
 share/mysql-test/include/federated_cleanup.inc
+share/mysql-test/include/get_binlog_dump_thread_id.inc
 share/mysql-test/include/gis_generic.inc
 share/mysql-test/include/have_archive.inc
 share/mysql-test/include/have_bdb.inc
@@ -114,6 +115,7 @@ share/mysql-test/lib/mtr_report.pl
 share/mysql-test/lib/mtr_stress.pl
 share/mysql-test/lib/mtr_timer.pl
 share/mysql-test/mysql-test-run
+share/mysql-test/mysql-test-run.pl
 share/mysql-test/r/alias.result
 share/mysql-test/r/alter_table.result
 share/mysql-test/r/analyse.result
@@ -312,6 +314,7 @@ share/mysql-test/r/innodb.result
 share/mysql-test/r/innodb_cache.result
 share/mysql-test/r/innodb_gis.result
 share/mysql-test/r/innodb_handler.result
+share/mysql-test/r/innodb_mysql.result
 share/mysql-test/r/innodb_notembedded.result
 share/mysql-test/r/innodb_unsafe_binlog.result
 share/mysql-test/r/insert.result
@@ -361,6 +364,7 @@ share/mysql-test/r/mysqldump.result
 share/mysql-test/r/mysqlshow.result
 share/mysql-test/r/mysqltest.result
 share/mysql-test/r/ndb_alter_table.result
+share/mysql-test/r/ndb_alter_table2.result
 share/mysql-test/r/ndb_autodiscover.result
 share/mysql-test/r/ndb_autodiscover2.result
 share/mysql-test/r/ndb_basic.result
@@ -543,7 +547,6 @@ share/mysql-test/r/sp-code.result
 share/mysql-test/r/sp-destruct.result
 share/mysql-test/r/sp-dynamic.result
 share/mysql-test/r/sp-error.result
-share/mysql-test/r/sp-goto.result
 share/mysql-test/r/sp-prelocking.result
 share/mysql-test/r/sp-security.result
 share/mysql-test/r/sp-threads.result
@@ -824,6 +827,7 @@ share/mysql-test/t/innodb_cache-master.opt
 share/mysql-test/t/innodb_cache.test
 share/mysql-test/t/innodb_gis.test
 share/mysql-test/t/innodb_handler.test
+share/mysql-test/t/innodb_mysql.test
 share/mysql-test/t/innodb_notembedded.test
 share/mysql-test/t/innodb_unsafe_binlog-master.opt
 share/mysql-test/t/innodb_unsafe_binlog.test
@@ -885,6 +889,7 @@ share/mysql-test/t/mysqldump.test
 share/mysql-test/t/mysqlshow.test
 share/mysql-test/t/mysqltest.test
 share/mysql-test/t/ndb_alter_table.test
+share/mysql-test/t/ndb_alter_table2.test
 share/mysql-test/t/ndb_autodiscover.test
 share/mysql-test/t/ndb_autodiscover2-master.opt
 share/mysql-test/t/ndb_autodiscover2.test
@@ -1105,6 +1110,7 @@ share/mysql-test/t/rpl_user_variables.test
 share/mysql-test/t/rpl_variables-master.opt
 share/mysql-test/t/rpl_variables.test
 share/mysql-test/t/rpl_view.test
+share/mysql-test/t/rpl_view-slave.opt
 share/mysql-test/t/schema.test
 share/mysql-test/t/select.test
 share/mysql-test/t/select_found.test
@@ -1119,7 +1125,6 @@ share/mysql-test/t/sp-code.test
 share/mysql-test/t/sp-destruct.test
 share/mysql-test/t/sp-dynamic.test
 share/mysql-test/t/sp-error.test
-share/mysql-test/t/sp-goto.test
 share/mysql-test/t/sp-prelocking.test
 share/mysql-test/t/sp-security.test
 share/mysql-test/t/sp-threads.test
diff --git a/databases/mysql5-server/distinfo b/databases/mysql5-server/distinfo
index 63873919f48..8caa85d7c53 100644
--- a/databases/mysql5-server/distinfo
+++ b/databases/mysql5-server/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.4.2.1 2006/04/17 21:58:38 salo Exp $
+$NetBSD: distinfo,v 1.4.2.2 2006/05/22 12:18:25 salo Exp $
 
-SHA1 (mysql-5.0.20.tar.gz) = b66fd7821d6cb5f3150f703e90d64697a770a165
-RMD160 (mysql-5.0.20.tar.gz) = f7daabd98124b88c021b314ac23c25d09597e573
-Size (mysql-5.0.20.tar.gz) = 19445124 bytes
+SHA1 (mysql-5.0.21.tar.gz) = c249a237e7d84e08846df6f7becc277f4060219b
+RMD160 (mysql-5.0.21.tar.gz) = 4bbc85f2585c76c58ab09c74f144ee5bd701607e
+Size (mysql-5.0.21.tar.gz) = 19529703 bytes
 SHA1 (patch-aa) = fcd1222f9939070a45bbb8ddf72bb1bdadea1f8b
 SHA1 (patch-ab) = 56cd26b3eb125e7d9b7775c9e148118bbd3dc6b3
-SHA1 (patch-ac) = dd8cc3e1fdeba9ca2f6ab1e0a66be79877c43289
+SHA1 (patch-ac) = 3d2c0db20d367980280d0d42f03bfe40048109d1
 SHA1 (patch-ad) = 36fb22fa10f2d379decf8e6fc86fc966472930e2
 SHA1 (patch-ae) = adc6956d4be304db61aa0323061143fffc1b9751
 SHA1 (patch-af) = 33c7caa6fe6a61da2a60a63a058cfdbd85af1e2d
-SHA1 (patch-ag) = 1156f793fa6a3097e653c803dca0e3893f72be14
+SHA1 (patch-ag) = 6ec3c6dd509f3a331728808972b9b0c1c57e3d32
 SHA1 (patch-ah) = 81a8cdd4f3ebea640ee5fa75ab8884c452ed3cd7
 SHA1 (patch-ai) = 725a3a6e06d39b26efb706bebbe3ff95da82be96
 SHA1 (patch-aj) = 07e4016a0629b7737ad4956962c15e97ddcc6f5d
 SHA1 (patch-ak) = 516460b0aa9f641d74f83c5514f258a980033e41
-SHA1 (patch-al) = b2f76b2d4e6aca649f975eba0f9c18316d4d4c17
+SHA1 (patch-al) = 6deee284643a474d5bc0674d149b49e36913fe12
 SHA1 (patch-am) = 999bb2dbca518a7e19a96b53678de35c0b227434
 SHA1 (patch-ao) = c6c56cbff6fbb7ff809b9b544c28ea28fcd18517
diff --git a/databases/mysql5-server/patches/patch-ac b/databases/mysql5-server/patches/patch-ac
index 6fcfa2f4d47..3fd6f4e976e 100644
--- a/databases/mysql5-server/patches/patch-ac
+++ b/databases/mysql5-server/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-ac,v 1.1.1.1.4.1 2006/05/22 12:18:25 salo Exp $
 
---- mysql-test/Makefile.in.orig	2005-10-31 09:37:02.000000000 +0100
-+++ mysql-test/Makefile.in	2005-10-31 09:37:57.000000000 +0100
-@@ -379,7 +379,7 @@
+--- mysql-test/Makefile.in.orig	2006-04-26 20:31:57.000000000 +0200
++++ mysql-test/Makefile.in
+@@ -388,7 +388,7 @@ zlib_dir = @zlib_dir@
  @HAVE_NDBCLUSTER_DB_FALSE@USE_NDBCLUSTER = \"\"
  @HAVE_NDBCLUSTER_DB_TRUE@USE_NDBCLUSTER = \"--ndbcluster\"
  benchdir_root = $(prefix)
 -testdir = $(benchdir_root)/mysql-test
 +testdir = $(benchdir_root)/share/mysql-test
- EXTRA_SCRIPTS = mysql-test-run.sh mysql-test-run.pl install_test_db.sh valgrind.supp
+ EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh valgrind.supp $(PRESCRIPTS)
  EXTRA_DIST = $(EXTRA_SCRIPTS) 
- test_SCRIPTS = mysql-test-run install_test_db 
+ GENSCRIPTS = mysql-test-run install_test_db
diff --git a/databases/mysql5-server/patches/patch-ag b/databases/mysql5-server/patches/patch-ag
index 03db3570fe6..5756e6c20e9 100644
--- a/databases/mysql5-server/patches/patch-ag
+++ b/databases/mysql5-server/patches/patch-ag
@@ -1,9 +1,9 @@
-$NetBSD: patch-ag,v 1.3 2006/01/09 16:25:01 xtraeme Exp $
+$NetBSD: patch-ag,v 1.3.2.1 2006/05/22 12:18:25 salo Exp $
 
---- man/Makefile.in.orig	2006-01-09 16:47:04.000000000 +0100
-+++ man/Makefile.in	2006-01-09 16:47:24.000000000 +0100
-@@ -338,8 +338,8 @@
- yassl_libs_with_path = @yassl_libs_with_path@
+--- man/Makefile.in.orig	2006-04-26 20:31:55.000000000 +0200
++++ man/Makefile.in
+@@ -342,8 +342,8 @@ yassl_includes = @yassl_includes@
+ yassl_libs = @yassl_libs@
  yassl_taocrypt_extra_cxxflags = @yassl_taocrypt_extra_cxxflags@
  zlib_dir = @zlib_dir@
 -man1_MANS = @man1_files@
diff --git a/databases/mysql5-server/patches/patch-al b/databases/mysql5-server/patches/patch-al
index 3f746525925..fa78ded6b13 100644
--- a/databases/mysql5-server/patches/patch-al
+++ b/databases/mysql5-server/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.1.1.1 2005/10/31 09:22:26 xtraeme Exp $
+$NetBSD: patch-al,v 1.1.1.1.4.1 2006/05/22 12:18:25 salo Exp $
 
---- myisam/Makefile.in.orig	2005-01-10 16:19:12.000000000 +0100
-+++ myisam/Makefile.in	2005-01-10 16:19:21.000000000 +0100
-@@ -172,7 +172,7 @@
- LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) \
+--- myisam/Makefile.in.orig	2006-04-26 20:31:56.000000000 +0200
++++ myisam/Makefile.in
+@@ -157,7 +157,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUD
+ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
  	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
  	$(AM_CFLAGS) $(CFLAGS)
 -CCLD = $(CC)
 +CCLD = $(CXX)
- LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
  SOURCES = $(libmyisam_a_SOURCES) mi_test1.c mi_test2.c mi_test3.c \