Pullup ticket 1823 - requested by seb

security update for mysql4

Revisions pulled up:
- pkgsrc/databases/mysql4-client/Makefile.common	1.54
- pkgsrc/databases/mysql4-client/PLIST			1.14
- pkgsrc/databases/mysql4-client/distinfo		1.27
- pkgsrc/databases/mysql4-client/patches/patch-ax	1.5
- pkgsrc/databases/mysql4-client/patches/patch-bd	1.2
- pkgsrc/databases/mysql4-server/Makefile		1.31
- pkgsrc/databases/mysql4-server/PLIST			1.18
- pkgsrc/databases/mysql4-server/distinfo		1.25
- pkgsrc/databases/mysql4-server/patches/patch-bd	1.2

   Module Name:		pkgsrc
   Committed By:	seb
   Date:		Thu Aug 31 12:42:42 UTC 2006

   Modified Files:
   	pkgsrc/databases/mysql4-client: Makefile.common PLIST distinfo
   	pkgsrc/databases/mysql4-client/patches: patch-ax patch-bd
   	pkgsrc/databases/mysql4-server: Makefile PLIST distinfo
   	pkgsrc/databases/mysql4-server/patches: patch-bd

   Log Message:
   Update mysql4-client and mysql4-server to version 4.1.21.

   Most notably this version includes fixes for:
   http://secunia.com/advisories/21259/
   http://secunia.com/advisories/21506/
   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-3469

   * Packages changes:
   the script mysqldumpslow had been moved from the mysql4-client to the
   mysql4-server.

   * Changes since last packaged version (4.1.20)
   (see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-21.html for more details):

   This is a bugfix release for the recent production release family.

   Functionality added or changed:
   - For spatial data types, the server formerly returned these as
   VARSTRING values with a binary collation. Now the server returns
   spatial values as BLOB values. (Bug#10166)
   - Added the --set-charset option to mysqlbinlog to allow the
   character set to be specified for processing binary log files.
   (Bug#18351)
   - For a table with an AUTO_INCREMENT column, SHOW CREATE TABLE now
   shows the next AUTO_INCREMENT value to be generated. (Bug#19025)
   - A warning now is issued if the client attempts to set the
   SQL_LOG_OFF variable without the SUPER privilege. (Bug#16180)
   - The mysqldumpslow script has been moved from client RPM packages
   to server RPM packages. This corrects a problem where mysqldumpslow
   could not be used with a client-only RPM install, because it depends
   on my_print_defaults which is in the server RPM. (Bug#20216)

   Bugs fixed:
   - Security fix: On Linux, and possibly other platforms using
   case-sensitive filesystems, it was possible for a user granted
   rights on a database to create or access a database whose name
   differed only from that of the first by the case of one or more
   letters. (Bug#17647)
   - 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)
   - Security fix: Invalid arguments to DATE_FORMAT() caused a server
   crash. (CVE-2006-3469, Bug#20729) Thanks to Jean-David Maillefer
   for discovering and reporting this problem to the Debian project
   and to Christian Hammers from the Debian Team for notifying us of
   it.
   ...
   (see http://dev.mysql.com/doc/refman/4.1/en/news-4-1-21.html for
   the complete
   bug fix list)

1 files changed, 5 insertions, 5 deletions

diff --git a/databases/mysql4-server/distinfo b/databases/mysql4-server/distinfo
index 0486747abdf..a2648e7e971 100644
--- a/databases/mysql4-server/distinfo
+++ b/databases/mysql4-server/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.24 2006/06/19 07:53:00 seb Exp $
+$NetBSD: distinfo,v 1.24.2.1 2006/09/13 13:35:59 salo Exp $
 
-SHA1 (mysql-4.1.20.tar.gz) = 78cf1e2ab7f97cc33f0eb92bd581cd1472a409fe
-RMD160 (mysql-4.1.20.tar.gz) = 0db1eaeed752be2faeae3b99f0c54a23d00f4e5d
-Size (mysql-4.1.20.tar.gz) = 17319370 bytes
+SHA1 (mysql-4.1.21.tar.gz) = ec761b42d640e4dd051bff939fdcd2895b0e2591
+RMD160 (mysql-4.1.21.tar.gz) = a8e92bb3b1371cde3fd938482b34cb597403debf
+Size (mysql-4.1.21.tar.gz) = 17624947 bytes
 SHA1 (patch-aa) = f32ae7bbf91ce4edaeccf20789d60ecca82eb062
 SHA1 (patch-ab) = 45f97d4e449c76e46cacba246d5dc9ac8417ec44
 SHA1 (patch-ac) = fd49d78012d6410263da38fb97a8e0369f98c62d
@@ -16,5 +16,5 @@ SHA1 (patch-ar) = 93cb95b5e4e290fccbaba8d8bd0b66f115868eed
 SHA1 (patch-as) = 516460b0aa9f641d74f83c5514f258a980033e41
 SHA1 (patch-aw) = e89b4ada1a6efa2d8fb2ddaed8eaca6a59603d38
 SHA1 (patch-ax) = c73f0d59c9e079abc8fc16965297257cb8f8a592
-SHA1 (patch-bd) = 3ff14eacca7b10f819c8d31852bf5395e992b26a
+SHA1 (patch-bd) = 2070c5946ceea4c1b79ce290d359a811996ce454
 SHA1 (patch-be) = 1ba51c75cec53cb4bd6d1b5e71f776869cc340ac