pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2009Q3]: pkgsrc/databases Pullup ticket 2936 - requested by tron
details: https://anonhg.NetBSD.org/pkgsrc/rev/460e2deee973
branches: pkgsrc-2009Q3
changeset: 399980:460e2deee973
user: spz <spz%pkgsrc.org@localhost>
date: Sat Nov 28 17:47:00 2009 +0000
description:
Pullup ticket 2936 - requested by tron
security update
Revisions pulled up:
- pkgsrc/databases/mysql5-client/Makefile 1.22
- pkgsrc/databases/mysql5-client/Makefile.common 1.36
- pkgsrc/databases/mysql5-client/PLIST 1.12
- pkgsrc/databases/mysql5-client/distinfo 1.27
- pkgsrc/databases/mysql5-server/Makefile 1.29
- pkgsrc/databases/mysql5-server/PLIST 1.15
- pkgsrc/databases/mysql5-server/distinfo 1.23
- pkgsrc/databases/mysql5-server/patches/patch-ab 1.6
- pkgsrc/databases/mysql5-server/patches/patch-al 1.4
- pkgsrc/databases/mysql5-server/patches/patch-an 1.6
Deleted files:
- pkgsrc/databases/mysql5-client/patches/patch-bh
- pkgsrc/databases/mysql5-client/patches/patch-bi
- pkgsrc/databases/mysql5-client/patches/patch-bj
- pkgsrc/databases/mysql5-server/patches/patch-ac
- pkgsrc/databases/mysql5-server/patches/patch-ad
-------------------------------------------------------------------------
Module Name: pkgsrc
Committed By: tron
Date: Thu Nov 26 16:33:30 UTC 2009
Modified Files:
pkgsrc/databases/mysql5-client: Makefile Makefile.common PLIST distinfo
pkgsrc/databases/mysql5-server: Makefile PLIST distinfo
pkgsrc/databases/mysql5-server/patches: patch-ab patch-al patch-an
Removed Files:
pkgsrc/databases/mysql5-client/patches: patch-bh patch-bi patch-bj
pkgsrc/databases/mysql5-server/patches: patch-ac patch-ad
Log Message:
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
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/databases/mysql5-client/Makefile
cvs rdiff -u -r1.35 -r1.36 pkgsrc/databases/mysql5-client/Makefile.common
cvs rdiff -u -r1.11 -r1.12 pkgsrc/databases/mysql5-client/PLIST
cvs rdiff -u -r1.26 -r1.27 pkgsrc/databases/mysql5-client/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/databases/mysql5-client/patches/patch-bh
cvs rdiff -u -r1.1 -r0 pkgsrc/databases/mysql5-client/patches/patch-bi \
pkgsrc/databases/mysql5-client/patches/patch-bj
cvs rdiff -u -r1.28 -r1.29 pkgsrc/databases/mysql5-server/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/databases/mysql5-server/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/databases/mysql5-server/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/mysql5-server/patches/patch-ab \
pkgsrc/databases/mysql5-server/patches/patch-an
cvs rdiff -u -r1.8 -r0 pkgsrc/databases/mysql5-server/patches/patch-ac
cvs rdiff -u -r1.4 -r0 pkgsrc/databases/mysql5-server/patches/patch-ad
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/mysql5-server/patches/patch-al
diffstat:
databases/mysql5-client/Makefile | 10 +-
databases/mysql5-client/Makefile.common | 7 +-
databases/mysql5-client/PLIST | 3 +-
databases/mysql5-client/distinfo | 11 +-
databases/mysql5-client/patches/patch-bh | 49 ------------
databases/mysql5-client/patches/patch-bi | 16 ----
databases/mysql5-client/patches/patch-bj | 22 -----
databases/mysql5-server/Makefile | 3 +-
databases/mysql5-server/PLIST | 117 +++++++++++++++++++++++++++---
databases/mysql5-server/distinfo | 16 +--
databases/mysql5-server/patches/patch-ab | 14 +-
databases/mysql5-server/patches/patch-ac | 24 ------
databases/mysql5-server/patches/patch-ad | 22 -----
databases/mysql5-server/patches/patch-al | 20 ++--
databases/mysql5-server/patches/patch-an | 34 +-------
15 files changed, 147 insertions(+), 221 deletions(-)
diffs (truncated from 981 to 300 lines):
diff -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/Makefile
--- a/databases/mysql5-client/Makefile Fri Nov 27 21:32:07 2009 +0000
+++ b/databases/mysql5-client/Makefile Sat Nov 28 17:47:00 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.21 2009/05/20 00:58:10 wiz Exp $
+# $NetBSD: Makefile,v 1.21.4.1 2009/11/28 17:47:00 spz Exp $
PKGNAME= ${DISTNAME:S/-/-client-/}
-PKGREVISION= 3
SVR4_PKGNAME= mysqc
COMMENT= MySQL 5, a free SQL database (client)
@@ -21,7 +20,12 @@
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 @@
${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 -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/Makefile.common
--- a/databases/mysql5-client/Makefile.common Fri Nov 27 21:32:07 2009 +0000
+++ b/databases/mysql5-client/Makefile.common Sat Nov 28 17:47:00 2009 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.35 2009/07/19 13:14:21 tron Exp $
+# $NetBSD: Makefile.common,v 1.35.2.1 2009/11/28 17:47:00 spz 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 @@
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 @@
.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 -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/PLIST
--- a/databases/mysql5-client/PLIST Fri Nov 27 21:32:07 2009 +0000
+++ b/databases/mysql5-client/PLIST Sat Nov 28 17:47:00 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11.4.1 2009/11/28 17:47:00 spz Exp $
bin/msql2mysql
bin/mysql
bin/mysql_config
@@ -67,7 +67,6 @@
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 -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/distinfo
--- a/databases/mysql5-client/distinfo Fri Nov 27 21:32:07 2009 +0000
+++ b/databases/mysql5-client/distinfo Sat Nov 28 17:47:00 2009 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.26 2009/01/28 10:30:53 he Exp $
+$NetBSD: distinfo,v 1.26.6.1 2009/11/28 17:47:00 spz 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-as) = d301a449e67d786f9155673fdbb5e8bc2f19ee7d
SHA1 (patch-at) = 626c0f6926893aa05e261ca1921fb6a352819156
SHA1 (patch-bf) = 87be24d45f0d3f48ea2b911025eb41696d088299
-SHA1 (patch-bh) = 83f6f7f29636265e987fb00897a55290e2434643
-SHA1 (patch-bi) = 5d0132f4e053abfc6210cd2dc425186765acaad3
-SHA1 (patch-bj) = 1e00fab7db2f5ea04802053d41dedd2a356ea9ed
diff -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/patches/patch-bh
--- a/databases/mysql5-client/patches/patch-bh Fri Nov 27 21:32:07 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 :
-- " ") : "NULL"));
-+ tee_fputs("<TH>", PAGER);
-+ if (field->name && field->name[0])
-+ xmlencode_print(field->name, field->name_length);
-+ else
-+ tee_fputs(field->name ? " " : "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 -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/patches/patch-bi
--- a/databases/mysql5-client/patches/patch-bi Fri Nov 27 21:32:07 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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><</TH></TR><TR><TD>< & ></TD></TR></TABLE>
-+End of 5.1 tests
- End of 5.0 tests
diff -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-client/patches/patch-bj
--- a/databases/mysql5-client/patches/patch-bj Fri Nov 27 21:32:07 2009 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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
diff -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-server/Makefile
--- a/databases/mysql5-server/Makefile Fri Nov 27 21:32:07 2009 +0000
+++ b/databases/mysql5-server/Makefile Sat Nov 28 17:47:00 2009 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2009/07/19 13:50:20 tron Exp $
+# $NetBSD: Makefile,v 1.28.2.1 2009/11/28 17:47:00 spz Exp $
PKGNAME= ${DISTNAME:S/-/-server-/}
-PKGREVISION= 3
SVR4_PKGNAME= mysqs
COMMENT= MySQL 5, a free SQL database (server)
diff -r 2683a648b5a6 -r 460e2deee973 databases/mysql5-server/PLIST
--- a/databases/mysql5-server/PLIST Fri Nov 27 21:32:07 2009 +0000
+++ b/databases/mysql5-server/PLIST Sat Nov 28 17:47:00 2009 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2009/06/14 17:43:19 joerg Exp $
+@comment $NetBSD: PLIST,v 1.14.4.1 2009/11/28 17:47:00 spz Exp $
bin/comp_err
bin/innochecksum
bin/my_print_defaults
@@ -36,6 +36,7 @@
share/mysql-test/include/check-testcase.test
share/mysql-test/include/check_var_limit.inc
share/mysql-test/include/common-tests.inc
+share/mysql-test/include/count_sessions.inc
share/mysql-test/include/ctype_common.inc
share/mysql-test/include/ctype_filesort.inc
share/mysql-test/include/ctype_innodb_like.inc
@@ -43,6 +44,8 @@
share/mysql-test/include/ctype_like_range_f1f2.inc
share/mysql-test/include/ctype_regex.inc
share/mysql-test/include/delete_anonymous_users.inc
+share/mysql-test/include/diff_master_slave.inc
+share/mysql-test/include/diff_tables.inc
share/mysql-test/include/endspace.inc
share/mysql-test/include/federated.inc
share/mysql-test/include/federated_cleanup.inc
@@ -54,7 +57,9 @@
share/mysql-test/include/have_big5.inc
share/mysql-test/include/have_blackhole.inc
share/mysql-test/include/have_bug25714.inc
+share/mysql-test/include/have_case_insensitive_fs.inc
share/mysql-test/include/have_case_sensitive_file_system.inc
+share/mysql-test/include/have_community_features.inc
share/mysql-test/include/have_compress.inc
share/mysql-test/include/have_cp1250_ch.inc
share/mysql-test/include/have_cp932.inc
@@ -77,6 +82,7 @@
share/mysql-test/include/have_multi_ndb.inc
share/mysql-test/include/have_ndb.inc
share/mysql-test/include/have_outfile.inc
+share/mysql-test/include/have_profiling.inc
share/mysql-test/include/have_query_cache.inc
share/mysql-test/include/have_sjis.inc
share/mysql-test/include/have_ssl.inc
@@ -86,8 +92,12 @@
share/mysql-test/include/have_ujis.inc
share/mysql-test/include/im_check_env.inc
share/mysql-test/include/innodb_rollback_on_timeout.inc
+share/mysql-test/include/kill_query.inc
+share/mysql-test/include/kill_query_and_diff_master_slave.inc
share/mysql-test/include/loaddata_autocom.inc
+share/mysql-test/include/master-slave-end.inc
share/mysql-test/include/master-slave.inc
+share/mysql-test/include/mysqldump.inc
share/mysql-test/include/mysqltest-x.inc
share/mysql-test/include/ndb_backup.inc
share/mysql-test/include/ndb_backup_print.inc
@@ -104,13 +114,17 @@
share/mysql-test/include/ps_query.inc
share/mysql-test/include/ps_renew.inc
share/mysql-test/include/report-features.test
+share/mysql-test/include/rpl_loaddata_charset.inc
share/mysql-test/include/rpl_stmt_seq.inc
+share/mysql-test/include/rpl_trigger_common.inc
share/mysql-test/include/show_binary_logs.inc
share/mysql-test/include/show_binlog_events.inc
share/mysql-test/include/show_binlog_events2.inc
share/mysql-test/include/show_msg.inc
share/mysql-test/include/show_msg80.inc
share/mysql-test/include/sp-vars.inc
+share/mysql-test/include/start_slave.inc
+share/mysql-test/include/stop_slave.inc
share/mysql-test/include/strict_autoinc.inc
share/mysql-test/include/system_db_struct.inc
share/mysql-test/include/test_outfile.inc
@@ -121,11 +135,16 @@
share/mysql-test/include/wait_for_query_to_suceed.inc
share/mysql-test/include/wait_for_slave_io_to_stop.inc
share/mysql-test/include/wait_for_slave_param.inc
+share/mysql-test/include/wait_for_slave_sql_error.inc
+share/mysql-test/include/wait_for_slave_sql_error_and_skip.inc
share/mysql-test/include/wait_for_slave_sql_to_stop.inc
Home |
Main Index |
Thread Index |
Old Index