diff options
Diffstat (limited to 'databases/mysql4-client')
| -rw-r--r-- | databases/mysql4-client/Makefile.common | 4 | ||||
| -rw-r--r-- | databases/mysql4-client/PLIST | 3 | ||||
| -rw-r--r-- | databases/mysql4-client/distinfo | 12 | ||||
| -rw-r--r-- | databases/mysql4-client/patches/patch-ax | 4 | ||||
| -rw-r--r-- | databases/mysql4-client/patches/patch-bd | 21 |
5 files changed, 21 insertions, 23 deletions
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index ef08f31f621..3b5077ec358 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,6 +1,6 @@ -# $NetBSD: Makefile.common,v 1.53 2006/06/19 07:52:59 seb Exp $ +# $NetBSD: Makefile.common,v 1.54 2006/08/31 12:42:42 seb Exp $ -DISTNAME= mysql-4.1.20 +DISTNAME= mysql-4.1.21 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL:=MySQL-4.1/} diff --git a/databases/mysql4-client/PLIST b/databases/mysql4-client/PLIST index 67e45e50d25..3f685894b41 100644 --- a/databases/mysql4-client/PLIST +++ b/databases/mysql4-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2006/05/26 18:25:34 seb Exp $ +@comment $NetBSD: PLIST,v 1.14 2006/08/31 12:42:42 seb Exp $ bin/msql2mysql bin/mysql bin/mysql_config @@ -16,7 +16,6 @@ bin/mysqlbinlog bin/mysqlbug bin/mysqlcheck bin/mysqldump -bin/mysqldumpslow bin/mysqlhotcopy bin/mysqlimport bin/mysqlmanager-pwgen diff --git a/databases/mysql4-client/distinfo b/databases/mysql4-client/distinfo index b17c5cea7b5..9c0b08b2f74 100644 --- a/databases/mysql4-client/distinfo +++ b/databases/mysql4-client/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.26 2006/06/19 07:52:59 seb Exp $ +$NetBSD: distinfo,v 1.27 2006/08/31 12:42:42 seb 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) = adc6956d4be304db61aa0323061143fffc1b9751 SHA1 (patch-ab) = 0959e0ba7316e4fe00b656d7af2d8c2c04ed296f SHA1 (patch-af) = fd55cd066ac78601dc12002959d2bfafe243f65b SHA1 (patch-av) = 5bb6b9e90b6537d4fad71fb575986b49e56161e0 SHA1 (patch-aw) = 8e7ad98457ab0b2b96d18cc414b6a773eb564dcc -SHA1 (patch-ax) = 639f60616609b342a44ebd6ae6269a40c4db0767 +SHA1 (patch-ax) = 9ad64516523d6052dca586c6a427a1c64921b891 SHA1 (patch-ay) = fa4a55fa0df5b92823f2390e42fe46e728aadb25 SHA1 (patch-ba) = bd34391e522ae12ee63ec6a734f7a31116b2918d SHA1 (patch-bb) = 242c97ab4658838a6001d9c288e01209abfcee77 SHA1 (patch-bc) = 31c933a03e2b05aeaff1d89d3fa542aad663e96a -SHA1 (patch-bd) = 3ff14eacca7b10f819c8d31852bf5395e992b26a +SHA1 (patch-bd) = 2070c5946ceea4c1b79ce290d359a811996ce454 SHA1 (patch-be) = 1ba51c75cec53cb4bd6d1b5e71f776869cc340ac diff --git a/databases/mysql4-client/patches/patch-ax b/databases/mysql4-client/patches/patch-ax index 7aa5716315b..59383de546a 100644 --- a/databases/mysql4-client/patches/patch-ax +++ b/databases/mysql4-client/patches/patch-ax @@ -1,4 +1,4 @@ -$NetBSD: patch-ax,v 1.4 2005/09/26 22:34:49 xtraeme Exp $ +$NetBSD: patch-ax,v 1.5 2006/08/31 12:42:42 seb Exp $ --- scripts/Makefile.in.orig 2005-09-26 23:51:54.000000000 +0200 +++ scripts/Makefile.in 2005-09-26 23:52:22.000000000 +0200 @@ -26,7 +26,7 @@ $NetBSD: patch-ax,v 1.4 2005/09/26 22:34:49 xtraeme Exp $ +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_explain_log mysql_tableinfo \ mysql_create_system_tables noinst_SCRIPTS = make_binary_distribution \ diff --git a/databases/mysql4-client/patches/patch-bd b/databases/mysql4-client/patches/patch-bd index e93414ae717..39e83012da2 100644 --- a/databases/mysql4-client/patches/patch-bd +++ b/databases/mysql4-client/patches/patch-bd @@ -1,6 +1,6 @@ -$NetBSD: patch-bd,v 1.1 2006/06/19 07:53:00 seb Exp $ +$NetBSD: patch-bd,v 1.2 2006/08/31 12:42:42 seb Exp $ ---- tests/mysql_client_test.c.orig 2006-05-24 18:00:37.000000000 +0000 +--- tests/mysql_client_test.c.orig 2006-07-19 15:10:41.000000000 +0000 +++ tests/mysql_client_test.c @@ -22,6 +22,7 @@ ***************************************************************************/ @@ -10,12 +10,13 @@ $NetBSD: patch-bd,v 1.1 2006/06/19 07:53:00 seb Exp $ #include <my_sys.h> #include <mysql.h> #include <errmsg.h> -@@ -11745,6 +11746,49 @@ static void test_bug12744() +@@ -11855,6 +11856,48 @@ static void test_bug15613() + mysql_stmt_close(stmt); } - /* ++/* + Bug #17667: An attacker has the opportunity to bypass query logging. -+*/ ++ */ + +static void test_bug17667() +{ @@ -55,16 +56,14 @@ $NetBSD: patch-bd,v 1.1 2006/06/19 07:53:00 seb Exp $ + myquery(rc); +} + -+ -+/* - Bug#11718: query with function, join and order by returns wrong type - */ -@@ -12078,6 +12122,7 @@ static struct my_tests_st my_tests[]= { + /* + Bug#20152: mysql_stmt_execute() writes to MYSQL_TYPE_DATE buffer +@@ -12130,6 +12173,7 @@ static struct my_tests_st my_tests[]= { { "test_bug11718", test_bug11718 }, { "test_bug12925", test_bug12925 }, { "test_bug15613", test_bug15613 }, + { "test_bug17667", test_bug17667 }, + { "test_bug20152", test_bug20152 }, { 0, 0 } }; - |